fix: create folded fold frame using updated code

Author: lachlangrose

LoopStructural/modelling/core/geological_model.py

@@ -1093,7 +1093,13 @@ def create_and_add_folded_foliation(
         return series_feature
 
     def create_and_add_folded_fold_frame(
-        self, fold_frame_data, fold_frame=None, tol=None, **kwargs
+        self,
+        fold_frame_data,
+        interpolatortype="FDI",
+        nelements=10000,
+        fold_frame=None,
+        tol=None,
+        **kwargs,
     ):
         """
 
@@ -1137,16 +1143,18 @@ def create_and_add_folded_fold_frame(
             fold_frame = self.features[-1]
         assert type(fold_frame) == FoldFrame, "Please specify a FoldFrame"
         fold = FoldEvent(fold_frame, name=f"Fold_{fold_frame_data}")
-        fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
-        gy_fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
-        frame_interpolator = self.get_interpolator(**kwargs)
-        interpolators = [
-            fold_interpolator,
-            gy_fold_interpolator,
-            frame_interpolator.copy(),
+        # fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
+        # gy_fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
+        # frame_interpolator = self.get_interpolator(**kwargs)
+        interpolatortypes = [
+            "DFI",
+            "FDI",
+            interpolatortype,
         ]
         fold_frame_builder = StructuralFrameBuilder(
-            interpolators=interpolators,
+            interpolatortype=interpolatortypes,
+            bounding_box=self.bounding_box.with_buffer(kwargs.get("buffer", 0.1)),
+            nelements=[nelements, nelements, nelements],
             name=fold_frame_data,
             fold=fold,
             frame=FoldFrame,

LoopStructural/modelling/features/builders/_structural_frame_builder.py

@@ -49,7 +49,7 @@ def __init__(
             self.name = kwargs["name"]
             kwargs.pop("name")
         self.data = [[], [], []]
-        self.fold = kwargs.get("fold", None)
+        self.fold = kwargs.pop("fold", None)
         # list of interpolators
         # self.interpolators = []
         # Create the interpolation objects by copying the template
@@ -66,10 +66,16 @@ def __init__(
                 f"nelements is {type(nelements)} and must be either a int or a list of ints"
             )
         # self.builders
-        if "fold" in kwargs:
-            raise LoopException("fold is deprecated please use frame")
+        if self.fold:
             self.builders.append(
-                FoldedFeatureBuilder(interpolators[0], name=f"{self.name}__0", **kwargs)
+                FoldedFeatureBuilder(
+                    interpolatortype[0],
+                    bounding_box,
+                    self.fold,
+                    nelements=nelements[0],
+                    name=f"{self.name}__0",
+                    **kwargs,
+                )
             )
         else:
             self.builders.append(
@@ -107,7 +113,7 @@ def __init__(
                 self.builders[1].feature,
                 self.builders[2].feature,
             ],
-            fold=kwargs.get("fold", None),
+            fold=self.fold,
         )
         self._frame.builder = self
 

LoopStructural/visualisation/model_plotter.py

@@ -291,7 +291,6 @@ def add_isosurface(
         # update the feature to make sure its current
 
         # do isosurfacing of support using marching tetras/cubes
-        print(self.bounding_box)
         x = np.linspace(
             self.bounding_box[0, 0], self.bounding_box[1, 0], self.nsteps[0]
         )