LoopStructural 1.8.2__tar.gz → 1.8.4__tar.gz

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural/modelling/core/_model_feature_factory.py

@@ -31,6 +31,9 @@ from ...utils import getLogger
 
 logger = getLogger(__name__)
 
+# interpolator types that implement fold constraints
+FOLD_INTERPOLATOR_TYPES = ("DFI", "P2Fold")
+
 
 class ModelFeatureFactory:
     @staticmethod
@@ -216,6 +219,13 @@ class ModelFeatureFactory:
         fold_frame :  FoldFrame
         svario  : Boolean
             whether to calculate svariograms, saves time if avoided
+        interpolatortype : str
+            ``"DFI"`` (default, piecewise linear) or ``"P2Fold"`` (piecewise quadratic).
+            Other values are replaced by ``"DFI"`` with a warning.
+        nelements : int
+            requested structured-grid cell budget. Each cell splits into five
+            tetrahedra. For ``"P2Fold"``, a request of 1e4 gave about 56k tets
+            and 86k unknowns in the Bermagui validation; inspect the actual counts
         kwargs
             additional kwargs to be passed through to other functions
 
@@ -227,6 +237,7 @@ class ModelFeatureFactory:
         Notes
         -----
 
+        - The P2 mesh is larger than the model box because of ``buffer``.
         - Building a folded foliation uses the fold interpolation code from Laurent et al., 2016
         and fold profile fitting from Grose et al., 2017. For more information about the fold modelling
         see :class:`LoopStructural.modelling.features.fold.FoldEvent`,
@@ -245,8 +256,11 @@ class ModelFeatureFactory:
 
         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")
