From 14ad97636154c67ffaffcbf49cb2c3bcebaa3035 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 3 Dec 2025 12:09:51 -0800 Subject: [PATCH 1/6] Add a JointSurveysModelOptions to allow optional starting/reference. --- simpeg_drivers/joint/joint_surveys/options.py | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/simpeg_drivers/joint/joint_surveys/options.py b/simpeg_drivers/joint/joint_surveys/options.py index 037c9ab2..4eb18df6 100644 --- a/simpeg_drivers/joint/joint_surveys/options.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -12,16 +12,32 @@ from __future__ import annotations from pathlib import Path -from typing import ClassVar +from typing import ClassVar, Literal -from geoapps_utils.utils.importing import GeoAppsError +from geoh5py.data import FloatData from pydantic import model_validator from simpeg_drivers import assets_path -from simpeg_drivers.joint.options import BaseJointOptions +from simpeg_drivers.joint.options import BaseJointOptions, JointModelOptions from simpeg_drivers.options import ConductivityModelOptions +class JointSurveysModelOptions(JointModelOptions): + """ + Joint Surveys model options. + + :param model_type: The physical property type for the inversion. + :param starting_model: The starting model for the inversion. + :param reference_model: The reference model for the inversion. + """ + + model_type: Literal["Conductivity (S/m)", "Resistivity (Ohm-m)"] = ( + "Conductivity (S/m)" + ) + starting_model: float | FloatData | None = None + reference_model: float | FloatData | None = None + + class JointSurveysOptions(BaseJointOptions): """Joint Surveys inversion options.""" @@ -33,7 +49,7 @@ class JointSurveysOptions(BaseJointOptions): title: str = "Joint Surveys Inversion" inversion_type: str = "joint surveys" - models: ConductivityModelOptions + models: JointSurveysModelOptions @model_validator(mode="after") def all_groups_same_physical_property(self): From 7cbfb65eab7aaf501692f1b8a810d3e0701a64f2 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 3 Dec 2025 13:44:13 -0800 Subject: [PATCH 2/6] remove unused import --- simpeg_drivers/joint/joint_surveys/options.py | 1 - 1 file changed, 1 deletion(-) diff --git a/simpeg_drivers/joint/joint_surveys/options.py b/simpeg_drivers/joint/joint_surveys/options.py index 4eb18df6..1efc3398 100644 --- a/simpeg_drivers/joint/joint_surveys/options.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -19,7 +19,6 @@ from simpeg_drivers import assets_path from simpeg_drivers.joint.options import BaseJointOptions, JointModelOptions -from simpeg_drivers.options import ConductivityModelOptions class JointSurveysModelOptions(JointModelOptions): From 319d6d1eaa14a5393639be629b4c8011eef408f4 Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 4 Dec 2025 08:14:13 -0800 Subject: [PATCH 3/6] Literal -> Enum and Ohm -> ohm --- .../uijson/direct_current_2d_forward.ui.json | 2 +- .../uijson/direct_current_2d_inversion.ui.json | 2 +- .../uijson/direct_current_3d_forward.ui.json | 2 +- .../uijson/direct_current_3d_inversion.ui.json | 2 +- .../direct_current_batch2d_forward.ui.json | 2 +- .../direct_current_batch2d_inversion.ui.json | 2 +- .../uijson/fdem1d_forward.ui.json | 2 +- .../uijson/fdem1d_inversion.ui.json | 2 +- .../uijson/fdem_forward.ui.json | 2 +- .../uijson/fdem_inversion.ui.json | 2 +- .../induced_polarization_2d_forward.ui.json | 4 ++-- .../induced_polarization_2d_inversion.ui.json | 4 ++-- .../induced_polarization_3d_forward.ui.json | 2 +- .../induced_polarization_3d_inversion.ui.json | 2 +- ...nduced_polarization_batch2d_forward.ui.json | 2 +- ...uced_polarization_batch2d_inversion.ui.json | 2 +- .../uijson/joint_surveys_inversion.ui.json | 2 +- .../uijson/magnetotellurics_forward.ui.json | 2 +- .../uijson/magnetotellurics_inversion.ui.json | 2 +- .../uijson/tdem1d_forward.ui.json | 2 +- .../uijson/tdem1d_inversion.ui.json | 2 +- .../uijson/tdem_forward.ui.json | 2 +- .../uijson/tdem_inversion.ui.json | 2 +- .../uijson/tipper_forward.ui.json | 2 +- .../uijson/tipper_inversion.ui.json | 2 +- .../components/factories/directives_factory.py | 2 +- .../components/factories/source_factory.py | 2 +- simpeg_drivers/components/models.py | 18 +++++++++--------- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/joint/joint_surveys/driver.py | 2 +- simpeg_drivers/joint/joint_surveys/options.py | 12 ++++++++---- simpeg_drivers/options.py | 2 +- simpeg_drivers/plate_simulation/driver.py | 2 +- .../driver_2d_rotated_gradients_test.py | 2 +- tests/run_tests/driver_dc_2d_test.py | 2 +- tests/run_tests/driver_ip_2d_test.py | 2 +- tests/run_tests/driver_ip_test.py | 2 +- .../driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mt_test.py | 2 +- tests/run_tests/driver_tipper_test.py | 4 ++-- 41 files changed, 59 insertions(+), 55 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index 62882450..723664da 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 95b75605..467bdb80 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -125,7 +125,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 1de15ecb..da4dbcea 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 616f5ba9..3b613549 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 3e9146fe..f507aeda 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 9bcf0d9d..8d79f6f5 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 1cf06e6a..58754ac7 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -84,7 +84,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 006b742c..27e50f7e 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -132,7 +132,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index c4a4edee..745830a7 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -44,7 +44,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index 38ea9a10..34276c80 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -92,7 +92,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index e90f20d4..d08f22cf 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", @@ -121,7 +121,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", "property": "", "value": 0.001 }, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 5664233a..999d02a8 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -124,7 +124,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", @@ -140,7 +140,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", "property": "", "value": 0.001 }, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index 29af72fa..37f23778 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index 4f32ad14..9d4b2c93 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 7bdd7bb3..a4906d99 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 1ef91eae..f5a7908d 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 1ee8b87d..e5da4969 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -71,7 +71,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index e34d6bbc..d4ef3d3a 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -78,7 +78,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index c8c9d56f..adcd8534 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -270,7 +270,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index e6727966..cf7b54a1 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -98,7 +98,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 355e1fa1..3a8a0dea 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -122,7 +122,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index a125bf26..11e34fc1 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -70,7 +70,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 87e90e73..fafcaf30 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -142,7 +142,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 25036ff1..e054a485 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -54,7 +54,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 5d9c9450..5fa2c898 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -150,7 +150,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 04250362..82b904c2 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -418,7 +418,7 @@ def assemble_keyword_arguments( inversion_object.permutation.T, ] - if self.params.models.model_type == "Resistivity (Ohm-m)": + if self.params.models.model_type == "Resistivity (ohm-m)": kwargs["transforms"].append(lambda x: 1 / x) if "1d" in self.factory_type: diff --git a/simpeg_drivers/components/factories/source_factory.py b/simpeg_drivers/components/factories/source_factory.py index 0b0077ac..ba1d729d 100644 --- a/simpeg_drivers/components/factories/source_factory.py +++ b/simpeg_drivers/components/factories/source_factory.py @@ -138,7 +138,7 @@ def assemble_keyword_arguments( # pylint: disable=arguments-differ if self.factory_type in ["magnetotellurics", "tipper"]: background = deepcopy(self.params.models.conductivity_model) - if getattr(self.params.models, "model_type", None) == "Resistivity (Ohm-m)": + if getattr(self.params.models, "model_type", None) == "Resistivity (ohm-m)": background **= -1.0 kwargs["sigma_primary"] = [background] diff --git a/simpeg_drivers/components/models.py b/simpeg_drivers/components/models.py index 0650807e..d4012cd3 100644 --- a/simpeg_drivers/components/models.py +++ b/simpeg_drivers/components/models.py @@ -165,7 +165,7 @@ def starting_model(self) -> np.ndarray | None: mstart = self._starting_model.model.copy() if mstart is not None and self.is_sigma: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type == "Resistivity (ohm-m)": mstart = 1 / mstart mstart = np.log(mstart) @@ -221,7 +221,7 @@ def reference_model(self) -> np.ndarray | None: ref_model = mref.copy() if self.is_sigma: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type == "Resistivity (ohm-m)": ref_model = 1 / ref_model ref_model = np.log(ref_model) @@ -263,7 +263,7 @@ def reference_declination(self) -> np.ndarray | None: def lower_bound(self) -> np.ndarray | None: if ( self.is_sigma - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + and self.driver.params.models.model_type == "Resistivity (ohm-m)" ): bound_model = self._upper_bound.model else: @@ -283,7 +283,7 @@ def lower_bound(self) -> np.ndarray | None: if self.is_sigma: is_finite = np.isfinite(lbound) - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type == "Resistivity (ohm-m)": lbound[is_finite] = 1 / lbound[is_finite] lbound[is_finite] = np.log(lbound[is_finite]) @@ -297,7 +297,7 @@ def lower_bound(self) -> np.ndarray | None: def upper_bound(self) -> np.ndarray | None: if ( self.is_sigma - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + and self.driver.params.models.model_type == "Resistivity (ohm-m)" ): bound_model = self._lower_bound.model else: @@ -311,7 +311,7 @@ def upper_bound(self) -> np.ndarray | None: if self.is_sigma: is_finite = np.isfinite(ubound) - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type == "Resistivity (ohm-m)": ubound[is_finite] = 1 / ubound[is_finite] ubound[is_finite] = np.log(ubound[is_finite]) @@ -329,7 +329,7 @@ def conductivity_model(self) -> np.ndarray | None: background_sigma = self._conductivity_model.model.copy() if background_sigma is not None: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type == "Resistivity (ohm-m)": background_sigma = 1 / background_sigma # Don't apply log if IP inversion @@ -569,7 +569,7 @@ def save_model(self): model_type = self.model_type if ( model_type == "conductivity_model" - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + and self.driver.params.models.model_type == "Resistivity (ohm-m)" ): model_type = "resistivity_model" @@ -592,7 +592,7 @@ def edit_ndv_model(self, model): if ( model_type == "conductivity_model" and getattr(self.driver.params.models, "model_type", None) - == "Resistivity (Ohm-m)" + == "Resistivity (ohm-m)" ): model_type = "resistivity_model" diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index bc93f59e..135d8897 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -451,7 +451,7 @@ def _get_local_model_save_directives( ) model_directive.label = driver.params.physical_property - if getattr(driver.params.models, "model_type", None) == "Resistivity (Ohm-m)": + if getattr(driver.params.models, "model_type", None) == "Resistivity (ohm-m)": model_directive.label = "resistivity_model" model_directive.transforms = [wire, *model_directive.transforms] diff --git a/simpeg_drivers/joint/joint_surveys/driver.py b/simpeg_drivers/joint/joint_surveys/driver.py index c0906560..e288c3b5 100644 --- a/simpeg_drivers/joint/joint_surveys/driver.py +++ b/simpeg_drivers/joint/joint_surveys/driver.py @@ -64,7 +64,7 @@ def validate_create_models(self): model = np.exp(model) if ( getattr(self.params.models, "model_type", None) - == "Resistivity (Ohm-m)" + == "Resistivity (ohm-m)" ): model = 1.0 / model diff --git a/simpeg_drivers/joint/joint_surveys/options.py b/simpeg_drivers/joint/joint_surveys/options.py index 1efc3398..36afe7f5 100644 --- a/simpeg_drivers/joint/joint_surveys/options.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -11,8 +11,9 @@ from __future__ import annotations +from enum import Enum from pathlib import Path -from typing import ClassVar, Literal +from typing import ClassVar from geoh5py.data import FloatData from pydantic import model_validator @@ -21,6 +22,11 @@ from simpeg_drivers.joint.options import BaseJointOptions, JointModelOptions +class ModelTypeEnum(str, Enum): + conductivity = "Conductivity (S/m)" + resistivity = "Resistivity (ohm-m)" + + class JointSurveysModelOptions(JointModelOptions): """ Joint Surveys model options. @@ -30,9 +36,7 @@ class JointSurveysModelOptions(JointModelOptions): :param reference_model: The reference model for the inversion. """ - model_type: Literal["Conductivity (S/m)", "Resistivity (Ohm-m)"] = ( - "Conductivity (S/m)" - ) + model_type: ModelTypeEnum = ModelTypeEnum.conductivity starting_model: float | FloatData | None = None reference_model: float | FloatData | None = None diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 0f796517..965edfcb 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -319,7 +319,7 @@ class ConductivityModelOptions(ModelOptions): Options for the conductivity model used in all of EM methods. """ - model_type: Literal["Conductivity (S/m)", "Resistivity (Ohm-m)"] = ( + model_type: Literal["Conductivity (S/m)", "Resistivity (ohm-m)"] = ( "Conductivity (S/m)" ) conductivity_model: float | FloatData | None = Field( diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index b7dd61c0..d8752295 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -137,7 +137,7 @@ def simulation_parameters(self) -> BaseForwardOptions: if self._simulation_parameters is None: self._simulation_parameters = self.params.simulation_parameters() if self._simulation_parameters.physical_property == "conductivity": - self._simulation_parameters.models.model_type = "Resistivity (Ohm-m)" + self._simulation_parameters.models.model_type = "Resistivity (ohm-m)" return self._simulation_parameters @property diff --git a/tests/run_tests/driver_2d_rotated_gradients_test.py b/tests/run_tests/driver_2d_rotated_gradients_test.py index 5d6be39f..7e1218ae 100644 --- a/tests/run_tests/driver_2d_rotated_gradients_test.py +++ b/tests/run_tests/driver_2d_rotated_gradients_test.py @@ -153,7 +153,7 @@ def test_dc2d_rotated_grad_run( gradient_rotation=pg, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=1.0, diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 46e9cf64..91ac277a 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -113,7 +113,7 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): data_object=potential.parent, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=0.0, diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 219ea86b..92eb45c3 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -64,7 +64,7 @@ def test_ip_2d_fwr_run( topography_object=components.topography, starting_model=components.model, conductivity_model=1e2, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", line_selection=LineSelectionOptions( line_object=geoh5.get_entity("line_ids")[0], line_id=101, diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 6f828a41..7ee6fcd6 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -90,7 +90,7 @@ def test_ip_3d_run( topography_object=topography, data_object=potential.parent, conductivity_model=1e2, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", reference_model=1e-6, starting_model=1e-6, s_norm=0.0, diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 6184c201..caba490b 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -210,7 +210,7 @@ def test_joint_cross_gradient_inv_run( topography_object=topography, data_object=survey, potential_channel=data, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", potential_uncertainty=5e-4, tile_spatial=1, starting_model=100.0, diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 29537085..412a8da7 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -225,7 +225,7 @@ def test_joint_surveys_conductivity_run( data_object=components.survey, starting_model=components.model, reference_model=5.0, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", ) driver_A = DC3DInversionDriver(params) driver_B = DC3DInversionDriver(params) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 45c7f2fe..70736a68 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -169,7 +169,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): z_norm=1.0, cooling_rate=1, lower_bound=0.75, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", background_conductivity=100.0, max_global_iterations=max_iterations, initial_beta_ratio=1e3, diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index fd34ff46..72786d8c 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -66,7 +66,7 @@ def test_tipper_fwr_run( topography_object=components.topography, data_object=components.survey, starting_model=components.model, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", background_conductivity=1e2, txz_real_channel_bool=True, txz_imag_channel_bool=True, @@ -146,7 +146,7 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): y_norm=1.0, z_norm=1.0, alpha_s=1.0, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", lower_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e3, From ad58915857de0f0a978349d4f5384eb99ad974b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Fri, 5 Dec 2025 16:37:16 -0500 Subject: [PATCH 4/6] [GEOPY-2619] Revert "[DEVOPS-922] fix "ohm" vs "Ohm": compare with str.lower()" This reverts commit b6b450cf75fdbf993988aed131e08486da8411b9. # Conflicts: # simpeg_drivers/components/factories/directives_factory.py # simpeg_drivers/components/factories/source_factory.py # simpeg_drivers/components/models.py # simpeg_drivers/joint/driver.py # simpeg_drivers/joint/joint_surveys/driver.py # simpeg_drivers/options.py # simpeg_drivers/plate_simulation/driver.py --- simpeg_drivers/utils/nested.py | 2 +- tests/run_tests/driver_2d_rotated_gradients_test.py | 2 +- tests/run_tests/driver_dc_2d_test.py | 2 +- tests/run_tests/driver_ip_2d_test.py | 2 +- tests/run_tests/driver_ip_test.py | 2 +- tests/run_tests/driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mt_test.py | 2 +- tests/run_tests/driver_tipper_test.py | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/simpeg_drivers/utils/nested.py b/simpeg_drivers/utils/nested.py index 719740e8..6ff3a325 100644 --- a/simpeg_drivers/utils/nested.py +++ b/simpeg_drivers/utils/nested.py @@ -275,7 +275,7 @@ def create_simulation( n_actives = int(actives.sum()) if getattr(simulation, "_chiMap", None) is not None: - if simulation.model_type and simulation.model_type.lower() == "vector": + if simulation.model_type == "vector": kwargs["chiMap"] = maps.IdentityMap(nP=n_actives * 3) kwargs["model_type"] = "vector" else: diff --git a/tests/run_tests/driver_2d_rotated_gradients_test.py b/tests/run_tests/driver_2d_rotated_gradients_test.py index 7e1218ae..5d6be39f 100644 --- a/tests/run_tests/driver_2d_rotated_gradients_test.py +++ b/tests/run_tests/driver_2d_rotated_gradients_test.py @@ -153,7 +153,7 @@ def test_dc2d_rotated_grad_run( gradient_rotation=pg, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=1.0, diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 91ac277a..46e9cf64 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -113,7 +113,7 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): data_object=potential.parent, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=0.0, diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 92eb45c3..219ea86b 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -64,7 +64,7 @@ def test_ip_2d_fwr_run( topography_object=components.topography, starting_model=components.model, conductivity_model=1e2, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", line_selection=LineSelectionOptions( line_object=geoh5.get_entity("line_ids")[0], line_id=101, diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 7ee6fcd6..6f828a41 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -90,7 +90,7 @@ def test_ip_3d_run( topography_object=topography, data_object=potential.parent, conductivity_model=1e2, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", reference_model=1e-6, starting_model=1e-6, s_norm=0.0, diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index caba490b..6184c201 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -210,7 +210,7 @@ def test_joint_cross_gradient_inv_run( topography_object=topography, data_object=survey, potential_channel=data, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", potential_uncertainty=5e-4, tile_spatial=1, starting_model=100.0, diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 412a8da7..29537085 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -225,7 +225,7 @@ def test_joint_surveys_conductivity_run( data_object=components.survey, starting_model=components.model, reference_model=5.0, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", ) driver_A = DC3DInversionDriver(params) driver_B = DC3DInversionDriver(params) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 70736a68..45c7f2fe 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -169,7 +169,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): z_norm=1.0, cooling_rate=1, lower_bound=0.75, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", background_conductivity=100.0, max_global_iterations=max_iterations, initial_beta_ratio=1e3, diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index 72786d8c..fd34ff46 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -66,7 +66,7 @@ def test_tipper_fwr_run( topography_object=components.topography, data_object=components.survey, starting_model=components.model, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", background_conductivity=1e2, txz_real_channel_bool=True, txz_imag_channel_bool=True, @@ -146,7 +146,7 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): y_norm=1.0, z_norm=1.0, alpha_s=1.0, - model_type="Resistivity (ohm-m)", + model_type="Resistivity (Ohm-m)", lower_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e3, From 424672ef5e998d0ab84c36a3b7a2f478bd448933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Fri, 5 Dec 2025 16:38:03 -0500 Subject: [PATCH 5/6] [GEOPY-2619] "Ohm-m" in enum as well --- simpeg_drivers/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 03647002..7499daef 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -317,7 +317,7 @@ def gradient_orientations(self) -> tuple(float, float): class ModelTypeEnum(str, Enum): conductivity = "Conductivity (S/m)" - resistivity = "Resistivity (ohm-m)" + resistivity = "Resistivity (Ohm-m)" class ConductivityModelOptions(ModelOptions): From e899f21c03d765d29ff6392949b71afbf30d3b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Fri, 5 Dec 2025 16:55:00 -0500 Subject: [PATCH 6/6] [GEOPY-2619] Revert "[DEVOPS-922] no cap for Ohm" This reverts commit da7d1a6c463e79c457c55079f414c38fd93f992d. --- .../uijson/direct_current_2d_forward.ui.json | 2 +- .../uijson/direct_current_2d_inversion.ui.json | 2 +- .../uijson/direct_current_3d_forward.ui.json | 2 +- .../uijson/direct_current_3d_inversion.ui.json | 2 +- .../uijson/direct_current_batch2d_forward.ui.json | 2 +- .../uijson/direct_current_batch2d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem_inversion.ui.json | 2 +- .../uijson/induced_polarization_2d_forward.ui.json | 4 ++-- .../uijson/induced_polarization_2d_inversion.ui.json | 4 ++-- .../uijson/induced_polarization_3d_forward.ui.json | 2 +- .../uijson/induced_polarization_3d_inversion.ui.json | 2 +- .../uijson/induced_polarization_batch2d_forward.ui.json | 2 +- .../uijson/induced_polarization_batch2d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json | 2 +- .../uijson/magnetotellurics_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tipper_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tipper_inversion.ui.json | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index 723664da..62882450 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 467bdb80..95b75605 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -125,7 +125,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index da8ba5a9..1a93c370 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 48b90fee..5eba2847 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 34a966a5..8628a630 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 04de4956..7c19bce0 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 33192e3c..af248f1b 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -84,7 +84,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 6199b8db..dd5510db 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -132,7 +132,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index 24f6eedb..c72f54d4 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -44,7 +44,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index 76991d4c..acd5692f 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -92,7 +92,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index d08f22cf..e90f20d4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", @@ -121,7 +121,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", "property": "", "value": 0.001 }, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 999d02a8..5664233a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -124,7 +124,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", @@ -140,7 +140,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", "property": "", "value": 0.001 }, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index e9f559d4..889ca714 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index 96913778..79d43580 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 0917f832..79ffccd7 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index e8fdbf7c..b9007098 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 28815d75..62557f66 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -71,7 +71,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index e6942efe..8cdecac5 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -78,7 +78,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 27708817..3a34206e 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -270,7 +270,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index 02ceba28..b4d6c39f 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -98,7 +98,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 95129a3d..dbefaba0 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -122,7 +122,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index a5720a27..7549311d 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -70,7 +70,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index c7b96f84..c9c22995 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -142,7 +142,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 7af86543..a0cd3617 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -54,7 +54,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index eab33514..1581dab8 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -150,7 +150,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (ohm-m)" + "Resistivity (Ohm-m)" ], "main": true, "group": "Mesh and models",