alias plate_property and overburden_property

Author: benk-mira

simpeg_drivers/plate_simulation/driver.py

@@ -131,17 +131,17 @@ def plates(self) -> list[Plate]:
         """Generate sequence of plates."""
         if self._plates is None:
             offset = (
-                self.params.model.overburden.thickness
-                if self.params.model.plate.reference_surface == "overburden"
+                self.params.model.overburden_options.thickness
+                if self.params.model.plate_options.reference_surface == "overburden"
                 else 0.0
             )
-            center = self.params.model.plate.center(
+            center = self.params.model.plate_options.center(
                 self.survey,
                 self.topography,
                 depth_offset=-1 * offset,
             )
             plate = Plate(
-                self.params.model.plate.geometry.model_copy(
+                self.params.model.plate_options.geometry.model_copy(
                     update={
                         "easting": center[0],
                         "northing": center[1],
@@ -151,9 +151,9 @@ def plates(self) -> list[Plate]:
             )
             self._plates = self.replicate(
                 plate,
-                self.params.model.plate.number,
-                self.params.model.plate.spacing,
-                self.params.model.plate.geometry.direction,
+                self.params.model.plate_options.number,
+                self.params.model.plate_options.spacing,
+                self.params.model.plate_options.geometry.direction,
             )
         return self._plates
 
@@ -206,13 +206,13 @@ def make_model(self) -> FloatData:
 
         overburden = Overburden(
             topography=self.simulation_parameters.active_cells.topography_object,
-            thickness=self.params.model.overburden.thickness,
-            value=self.params.model.overburden.overburden_property,
+            thickness=self.params.model.overburden_options.thickness,
+            value=self.params.model.overburden_options.overburden_property,
         )
 
         dikes = DikeSwarm(
             [
-                Anomaly(plate, self.params.model.plate.plate_property)
+                Anomaly(plate, self.params.model.plate_options.plate_property)
                 for plate in self.plates
             ],
             name="plates",

simpeg_drivers/plate_simulation/match/driver.py

@@ -192,7 +192,8 @@ def _create_plate_from_parameters(
         """
         center = self.params.survey.vertices[index_center]
         center[2] = (
-            self._drape_heights[index_center] - model_options.overburden.thickness
+            self._drape_heights[index_center]
+            - model_options.overburden_options.thickness
         )
         indices = self.params.survey.get_segment_indices(
             index_center, self.params.max_distance
@@ -208,10 +209,10 @@ def _create_plate_from_parameters(
                     "y": center[1],
                     "z": center[2],
                 },
-                "width": model_options.plate.geometry.dip_length,
-                "thickness": model_options.plate.geometry.width,
-                "length": model_options.plate.geometry.strike_length,
-                "dip": model_options.plate.geometry.dip,
+                "width": model_options.plate_options.geometry.dip_length,
+                "thickness": model_options.plate_options.geometry.width,
+                "length": model_options.plate_options.geometry.strike_length,
+                "dip": model_options.plate_options.geometry.dip,
                 "dip_direction": (azimuth + strike_angle) % 360,
             }
         )

simpeg_drivers/plate_simulation/models/options.py

@@ -14,6 +14,7 @@
 from geoapps_utils.modelling.plates import PlateModel
 from geoh5py.objects import Points
 from pydantic import (
+    AliasChoices,
     BaseModel,
     ConfigDict,
     Field,
@@ -47,7 +48,9 @@ class PlateOptions(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     name: str = "Plate"
-    plate_property: float
+    plate_property: float = Field(
+        validation_alias=AliasChoices("plate_property", "plate")
+    )
     geometry: PlateModel
     number: int = 1
     spacing: float = 0.0
@@ -125,7 +128,9 @@ class OverburdenOptions(BaseModel):
     """
 
     thickness: float
-    overburden_property: float
+    overburden_property: float = Field(
+        validation_alias=AliasChoices("overburden_property", "overburden")
+    )
 
 
 class ModelOptions(BaseModel):
@@ -140,5 +145,5 @@ class ModelOptions(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     background: float
-    overburden: OverburdenOptions
-    plate: PlateOptions
+    overburden_options: OverburdenOptions
+    plate_options: PlateOptions

tests/plate_simulation/runtest/driver_test.py

@@ -117,20 +117,20 @@ def test_plate_simulation_params_from_input_file(tmp_path):
     assert not params.mesh.diagonal_balance
 
     assert isinstance(params.model, ModelOptions)
-    assert params.model.plate.name == "test_gravity_plate_simulation"
+    assert params.model.plate_options.name == "test_gravity_plate_simulation"
     assert params.model.background == 1000.0
-    assert params.model.overburden.thickness == 50.0
-    assert params.model.overburden.overburden_property == 5.0
-    assert params.model.plate.plate_property == 2.0
-    assert params.model.plate.geometry.width == 100.0
-    assert params.model.plate.geometry.strike_length == 100.0
-    assert params.model.plate.geometry.dip_length == 100.0
-    assert params.model.plate.geometry.dip == 0.0
-    assert params.model.plate.geometry.direction == 0.0
+    assert params.model.overburden_options.thickness == 50.0
+    assert params.model.overburden_options.overburden_property == 5.0
+    assert params.model.plate_options.plate_property == 2.0
+    assert params.model.plate_options.geometry.width == 100.0
+    assert params.model.plate_options.geometry.strike_length == 100.0
+    assert params.model.plate_options.geometry.dip_length == 100.0
+    assert params.model.plate_options.geometry.dip == 0.0
+    assert params.model.plate_options.geometry.direction == 0.0
 
-    assert params.model.plate.number == 9
-    assert params.model.plate.spacing == 10.0
-    assert params.model.plate.relative_locations
-    assert params.model.plate.geometry.easting == 10.0
-    assert params.model.plate.geometry.northing == 10.0
-    assert params.model.plate.geometry.elevation == -250.0
+    assert params.model.plate_options.number == 9
+    assert params.model.plate_options.spacing == 10.0
+    assert params.model.plate_options.relative_locations
+    assert params.model.plate_options.geometry.easting == 10.0
+    assert params.model.plate_options.geometry.northing == 10.0
+    assert params.model.plate_options.geometry.elevation == -250.0

tests/plate_simulation/runtest/gravity_test.py

@@ -76,8 +76,8 @@ def test_gravity_plate_simulation(tmp_path):
         model_params = ModelOptions(
             name="density",
             background=0.0,
-            overburden=overburden_params,
-            plate=plate_params,
+            overburden_options=overburden_params,
+            plate_options=plate_params,
         )
 
         options = GravityForwardOptions.build(

tests/plate_simulation/runtest/match_test.py

@@ -142,8 +142,8 @@ def test_matching_driver(tmp_path: Path):
         ifile.data["simulation"] = fwr_driver.out_group
 
         plate_options = PlateSimulationOptions.build(ifile.data)
-        plate_options.model.overburden.thickness = 40.0
-        plate_options.model.plate.geometry.dip_length = 300.0
+        plate_options.model.overburden_options.thickness = 40.0
+        plate_options.model.plate_options.geometry.dip_length = 300.0
         driver = PlateSimulationDriver(plate_options)
         driver.run()