updating calls to regular_grid

Author: Lachlan Grose

LoopStructural/export/exporters.py

@@ -423,7 +423,7 @@ def _write_vol_evtk(model, file_name, data_label, nsteps, real_coords=True):
 
     """
     # Define grid spacing
-    xyz = model.bounding_box.regular_grid(nsteps)
+    xyz = model.bounding_box.regular_grid(nsteps=nsteps)
     vals = model.evaluate_model(xyz, scale=False)
     if real_coords:
         model.rescale(xyz)
@@ -465,7 +465,7 @@ def _write_vol_gocad(model, file_name, data_label, nsteps, real_coords=True):
 
     """
     # Define grid spacing in model scale coords
-    xyz = model.bounding_box.regular_grid(nsteps)
+    xyz = model.bounding_box.regular_grid(nsteps=nsteps)
 
     vals = model.evaluate_model(xyz, scale=False)
     # Use FORTRAN style indexing for GOCAD VOXET

LoopStructural/modelling/core/geological_model.py

@@ -714,7 +714,7 @@ def create_and_add_foliation(
         )
         # add data
         if series_surface_data is None:
-            series_surface_data = self.data[self.data["feature_name"] == series_surface_name]
+            series_surface_data = self.data.loc[self.data["feature_name"] == series_surface_name]
 
         if series_surface_data.shape[0] == 0:
             logger.warning("No data for {series_surface_data}, skipping")
@@ -789,7 +789,7 @@ def create_and_add_fold_frame(
         )
         # add data
         if fold_frame_data is None:
-            fold_frame_data = self.data[self.data["feature_name"] == fold_frame_name]
+            fold_frame_data = self.data.loc[self.data["feature_name"] == fold_frame_name]
         if fold_frame_data.shape[0] == 0:
             logger.warning(f"No data for {fold_frame_name}, skipping")
             return
@@ -874,13 +874,12 @@ def create_and_add_folded_foliation(
             **kwargs,
         )
         if foliation_data is None:
-            foliation_data = self.data[self.data["feature_name"] == foliation_name]
+            foliation_data = self.data.loc[self.data["feature_name"] == foliation_name]
         if foliation_data.shape[0] == 0:
             logger.warning(f"No data for {foliation_name}, skipping")
             return
         series_builder.add_data_from_data_frame(
-            self.data[self.data["feature_name"] == foliation_data]
-        )
+foliation_data        )
         self._add_faults(series_builder)
         # series_builder.add_data_to_interpolator(True)
         # build feature
@@ -1303,7 +1302,7 @@ def create_and_add_domain_fault(
         )
 
         # add data
-        unconformity_data = self.data[self.data["feature_name"] == fault_surface_data]
+        unconformity_data = self.data.loc[self.data["feature_name"] == fault_surface_data]
 
         domain_fault_feature_builder.add_data_from_data_frame(unconformity_data)
         # look through existing features if there is a fault before an
@@ -1424,7 +1423,7 @@ def create_and_add_fault(
             **kwargs,
         )
         if fault_data is None:
-            fault_data = self.data[self.data["feature_name"] == fault_name]
+            fault_data = self.data.loc[self.data["feature_name"] == fault_name]
         if fault_data.shape[0] == 0:
             logger.warning(f"No data for {fault_name}, skipping")
             return

LoopStructural/modelling/features/_base_geological_feature.py

@@ -244,7 +244,7 @@ def min(self):
         if self.model is None:
             return 0
 
-        return np.nanmin(self.evaluate_value(self.model.regular_grid((10, 10, 10))))
+        return np.nanmin(self.evaluate_value(self.model.regular_grid(nsteps=(10, 10, 10))))
 
     def max(self):
         """Calculate the maximum value of the geological feature
@@ -257,7 +257,7 @@ def max(self):
         """
         if self.model is None:
             return 0
-        return np.nanmax(self.evaluate_value(self.model.regular_grid((10, 10, 10))))
+        return np.nanmax(self.evaluate_value(self.model.regular_grid(nsteps=(10, 10, 10))))
 
     def __tojson__(self):
         regions = [r.name for r in self.regions]

LoopStructural/modelling/intrusions/intrusion_builder.py

@@ -82,7 +82,7 @@ def create_grid_for_evaluation(self, spacing=None):
         if spacing is None:
             spacing = self.model.nsteps
 
-        grid_points = self.model.regular_grid(spacing, shuffle=False)
+        grid_points = self.model.regular_grid(nsteps=spacing, shuffle=False)
 
         grid_points_coord0 = self.intrusion_frame[0].evaluate_value(grid_points)
 

LoopStructural/modelling/intrusions/intrusion_frame_builder.py

@@ -168,7 +168,7 @@ def create_grid_for_indicator_fxs(self, spacing=None):
         if spacing is None:
             spacing = self.model.nsteps
 
-        grid_points = self.model.regular_grid(spacing, shuffle=False)
+        grid_points = self.model.regular_grid(nsteps=spacing, shuffle=False)
 
         self.grid_to_evaluate_ifx = grid_points
 

tests/integration/test_fold_models.py

@@ -16,7 +16,7 @@ def test_average_fold_axis():
     fold_frame = model.create_and_add_fold_frame("s1", nelements=10000)
     stratigraphy = model.create_and_add_folded_foliation(
         "s0",
-        fold_frame,
+        fold_frame=fold_frame,
         nelements=10000,
         av_fold_axis=True,
         # fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
@@ -39,7 +39,7 @@ def test_fixed_fold_axis():
     fold_frame = model.create_and_add_fold_frame("s1", nelements=10000)
     stratigraphy = model.create_and_add_folded_foliation(
         "s0",
-        fold_frame,
+        fold_frame=fold_frame,
         nelements=10000,
         # av_fold_axis=True
         fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
@@ -58,7 +58,7 @@ def test_fixed_wavelength():
     fold_frame = model.create_and_add_fold_frame("s1", nelements=10000)
     stratigraphy = model.create_and_add_folded_foliation(
         "s0",
-        fold_frame,
+        fold_frame=fold_frame,
         nelements=10000,
         # av_fold_axis=True
         fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],