Skip to content

GEOPY-2618: GEOPY_2618 #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domfournier merged 6 commits into from
Jan 29, 2026
Merged

GEOPY-2618: GEOPY_2618 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c34051e
make model_type optional in joint surveys ui.json
benk-mira Jan 27, 2026
9e923f8
Update simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json
benk-mira Jan 28, 2026
22417ad
add model_type=None for one conductivity and one potential field runt…
benk-mira Jan 28, 2026
8413742
Prevent None for model_type for all options classes except the joint …
benk-mira Jan 28, 2026
9f9808b
remove model_type=None from gravity runtest
benk-mira Jan 28, 2026
4330c56
add model_type=None for joint_surveys_tem_run
benk-mira Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@
"main": true,
"group": "Mesh and models",
"label": "Model units",
"tooltip": "Select the units of the model",
"tooltip": "Change the model units between S/m or Ohm.m, for electromagnetic and direct-current surveys.",
"optional": true,
"enabled": false,
"value": "Conductivity (S/m)"
},
"starting_model": {
Expand Down
2 changes: 1 addition & 1 deletion simpeg_drivers/joint/joint_surveys/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class JointSurveysModelOptions(JointModelOptions):
:param reference_model: The reference model for the inversion.
"""

model_type: ModelTypeEnum = ModelTypeEnum.conductivity
model_type: ModelTypeEnum | None = ModelTypeEnum.conductivity
starting_model: float | FloatData | None = None
reference_model: float | FloatData | None = None

Expand Down
1 change: 1 addition & 0 deletions tests/run_tests/driver_joint_surveys_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ def test_joint_surveys_tem_run(
mesh=components.mesh,
group_a=driver_A.out_group,
group_b=driver_B.out_group,
model_type=None,
starting_model=1e-3,
)

Expand Down
Loading