fix: rename optional data argument to data for consistency

Author: lachlangrose

LoopStructural/modelling/core/geological_model.py

@@ -616,7 +616,7 @@ def create_and_add_foliation(
         series_surface_name: str,
         *,
         index: Optional[int] = None,
-        series_surface_data: Optional[pd.DataFrame] = None,
+        data: Optional[pd.DataFrame] = None,
         interpolatortype: str = "FDI",
         nelements: int = LoopStructuralConfig.nelements,
         tol=None,
@@ -671,13 +671,13 @@ def create_and_add_foliation(
             **kwargs,
         )
         # add data
-        if series_surface_data is None:
-            series_surface_data = self.data.loc[self.data["feature_name"] == series_surface_name]
+        if data is None:
+            data = self.data.loc[self.data["feature_name"] == series_surface_name]
 
-        if series_surface_data.shape[0] == 0:
+        if data.shape[0] == 0:
             logger.warning("No data for {series_surface_data}, skipping")
             return
-        series_builder.add_data_from_data_frame(self.prepare_data(series_surface_data))
+        series_builder.add_data_from_data_frame(self.prepare_data(data))
         self._add_faults(series_builder, features=faults)
 
         # build feature
@@ -696,7 +696,7 @@ def create_and_add_fold_frame(
         fold_frame_name: str,
         *,
         index: Optional[int] = None,
-        fold_frame_data=None,
+        data=None,
         interpolatortype="FDI",
         nelements=LoopStructuralConfig.nelements,
         tol=None,
@@ -746,12 +746,12 @@ def create_and_add_fold_frame(
             **kwargs,
         )
         # add data
-        if fold_frame_data is None:
-            fold_frame_data = self.data.loc[self.data["feature_name"] == fold_frame_name]
-        if fold_frame_data.shape[0] == 0:
+        if data is None:
+            data = self.data.loc[self.data["feature_name"] == fold_frame_name]
+        if data.shape[0] == 0:
             logger.warning(f"No data for {fold_frame_name}, skipping")
             return
-        fold_frame_builder.add_data_from_data_frame(self.prepare_data(fold_frame_data))
+        fold_frame_builder.add_data_from_data_frame(self.prepare_data(data))
         self._add_faults(fold_frame_builder[0])
         self._add_faults(fold_frame_builder[1])
         self._add_faults(fold_frame_builder[2])
@@ -770,7 +770,7 @@ def create_and_add_folded_foliation(
         foliation_name,
         *,
         index: Optional[int] = None,
-        foliation_data=None,
+        data=None,
         interpolatortype="DFI",
         nelements=LoopStructuralConfig.nelements,
         buffer=0.1,
@@ -816,7 +816,7 @@ def create_and_add_folded_foliation(
             fold_frame = self.features[-1]
         assert isinstance(fold_frame, FoldFrame), "Please specify a FoldFrame"
 
-        fold = FoldEvent(fold_frame, name=f"Fold_{foliation_data}", invert_norm=invert_fold_norm)
+        fold = FoldEvent(fold_frame, name=f"Fold_{foliation_name}", invert_norm=invert_fold_norm)
 
         if interpolatortype != "DFI":
             logger.warning("Folded foliation only supports DFI interpolator, changing to DFI")
@@ -831,12 +831,12 @@ def create_and_add_folded_foliation(
             model=self,
             **kwargs,
         )
-        if foliation_data is None:
-            foliation_data = self.data.loc[self.data["feature_name"] == foliation_name]
-        if foliation_data.shape[0] == 0:
+        if data is None:
+            data = self.data.loc[self.data["feature_name"] == foliation_name]
+        if data.shape[0] == 0:
             logger.warning(f"No data for {foliation_name}, skipping")
             return
-        series_builder.add_data_from_data_frame(self.prepare_data(foliation_data))
+        series_builder.add_data_from_data_frame(self.prepare_data(data))
 
         self._add_faults(series_builder)
         # series_builder.add_data_to_interpolator(True)
@@ -847,7 +847,7 @@ def create_and_add_folded_foliation(
         # series_feature = series_builder.build(**kwargs)
         series_feature = series_builder.feature
         series_builder.update_build_arguments(kwargs)
-        series_feature.type = FeatureType.INTERPOLATED
+        series_feature.type = FeatureType.FOLDED
         series_feature.fold = fold
 
         self._add_feature(series_feature,index)
@@ -858,7 +858,7 @@ def create_and_add_folded_fold_frame(
         fold_frame_name: str,
         *,
         index: Optional[int] = None,
-        fold_frame_data: Optional[pd.DataFrame] = None,
+        data: Optional[pd.DataFrame] = None,
         interpolatortype="FDI",
         nelements=LoopStructuralConfig.nelements,
         fold_frame=None,
@@ -913,7 +913,7 @@ def create_and_add_folded_fold_frame(
             logger.info("Using last feature as fold frame")
             fold_frame = self.features[-1]
         assert isinstance(fold_frame, FoldFrame), "Please specify a FoldFrame"
-        fold = FoldEvent(fold_frame, name=f"Fold_{fold_frame_data}")
+        fold = FoldEvent(fold_frame, name=f"Fold_{fold_frame_name}")
 
         interpolatortypes = [
             "DFI",
@@ -930,9 +930,9 @@ def create_and_add_folded_fold_frame(
             model=self,
             **kwargs,
         )
-        if fold_frame_data is None:
-            fold_frame_data = self.data[self.data["feature_name"] == fold_frame_name]
-        fold_frame_builder.add_data_from_data_frame(self.prepare_data(fold_frame_data))
+        if data is None:
+            data = self.data[self.data["feature_name"] == fold_frame_name]
+        fold_frame_builder.add_data_from_data_frame(self.prepare_data(data))
 
         for i in range(3):
             self._add_faults(fold_frame_builder[i])
@@ -1293,7 +1293,7 @@ def create_and_add_fault(
         displacement: float,
         *,
         index: Optional[int] = None,
-        fault_data: Optional[pd.DataFrame] = None,
+        data: Optional[pd.DataFrame] = None,
         interpolatortype="FDI",
         tol=None,
         fault_slip_vector=None,
@@ -1387,9 +1387,9 @@ def create_and_add_fault(
             model=self,
             **kwargs,
         )
-        if fault_data is None:
-            fault_data = self.data.loc[self.data["feature_name"] == fault_name]
-        if fault_data.shape[0] == 0:
+        if data is None:
+            data = self.data.loc[self.data["feature_name"] == fault_name]
+        if data.shape[0] == 0:
             logger.warning(f"No data for {fault_name}, skipping")
             return
 
@@ -1405,7 +1405,7 @@ def create_and_add_fault(
         if intermediate_axis:
             intermediate_axis = intermediate_axis
         fault_frame_builder.create_data_from_geometry(
-            fault_frame_data=self.prepare_data(fault_data),
+            fault_frame_data=self.prepare_data(data),
             fault_center=fault_center,
             fault_normal_vector=fault_normal_vector,
             fault_slip_vector=fault_slip_vector,