+        if interpolatortype not in FOLD_INTERPOLATOR_TYPES:
+            logger.warning(
+                f"Folded foliation only supports {FOLD_INTERPOLATOR_TYPES} interpolators, "
+                f"changing {interpolatortype} to DFI"
+            )
             interpolatortype = "DFI"
         series_builder = FoldedFeatureBuilder(
             interpolatortype=interpolatortype,
@@ -300,7 +314,10 @@ class ModelFeatureFactory:
         fold_frame_data : pandas data frame, optional
             data frame containing the fold frame data, if not specified uses the model data
         interpolatortype : str
-            the type of interpolator to use, default is 'FDI' (unused) 5/6/2025
+            ``"DFI"`` or ``"P2Fold"`` sets the interpolator of the first (fold) coordinate.
+            Any other value gives ``"DFI"``. The other two coordinates always use FDI.
+            ``nelements`` is a structured-grid cell budget, not a literal
+            tetrahedron count. P2 adds edge nodes; inspect the actual dof.
         fold_frame : StructuralFrame, optional
             the fold frame for the fold if not specified uses last feature added
         nelements : int
@@ -342,8 +359,9 @@ class ModelFeatureFactory:
             raise TypeError("Please specify a FoldFrame")
         fold = FoldEvent(fold_frame, name=f"Fold_{fold_frame_name}")
 
+        # the first coordinate carries the fold constraints, the others are plain FDI
         interpolatortypes = [
-            "DFI",
+            interpolatortype if interpolatortype in FOLD_INTERPOLATOR_TYPES else "DFI",
             "FDI",
             "FDI",
         ]

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural/modelling/core/_model_relationships.py

@@ -66,7 +66,8 @@ class FeatureRelationshipManager:
     def add_domain_fault_below(model, domain_fault):
         """
         Looks through the feature list and adds any the domain_fault to the features
-        that already exist in the stack until an unconformity is reached. domain faults
+        that already exist in the stack until an unconformity or another domain
+        fault is reached (that boundary is not cropped). domain faults
         to the feature. The domain fault masks everything where the fault scalar field
          is < 0 as being active when added to feature.
 
@@ -80,9 +81,15 @@ class FeatureRelationshipManager:
         for f in reversed(model.features):
             if f.name == domain_fault.name:
                 continue
-            f.add_region(region)
-            if f.type == FeatureType.UNCONFORMITY:
+            if f.type == FeatureType.UNCONFORMITY or f.type == FeatureType.DOMAINFAULT:
+                # An unconformity or domain fault added before this one is
+                # the boundary above the features this domain fault crops.
+                # It is a stopping point and is not itself cropped, else the
+                # boundary surface is removed on one side of this fault.
+                # This matches add_unconformity, which also stops before it
+                # crops.
                 break
+            f.add_region(region)
 
     @staticmethod
     def add_unconformity_above(model, feature):

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural/modelling/core/geological_model.py

@@ -793,7 +793,8 @@ class GeologicalModel:
         """Create a folded foliation and add it to the model.
 
         See :meth:`~._model_feature_factory.ModelFeatureFactory.build_folded_foliation`
-        for parameter documentation.
+        for parameter documentation. ``interpolatortype`` is ``"DFI"`` (default)
+        or ``"P2Fold"``.
         Thin wrapper around :meth:`create_and_add_feature` (see
         ``API.md``); kept as a stable, unchanged entry point.
         """

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural/modelling/features/builders/_folded_feature_builder.py

@@ -1,6 +1,7 @@
 import numpy as np
 
 from ....geometry import BoundingBox
+from ....interpolators import InterpolatorType
 from ....modelling.features import FeatureType
 from ._geological_feature_builder import GeologicalFeatureBuilder
 from ....modelling.features.fold.fold_function import FoldRotationType, get_fold_rotation_profile
@@ -71,8 +72,13 @@ class FoldedFeatureBuilder(GeologicalFeatureBuilder):
         if not isinstance(feature_builder, GeologicalFeatureBuilder):
             logger.error(f'Feature builder is {type(feature_builder)} not GeologicalFeatureBuilder')
             raise TypeError("feature_builder must be an instance of GeologicalFeatureBuilder")
+        # keep the fold type of the source builder, DFI otherwise
+        source_type = getattr(feature_builder.interpolator, "type", None)
+        interpolatortype = (
+            'P2Fold' if source_type == InterpolatorType.PIECEWISE_QUADRATIC_FOLD else 'DFI'
+        )
         builder = cls(
-            interpolatortype='DFI',
+            interpolatortype=interpolatortype,
             bounding_box=feature_builder.model.bounding_box,
             fold=fold,
             nelements=feature_builder.interpolator.n_elements,

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural/modelling/features/fold/_fold.py

@@ -104,22 +104,11 @@ class FoldEvent:
         dgz[mask, :] /= np.linalg.norm(dgz[mask, :], axis=1)[:, None]
         R2 = self.rot_mat(fold_axis, self.fold_limb_rotation(gx))
         fold_direction = np.einsum("ijk,ki->kj", R2, dgx)
-        fold_direction /= np.sum(fold_direction, axis=1)[:, None]
-        # calculate dot product between fold_direction and axis
-        # if its less than 0 then inverse dgz
-        d = np.einsum("ij,ik->i", fold_direction, fold_axis)
+        fold_direction /= np.linalg.norm(fold_direction, axis=1)[:, None]
 
         if self.invert_norm:
-            new_dgz = -dgz[mask][d[mask] < 0]
-            return fold_direction, fold_axis, new_dgz
-
-        elif not self.invert_norm:
-            return fold_direction, fold_axis, dgz
-        else:
-            logger.warning("invert fold frame param not valid. Defaulting to false.")
-            return fold_direction, fold_axis, dgz
-
-        # return fold_direction, fold_axis, dgz
+            dgz = -dgz
+        return fold_direction, fold_axis, dgz
 
     # def get_regularisation_direction(self, points):
     #     self.foldframe.features[2].evaluate_gradient(points)

{loopstructural-1.8.2 → loopstructural-1.8.4}/LoopStructural.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.8.2
+Version: 1.8.4
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

{loopstructural-1.8.2 → loopstructural-1.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.8.2
+Version: 1.8.4
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

{loopstructural-1.8.2 → loopstructural-1.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'LoopStructural'
-version = "1.8.2"
+version = "1.8.4"
 description = '3D geological modelling'
 authors = [{ name = 'Lachlan Grose', email = 'lachlan.grose@monash.edu' }]
 readme = 'README.md'
@@ -97,6 +97,7 @@ LoopStructural = { workspace = true }
 [tool.pytest.ini_options]
 addopts = "--import-mode=importlib"
 testpaths = ["tests"]
+pythonpath = ["."]
 
 [tool.isort]
 profile = 'black'