Skip to content

Commit 33e933e

Browse files
committed
[GEOPY-2574] Merge branch 'release/ga-4.7' into GEOPY-2574B
2 parents 991fc80 + b500705 commit 33e933e

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

recipe.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ context:
44
name: "simpeg-drivers"
55
version: "0.0.0.dev0" # This will be replaced by the actual version in the build process
66
python_min: "3.10"
7+
module_name: ${{ name|lower|replace("-", "_") }}
78

89
package:
910
name: ${{ name|lower }}
@@ -58,14 +59,14 @@ requirements:
5859
tests:
5960
- python:
6061
imports:
62+
- ${{ module_name }}
63+
- ${{ module_name }}._version
6164
- dask
6265
- distributed
6366
- geoapps_utils
6467
- geoh5py
6568
- grid_apps
6669
- simpeg
67-
- simpeg_drivers
68-
- simpeg_drivers._version
6970
pip_check: true
7071

7172
- script:
@@ -77,6 +78,10 @@ tests:
7778
source:
7879
- tests/
7980

81+
- package_contents:
82+
files:
83+
- site-packages/${{ module_name }}/_version.py
84+
8085
about:
8186
license: MIT
8287
license_file:

simpeg_drivers/components/data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def get_normalizations(self):
300300
if comp in ["gz", "bz", "gxz", "gyz", "bxz", "byz"]:
301301
normalizations[chan][comp] = -1 * np.ones(self.mask.sum())
302302
elif self.params.inversion_type in ["magnetotellurics"]:
303-
normalizations[chan][comp] = -1 * np.ones(self.mask.sum())
303+
normalizations[chan][comp] = np.ones(self.mask.sum())
304304
elif self.params.inversion_type in ["tipper"]:
305305
if "imag" in comp:
306306
normalizations[chan][comp] = -1 * np.ones(self.mask.sum())

tests/run_tests/driver_mt_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# To test the full run and validate the inversion.
4242
# Move this file out of the test directory and run.
4343

44-
target_run = {"data_norm": 0.032649770, "phi_d": 6.68, "phi_m": 263}
44+
target_run = {"data_norm": 0.032649770, "phi_d": 7.13, "phi_m": 282}
4545

4646

4747
def setup_data(workspace, survey):
@@ -187,7 +187,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True):
187187
output["data"] = orig_zyy_real_1
188188
assert not run_ws.get_entity("Iteration_0_sensitivities")[0]
189189
if pytest:
190-
check_target(output, target_run, tolerance=0.2)
190+
check_target(output, target_run, tolerance=0.1)
191191
nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
192192
inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
193193
assert np.all(nan_ind == inactive_ind)

0 commit comments

Comments
 (0)