Skip to content

Commit 36b3d29

Browse files
authored
Merge pull request #339 from MiraGeoscience/GEOPY-2618
GEOPY-2618: GEOPY_2618
2 parents 11cbc55 + 4330c56 commit 36b3d29

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@
7676
"main": true,
7777
"group": "Mesh and models",
7878
"label": "Model units",
79-
"tooltip": "Select the units of the model",
79+
"tooltip": "Change the model units between S/m or Ohm.m, for electromagnetic and direct-current surveys.",
80+
"optional": true,
81+
"enabled": false,
8082
"value": "Conductivity (S/m)"
8183
},
8284
"starting_model": {

simpeg_drivers/joint/joint_surveys/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class JointSurveysModelOptions(JointModelOptions):
3131
:param reference_model: The reference model for the inversion.
3232
"""
3333

34-
model_type: ModelTypeEnum = ModelTypeEnum.conductivity
34+
model_type: ModelTypeEnum | None = ModelTypeEnum.conductivity
3535
starting_model: float | FloatData | None = None
3636
reference_model: float | FloatData | None = None
3737

tests/run_tests/driver_joint_surveys_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ def test_joint_surveys_tem_run(
403403
mesh=components.mesh,
404404
group_a=driver_A.out_group,
405405
group_b=driver_B.out_group,
406+
model_type=None,
406407
starting_model=1e-3,
407408
)
408409

0 commit comments

Comments
 (0)