From a15042bc22fde02528e9ede3a5fbc3d42d790652 Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 10 Mar 2025 10:02:14 -0700 Subject: [PATCH 1/3] Deprecated seed --- simpeg/directives/directives.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg/directives/directives.py b/simpeg/directives/directives.py index 86380fe038..4db080e652 100644 --- a/simpeg/directives/directives.py +++ b/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.") From 7dc6f9bee2a0d0bbec4e0c408662c4820c2afdee Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 10 Mar 2025 10:38:16 -0700 Subject: [PATCH 2/3] Replace try:except with isintance --- simpeg/data.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/simpeg/data.py b/simpeg/data.py index 00be1504a7..ecca25c37f 100644 --- a/simpeg/data.py +++ b/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,) ) From ab9adc453d7bc917b6e68d8034c46ad88707eb6f Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 10 Mar 2025 11:11:28 -0700 Subject: [PATCH 3/3] Handle tipper and impedance receivers --- simpeg/dask/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/simpeg/dask/utils.py b/simpeg/dask/utils.py index c8c74168a0..19ba96f1a6 100644 --- a/simpeg/dask/utils.py +++ b/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], ), ) )