Merge pull request #76 from MiraGeoscience/GEOPY-2048

GEOPY-2048: Resolve deprecation warnings with latest simpeg 0.23 and discreatize 0.11

Author: domfournier

simpeg/dask/utils.py

@@ -57,13 +57,18 @@ def get_parallel_blocks(
                     block_count += 1
                     blocks.append([])
 
+                locs = rx.locations
+
+                if isinstance(locs, tuple):
+                    locs = locs[0]
+
                 blocks[block_count].append(
                     (
                         (s_id, r_id, ind),
                         (
                             chunk,
                             np.arange(row_index, row_index + chunk_size).astype(int),
-                            rx.locations.shape[0],
+                            locs.shape[0],
                         ),
                     )
                 )

simpeg/data.py

@@ -163,11 +163,10 @@ def relative_error(self):
     @relative_error.setter
     def relative_error(self, value):
         if value is not None:
-            try:
+            if not isinstance(value, np.ndarray):
                 value = validate_float("relative_error", value)
                 value = np.full(self.survey.nD, value)
-            except TypeError:
-                pass
+
             value = validate_ndarray_with_shape(
                 "relative_error", value, shape=(self.survey.nD,)
             )
@@ -206,11 +205,11 @@ def noise_floor(self):
     @noise_floor.setter
     def noise_floor(self, value):
         if value is not None:
-            try:
+
+            if not isinstance(value, np.ndarray):
                 value = validate_float("noise_floor", value)
                 value = np.full(self.survey.nD, value)
-            except TypeError:
-                pass
+
             value = validate_ndarray_with_shape(
                 "noise_floor", value, shape=(self.survey.nD,)
             )

simpeg/directives/directives.py

@@ -614,7 +614,7 @@ def __init__(self, beta0_ratio=1.0, seed: RandomSeed | None = None, **kwargs):
         super().__init__(beta0_ratio=beta0_ratio, seed=seed, **kwargs)
 
     def initialize(self):
-        rng = np.random.default_rng(seed=self.seed)
+        rng = np.random.default_rng(seed=self.random_seed)
 
         if self.verbose:
             print("Calculating the beta0 parameter.")