[DEVOPS-922] fix "ohm" vs "Ohm": compare with str.lower()

Author: sebhmg

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.lower() == "resistivity (ohm-m)":
                 kwargs["transforms"].append(lambda x: 1 / x)
 
         if "1d" in self.factory_type:

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]

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.lower() == "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.lower() == "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.lower() == "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.lower() == "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.lower() == "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.lower() == "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.lower() == "resistivity (ohm-m)":
                 background_sigma = 1 / background_sigma
 
             # Don't apply log if IP inversion
@@ -568,8 +568,9 @@ def save_model(self):
 
         model_type = self.model_type
         if (
-            model_type == "conductivity_model"
-            and self.driver.params.models.model_type == "Resistivity (Ohm-m)"
+            model_type
+            and model_type.lower() == "conductivity_model"
+            and self.driver.params.models.model_type.lower() == "resistivity (ohm-m)"
         ):
             model_type = "resistivity_model"
 
@@ -590,9 +591,10 @@ def edit_ndv_model(self, model):
         """Change values to NDV on models and save to workspace."""
         model_type = self.model_type
         if (
-            model_type == "conductivity_model"
+            model_type
+            and model_type.lower() == "conductivity_model"
             and getattr(self.driver.params.models, "model_type", None)
-            == "Resistivity (Ohm-m)"
+            == "Resistivity (ohm-m)"
         ):
             model_type = "resistivity_model"
 

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]

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
 

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(

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

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 == "vector":
+        if simulation.model_type and simulation.model_type.lower() == "vector":
             kwargs["chiMap"] = maps.IdentityMap(nP=n_actives * 3)
             kwargs["model_type"] = "vector"
         else:

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,

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,