(QUICKFIX) can pass fold axis to fold frame for

calculating fold axis rotation angle

Author: lachlangrose

LoopStructural/modelling/core/geological_model.py

@@ -695,13 +695,16 @@ def create_and_add_folded_foliation(self, foliation_data, fold_frame=None,
         self._add_faults(series_builder)
 
         series_builder.add_data_to_interpolator(True)
-        if "fold_axis" in kwargs:
-            fold.fold_axis = kwargs['fold_axis']
+        fold_axis = kwargs.get('fold_axis')
+        if fold_axis not None:
+            if len(fold_axis.shape) == 1:
+                fold.fold_axis = fold_axis
+        
         if "av_fold_axis" in kwargs:
             _calculate_average_intersection(series_builder, fold_frame, fold)
         if fold.fold_axis is None:
             far, fad = fold_frame.calculate_fold_axis_rotation(
-                series_builder)
+                series_builder,fold_axis=fold_axis)
             fold_axis_rotation = FoldRotationAngle(far, fad)
             a_wl = kwargs.get("axis_wl", None)
             if 'axis_function' in kwargs:

LoopStructural/modelling/fold/foldframe.py

@@ -22,7 +22,7 @@ def __init__(self, name, features, fold=None):
         super().__init__(name, features, fold)
         self.model = None
 
-    def calculate_fold_axis_rotation(self, feature_builder):
+    def calculate_fold_axis_rotation(self, feature_builder,fold_axis=None):
         """
         Calculate the fold axis rotation angle by finding the angle between the
         intersection lineation and the gradient to the 1st coordinate of the
@@ -43,6 +43,9 @@ def calculate_fold_axis_rotation(self, feature_builder):
             points.append(gpoints)
         if npoints.shape[0] > 0:
             points.append(npoints)
+        if fold_axis not None:
+            if fold_axis.shape[0] > 0 and fold_axis.shape[1] == 6:
+                points.append(fold_axis)
         if len(points) == 0:
             return 0, 0
         points = np.vstack(points)