LoopStructural 1.6.17__py3-none-any.whl → 1.6.19__py3-none-any.whl

LoopStructural/__init__.py

@@ -7,6 +7,9 @@ LoopStructural
 import logging
 from logging.config import dictConfig
 
+from dataclasses import dataclass
+
+
 __all__ = ["GeologicalModel"]
 import tempfile
 from pathlib import Path
@@ -18,6 +21,14 @@ formatter = logging.Formatter("%(levelname)s: %(asctime)s: %(filename)s:%(lineno
 ch.setFormatter(formatter)
 ch.setLevel(logging.WARNING)
 loggers = {}
+@dataclass
+class LoopStructuralConfig:
+    """
+    Configuration for LoopStructural 
+    """
+   
+    nelements: int = 10_000
+
 from .modelling.core.geological_model import GeologicalModel
 from .modelling.core.stratigraphic_column import StratigraphicColumn
 from .modelling.core.fault_topology import FaultTopology

LoopStructural/modelling/core/geological_model.py

@@ -2,6 +2,7 @@
 Main entry point for creating a geological model
 """
 
+from LoopStructural import LoopStructuralConfig
 from ...utils import getLogger
 
 import numpy as np
@@ -330,7 +331,21 @@ class GeologicalModel:
             name of the feature to return
         """
         return self.get_feature_by_name(feature_name)
+    def __setitem__(self, feature_name, feature):
+        """Set a feature in the model using feature_name_index
 
+        Parameters
+        ----------
+        feature_name : string
+            name of the feature to set
+        feature : GeologicalFeature
+            the geological feature to set
+        """
+        if not isinstance(feature, GeologicalFeature):
+            raise TypeError("feature must be a GeologicalFeature")
+        if feature.name != feature_name:
+            raise ValueError("feature name does not match key")
+        self._add_feature(feature)
     def __contains__(self, feature_name):
         return feature_name in self.feature_name_index
 
@@ -426,7 +441,7 @@ class GeologicalModel:
         except pickle.PicklingError:
             logger.error("Error saving file")
 
-    def _add_feature(self, feature):
+    def _add_feature(self, feature, index: Optional[int] = None):
         """
         Add a feature to the model stack
 
@@ -443,9 +458,18 @@ class GeologicalModel:
             )
             self.features[self.feature_name_index[feature.name]] = feature
         else:
-            self.features.append(feature)
-            self.feature_name_index[feature.name] = len(self.features) - 1
-            logger.info(f"Adding {feature.name} to model at location {len(self.features)}")
+            if index is not None:
+                if index < 0 or index > len(self.features):
+                    raise IndexError(f"Index {index} out of bounds for features list")
+                self.features.insert(index, feature)
+                self.feature_name_index[feature.name] = index
+                logger.info(f"Adding {feature.name} to model at location {index}")
+                for index, feature in enumerate(self.features):
+                    self.feature_name_index[feature.name] = index
+            else:
+                self.features.append(feature)
+                self.feature_name_index[feature.name] = len(self.features) - 1
+                logger.info(f"Adding {feature.name} to model at location {len(self.features)}")
         self._add_domain_fault_above(feature)
         if feature.type == FeatureType.INTERPOLATED:
             self._add_unconformity_above(feature)
@@ -553,21 +577,24 @@ class GeologicalModel:
         }
 
         """
-        self.stratigraphic_column.clear()
+        self.stratigraphic_column.clear(basement=False)
         # if the colour for a unit hasn't been specified we can just sample from
         # a colour map e.g. tab20
         logger.info("Adding stratigraphic column to model")
         DeprecationWarning(
             "set_stratigraphic_column is deprecated, use model.stratigraphic_column.add_units instead"
         )
-        for g in stratigraphic_column.keys():
+        for i, g in enumerate(stratigraphic_column.keys()):
+            if g == 'faults':
+                logger.info('Not adding faults to stratigraphic column')
+                continue
             for u in stratigraphic_column[g].keys():
                 thickness = 0
                 if "min" in stratigraphic_column[g][u] and "max" in stratigraphic_column[g][u]:
                     min_val = stratigraphic_column[g][u]["min"]
                     max_val = stratigraphic_column[g][u].get("max", None)
                     thickness = max_val - min_val if max_val is not None else None
-                logger.warning(
+                logger.info(
                     f"""
                                model.stratigraphic_column.add_unit({u},
                                colour={stratigraphic_column[g][u].get("colour", None)},
@@ -578,17 +605,20 @@ class GeologicalModel:
                     colour=stratigraphic_column[g][u].get("colour", None),
                     thickness=thickness,
                 )
+
             self.stratigraphic_column.add_unconformity(
                 name=''.join([g, 'unconformity']),
             )
+            self.stratigraphic_column.group_mapping[f'Group_{i}'] = g
 
     def create_and_add_foliation(
         self,
         series_surface_name: str,
         *,
-        series_surface_data: pd.DataFrame = None,
+        index: Optional[int] = None,
+        series_surface_data: Optional[pd.DataFrame] = None,
         interpolatortype: str = "FDI",
-        nelements: int = 1000,
+        nelements: int = LoopStructuralConfig.nelements,
         tol=None,
         faults=None,
         **kwargs,
@@ -658,16 +688,17 @@ class GeologicalModel:
         # could just pass a regular grid of points - mask by any above unconformities??
 
         series_feature.type = FeatureType.INTERPOLATED
-        self._add_feature(series_feature)
+        self._add_feature(series_feature,index=index)
         return series_feature
 
     def create_and_add_fold_frame(
         self,
         fold_frame_name: str,
         *,
+        index: Optional[int] = None,
         fold_frame_data=None,
         interpolatortype="FDI",
-        nelements=1000,
+        nelements=LoopStructuralConfig.nelements,
         tol=None,
         buffer=0.1,
         **kwargs,
@@ -730,7 +761,7 @@ class GeologicalModel:
 
         fold_frame.type = FeatureType.STRUCTURALFRAME
         fold_frame.builder = fold_frame_builder
-        self._add_feature(fold_frame)
+        self._add_feature(fold_frame,index=index)
 
         return fold_frame
 
@@ -738,9 +769,10 @@ class GeologicalModel:
         self,
         foliation_name,
         *,
+        index: Optional[int] = None,
         foliation_data=None,
         interpolatortype="DFI",
-        nelements=10000,
+        nelements=LoopStructuralConfig.nelements,
         buffer=0.1,
         fold_frame=None,
         svario=True,
@@ -818,16 +850,17 @@ class GeologicalModel:
         series_feature.type = FeatureType.INTERPOLATED
         series_feature.fold = fold
 
-        self._add_feature(series_feature)
+        self._add_feature(series_feature,index)
         return series_feature
 
     def create_and_add_folded_fold_frame(
         self,
         fold_frame_name: str,
         *,
+        index: Optional[int] = None,
         fold_frame_data: Optional[pd.DataFrame] = None,
         interpolatortype="FDI",
-        nelements=10000,
+        nelements=LoopStructuralConfig.nelements,
         fold_frame=None,
         tol=None,
         **kwargs,
@@ -913,7 +946,7 @@ class GeologicalModel:
 
         folded_fold_frame.type = FeatureType.STRUCTURALFRAME
 
-        self._add_feature(folded_fold_frame)
+        self._add_feature(folded_fold_frame,index=index)
 
         return folded_fold_frame
 
@@ -976,14 +1009,14 @@ class GeologicalModel:
 
         interpolatortype = kwargs.get("interpolatortype", "PLI")
         # buffer = kwargs.get("buffer", 0.1)
-        nelements = kwargs.get("nelements", 1e2)
+        nelements = kwargs.get("nelements", LoopStructuralConfig.nelements)
 
         weights = [gxxgz, gxxgy, gyxgz]
 
         intrusion_frame_builder = IntrusionFrameBuilder(
             interpolatortype=interpolatortype,
             bounding_box=self.bounding_box.with_buffer(kwargs.get("buffer", 0.1)),
-            nelements=kwargs.get("nelements", 1e2),
+            nelements=kwargs.get("nelements", LoopStructuralConfig.nelements),
             name=intrusion_frame_name,
             model=self,
             **kwargs,
@@ -1126,7 +1159,7 @@ class GeologicalModel:
                 feature.add_region(f)
                 break
 
-    def add_unconformity(self, feature: GeologicalFeature, value: float) -> UnconformityFeature:
+    def add_unconformity(self, feature: GeologicalFeature, value: float, index: Optional[int] = None) -> UnconformityFeature:
         """
         Use an existing feature to add an unconformity to the model.
 
@@ -1163,10 +1196,10 @@ class GeologicalModel:
             else:
                 f.add_region(uc_feature)
         # now add the unconformity to the feature list
-        self._add_feature(uc_feature)
+        self._add_feature(uc_feature,index=index)
         return uc_feature
 
-    def add_onlap_unconformity(self, feature: GeologicalFeature, value: float) -> GeologicalFeature:
+    def add_onlap_unconformity(self, feature: GeologicalFeature, value: float, index: Optional[int] = None) -> GeologicalFeature:
         """
         Use an existing feature to add an unconformity to the model.
 
@@ -1194,12 +1227,18 @@ class GeologicalModel:
                 continue
             if f != feature:
                 f.add_region(uc_feature)
-        self._add_feature(uc_feature.inverse())
+        self._add_feature(uc_feature.inverse(),index=index)
 
         return uc_feature
 
     def create_and_add_domain_fault(
-        self, fault_surface_data, *, nelements=10000, interpolatortype="FDI", **kwargs
+        self,
+        fault_surface_data,
+        *,
+        nelements=LoopStructuralConfig.nelements,
+        interpolatortype="FDI",
+        index: Optional[int] = None,
+        **kwargs,
     ):
         """
         Parameters
@@ -1240,7 +1279,7 @@ class GeologicalModel:
         domain_fault = domain_fault_feature_builder.feature
         domain_fault_feature_builder.update_build_arguments(kwargs)
         domain_fault.type = FeatureType.DOMAINFAULT
-        self._add_feature(domain_fault)
+        self._add_feature(domain_fault, index=index)
         self._add_domain_fault_below(domain_fault)
 
         domain_fault_uc = UnconformityFeature(domain_fault, 0)
@@ -1253,6 +1292,7 @@ class GeologicalModel:
         fault_name: str,
         displacement: float,
         *,
+        index: Optional[int] = None,
         fault_data: Optional[pd.DataFrame] = None,
         interpolatortype="FDI",
         tol=None,
@@ -1342,7 +1382,7 @@ class GeologicalModel:
         fault_frame_builder = FaultBuilder(
             interpolatortype,
             bounding_box=self.bounding_box,
-            nelements=kwargs.pop("nelements", 1e4),
+            nelements=kwargs.pop("nelements", LoopStructuralConfig.nelements),
             name=fault_name,
             model=self,
             **kwargs,
@@ -1397,7 +1437,7 @@ class GeologicalModel:
                 break
         if displacement == 0:
             fault.type = FeatureType.INACTIVEFAULT
-        self._add_feature(fault)
+        self._add_feature(fault,index=index)
 
         return fault
 
@@ -1513,18 +1553,18 @@ class GeologicalModel:
         if self.stratigraphic_column is None:
             logger.warning("No stratigraphic column defined")
             return strat_id
-        
+
         s_id = 0
         for g in reversed(self.stratigraphic_column.get_groups()):
             feature_id = self.feature_name_index.get(g.name, -1)
             if feature_id >= 0:
                 vals = self.features[feature_id].evaluate_value(xyz)
                 for u in g.units:
-                    strat_id[np.logical_and(vals < u.max, vals > u.min)] = s_id 
+                    strat_id[np.logical_and(vals < u.max(), vals > u.min())] = s_id
                     s_id += 1
             if feature_id == -1:
                 logger.error(f"Model does not contain {g.name}")
-        
+
         return strat_id
 
     def evaluate_model_gradient(self, points: np.ndarray, *, scale: bool = True) -> np.ndarray:
@@ -1546,16 +1586,13 @@ class GeologicalModel:
         if scale:
             xyz = self.scale(xyz, inplace=False)
         grad = np.zeros(xyz.shape)
-        for group in reversed(self.stratigraphic_column.keys()):
-            if group == "faults":
-                continue
-            feature_id = self.feature_name_index.get(group, -1)
+        for g in reversed(self.stratigraphic_column.get_groups()):
+            feature_id = self.feature_name_index.get(g.name, -1)
             if feature_id >= 0:
-                feature = self.features[feature_id]
-                gradt = feature.evaluate_gradient(xyz)
+                gradt = self.features[feature_id].evaluate_gradient(xyz)
                 grad[~np.isnan(gradt).any(axis=1)] = gradt[~np.isnan(gradt).any(axis=1)]
             if feature_id == -1:
-                logger.error(f"Model does not contain {group}")
+                logger.error(f"Model does not contain {g.name}")
 
         return grad
 
@@ -1725,16 +1762,7 @@ class GeologicalModel:
         ids : list
             list of unique stratigraphic ids, featurename, unit name and min and max scalar values
         """
-        ids = []
-        if self.stratigraphic_column is None:
-            logger.warning('No stratigraphic column defined')
-            return ids
-        for group in self.stratigraphic_column.keys():
-            if group == "faults":
-                continue
-            for name, series in self.stratigraphic_column[group].items():
-                ids.append([series["id"], group, name, series['min'], series['max']])
-        return ids
+        return self.stratigraphic_column.get_stratigraphic_ids()
 
     def get_fault_surfaces(self, faults: List[str] = []):
         surfaces = []

LoopStructural/modelling/core/stratigraphic_column.py

@@ -1,7 +1,7 @@
 import enum
 from typing import Dict, Optional, List, Tuple
 import numpy as np
-from LoopStructural.utils import rng, getLogger, Observable
+from LoopStructural.utils import rng, getLogger, Observable, random_colour
 logger = getLogger(__name__)
 logger.info("Imported LoopStructural Stratigraphic Column module")
 class UnconformityType(enum.Enum):
@@ -39,24 +39,59 @@ class StratigraphicColumnElement:
         self.uuid = uuid
 
 
-class StratigraphicUnit(StratigraphicColumnElement):
+class StratigraphicUnit(StratigraphicColumnElement, Observable['StratigraphicUnit']):
     """
     A class to represent a stratigraphic unit.
     """
 
-    def __init__(self, *, uuid=None, name=None, colour=None, thickness=None, data=None):
+    def __init__(self, *, uuid=None, name=None, colour=None, thickness=None, data=None, id=None):
         """
         Initializes the StratigraphicUnit with a name and an optional description.
         """
-        super().__init__(uuid)
+        StratigraphicColumnElement.__init__(self, uuid)
+        Observable.__init__(self)
         self.name = name
         if colour is None:
             colour = rng.random(3)
         self.colour = colour
-        self.thickness = thickness
+        self._thickness = thickness
         self.data = data
         self.element_type = StratigraphicColumnElementType.UNIT
-
+        self.id = id
+        self.min_value = None  # Minimum scalar field value for the unit
+        self.max_value = None  # Maximum scalar field value for the unit
+    @property
+    def id(self):
+        return self._id
+    @property
+    def thickness(self):
+        return self._thickness
+    @thickness.setter
+    def thickness(self, value):
+        """
+        Sets the thickness of the unit.
+        """
+        self._thickness = value
+        self.notify('unit/thickness_updated', unit=self)
+    @id.setter
+    def id(self, value):
+        """
+        Sets the ID of the unit.
+        """
+        if not isinstance(value, int):
+            raise TypeError("ID must be an integer")
+        self._id = value
+        self.notify('unit/id_updated', unit=self)
+    def min(self):
+        """
+        Returns the minimum value of the unit.
+        """
+        return self.min_value if self.min_value is not None else 0
+    def max(self):
+        """
+        Returns the maximum value of the unit.
+        """
+        return self.max_value if self.max_value is not None else np.inf
     def to_dict(self):
         """
         Converts the stratigraphic unit to a dictionary representation.
@@ -64,7 +99,7 @@ class StratigraphicUnit(StratigraphicColumnElement):
         colour = self.colour
         if isinstance(colour, np.ndarray):
             colour = colour.astype(float).tolist()
-        return {"name": self.name, "colour": colour, "thickness": self.thickness, 'uuid': self.uuid}
+        return {"name": self.name, "colour": colour, "thickness": self.thickness, 'uuid': self.uuid, 'id': self.id}
 
     @classmethod
     def from_dict(cls, data):
@@ -77,7 +112,7 @@ class StratigraphicUnit(StratigraphicColumnElement):
         colour = data.get("colour")
         thickness = data.get("thickness", None)
         uuid = data.get("uuid", None)
-        return cls(uuid=uuid, name=name, colour=colour, thickness=thickness)
+        return cls(uuid=uuid, name=name, colour=colour, thickness=thickness, id=data.get("id", None))
 
     def __str__(self):
         """
@@ -164,20 +199,37 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         Initializes the StratigraphicColumn with a name and a list of layers.
         """
         super().__init__()
-        self.order = [StratigraphicUnit(name='Basement', colour='grey', thickness=np.inf),StratigraphicUnconformity(name='Base Unconformity', unconformity_type=UnconformityType.ERODE)]
+        self.order = []
+        self.add_basement()
         self.group_mapping = {}
-    def clear(self,basement=True):
+
+    def get_new_id(self):
+        """
+        Generates a new unique ID for a stratigraphic unit.
+        """
+        if not self.order:
+            return 0
+        return max([u.id for u in self.order if isinstance(u, StratigraphicUnit)], default=0) + 1
+    def add_basement(self):
+        self.add_unit(name='Basement', colour='grey', thickness=np.inf)
+        self.add_unconformity(
+            name='Base Unconformity', unconformity_type=UnconformityType.ERODE
+        )
+    def clear(self, basement=True):
         """
         Clears the stratigraphic column, removing all elements.
         """
         if basement:
-            self.order = [StratigraphicUnit(name='Basement', colour='grey', thickness=np.inf),StratigraphicUnconformity(name='Base Unconformity', unconformity_type=UnconformityType.ERODE)]
+            self.add_basement()
+            
         else:
             self.order = []
         self.group_mapping = {}
         self.notify('column_cleared')
-    def add_unit(self, name,*, colour=None, thickness=None, where='top'):
-        unit = StratigraphicUnit(name=name, colour=colour, thickness=thickness)
+    def add_unit(self, name,*, colour=None, thickness=None, where='top',id=None):
+        if id is None:
+            id = self.get_new_id()
+        unit = StratigraphicUnit(name=name, colour=colour, thickness=thickness, id=id)
 
         if where == 'top':
             self.order.append(unit)
@@ -185,7 +237,9 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             self.order.insert(0, unit)
         else:
             raise ValueError("Invalid 'where' argument. Use 'top' or 'bottom'.")
+        unit.attach(self.update_unit_values,'unit/*')
         self.notify('unit_added', unit=unit)
+        self.update_unit_values()  # Update min and max values after adding a unit
         return unit
 
     def remove_unit(self, uuid):
@@ -197,7 +251,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
                 del self.order[i]
                 self.notify('unit_removed', uuid=uuid)
                 return True
-        
+
         return False
 
     def add_unconformity(self, name, *, unconformity_type=UnconformityType.ERODE, where='top' ):
@@ -249,7 +303,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             if element.uuid == uuid:
                 return element
         raise KeyError(f"No element found with uuid: {uuid}")
-    
+
     def get_group_for_unit_name(self, unit_name:str) -> Optional[StratigraphicGroup]:
         """
         Retrieves the group for a given unit name.
@@ -300,7 +354,15 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         if group:
             groups.append(group)
         return groups
+    def get_stratigraphic_ids(self) -> List[List[str]]:
+        ids = []
+        for group in self.get_groups():
+            if group == "faults":
+                continue
 
+            for unit in group.units:
+                ids.append([unit.id, group, unit.name, unit.min(), unit.max()])
+        return ids
     def get_unitname_groups(self):
         groups = self.get_groups()
         groups_list = []
@@ -309,7 +371,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             group = [u.name for u in g.units if isinstance(u, StratigraphicUnit)]
             groups_list.append(group)
         return groups_list
-    
+
     def get_group_unit_pairs(self) -> List[Tuple[str,str]]:
         """
         Returns a list of tuples containing group names and unit names.
@@ -341,6 +403,20 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             self.__getitem__(uuid) for uuid in new_order if self.__getitem__(uuid) is not None
         ]
         self.notify('order_updated', new_order=self.order)
+        self.update_unit_values()  # Update min and max values after updating the order
+    def update_unit_values(self, *, observable: Optional["Observable"] = None, event: Optional[str]= None):
+        """
+        Updates the min and max values for each unit based on their position in the column.
+        """
+        # If the event is not 'unit/*', skip the update
+        if event is not None and event != 'unit/*':
+            return
+        cumulative_thickness = 0
+        for element in self.order:
+            if isinstance(element, StratigraphicUnit):
+                element.min_value = cumulative_thickness
+                element.max_value = cumulative_thickness + (element.thickness or 0)
+                cumulative_thickness = element.max_value
 
     def update_element(self, unit_data: Dict):
         """
@@ -360,6 +436,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
                 unit_data.get('unconformity_type', element.unconformity_type.value)
             )
         self.notify('element_updated', element=element)
+        self.update_unit_values()  # Update min and max values after updating an element
 
     def __str__(self):
         """
@@ -498,3 +575,29 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         ax.axis("off")
 
         return fig
+    
+    def cmap(self):
+        try:
+            import matplotlib.colors as colors
+
+            colours = []
+            boundaries = []
+            data = []
+            for group in self.get_groups():
+                for u in group.units:
+                    colour = u.colour
+                    if not isinstance(colour, str):
+                        try:
+                            u.colour = colors.to_hex(colour)
+                        except ValueError:
+                            logger.warning(f"Cannot convert colour {colour} to hex, using default")
+                            u.colour = random_colour()
+                    data.append((u.id, u.colour))
+                    colours.append(u.colour)
+                    boundaries.append(u.id)
+             # print(u,v)
+            cmap = colors.ListedColormap(colours)
+        except ImportError:
+            logger.warning("Cannot use predefined colours as I can't import matplotlib")
+            cmap = "tab20"
+        return cmap

LoopStructural/modelling/features/_feature_converters.py

@@ -0,0 +1,13 @@
+from LoopStructural.modelling.features.fold import FoldEvent
+from LoopStructural.modelling.features.builders import FoldedFeatureBuilder
+def add_fold_to_feature(feature, fold_frame,**kwargs):
+    fold = FoldEvent(fold_frame, name=f"Fold_{feature.name}", invert_norm=kwargs.get('invert_fold_norm', False))
+
+    builder = FoldedFeatureBuilder.from_feature_builder(
+        feature.builder,
+        fold, 
+        **kwargs
+    )
+    feature = builder.feature
+    feature.fold = fold
+    return feature

LoopStructural/modelling/features/_geological_feature.py

@@ -77,7 +77,7 @@ class GeologicalFeature(BaseFeature):
         print(self.name, json)
         json["interpolator"] = self.interpolator.to_json()
         return json
-
+    
     def is_valid(self):
         return self.interpolator.valid
 

LoopStructural/modelling/features/builders/_folded_feature_builder.py

@@ -56,7 +56,22 @@ class FoldedFeatureBuilder(GeologicalFeatureBuilder):
         self.svario = svario
         self.axis_profile_type = axis_profile_type
         self.limb_profile_type = limb_profile_type
-
+    @classmethod
+    def from_feature_builder(cls, feature_builder, fold, **kwargs):
+        """Create a FoldedFeatureBuilder from an existing feature builder"""
+        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")
+        builder = cls(
+            interpolatortype='DFI',
+            bounding_box=feature_builder.model.bounding_box,
+            fold=fold,
+            nelements=feature_builder.interpolator.n_elements,
+            name=feature_builder.name,
+            **kwargs
+        )
+        builder.data = feature_builder.data
+        return builder
     @property
     def fold_axis_rotation(self):
         if self.fold.fold_axis_rotation is None:

LoopStructural/modelling/features/builders/_geological_feature_builder.py

@@ -168,6 +168,9 @@ class GeologicalFeatureBuilder(BaseBuilder):
         -------
 
         """
+        logger.info('Adding data to interpolator for {}'.format(self.name))
+        logger.info(f"Data shape: {self.data.shape}")
+        logger.info(f'Constrained: {constrained}, force_constrained: {force_constrained}')
         if self.data_added:
             logger.info("Data already added to interpolator")
             return

LoopStructural/modelling/features/fold/__init__.py

@@ -4,3 +4,4 @@ from ._fold import FoldEvent
 from ._svariogram import SVariogram
 from ._fold_rotation_angle_feature import FoldRotationAngleFeature
 from ._foldframe import FoldFrame
+from ._fold import FoldEvent

LoopStructural/modelling/features/fold/_svariogram.py

@@ -189,6 +189,9 @@ class SVariogram:
         # find the extrema of the average curve
         res = find_peaks_and_troughs(np.array(averagex), np.array(averagey))
         px2, py2 = res
+        logger.info(f"Found {len(px2)} peaks and troughs in the s-variogram")
+        for i in range(len(px2)):
+            logger.info(f"Peak {i}: {px2[i]} {py2[i]}")
         wl1 = 0.0
         wl1py = 0.0
         for i in range(len(px)):

LoopStructural/modelling/input/process_data.py

@@ -486,6 +486,8 @@ class ProcessInputData:
 
     @property
     def contacts(self):
+        if self._contacts is None:
+            return None
         contacts = self._contacts.copy()
         if self._use_thickness:
             contacts["val"] = np.nan

LoopStructural/utils/observer.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from contextlib import contextmanager
-from typing import Any, Generic, Protocol, TypeAlias, TypeVar, runtime_checkable
+from typing import Any, Generic, Protocol, TypeVar, runtime_checkable
 import threading
 import weakref
 
@@ -17,7 +17,7 @@ class Observer(Protocol):
         """Receive a notification."""
 
 
-Callback: TypeAlias = Callable[["Observable", str, Any], None]
+Callback = Callable[["Observable", str, Any], None]
 T = TypeVar("T", bound="Observable")
 
 

LoopStructural/version.py

@@ -1 +1 @@
-__version__ = "1.6.17"
+__version__ = "1.6.19"

{loopstructural-1.6.17.dist-info → loopstructural-1.6.19.dist-info}/METADATA

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

{loopstructural-1.6.17.dist-info → loopstructural-1.6.19.dist-info}/RECORD

@@ -1,5 +1,5 @@
-LoopStructural/__init__.py,sha256=ZS5J2TI2OuhRE0o3EXmPbbjrvh1-Vy9RFwL7Hc1YBow,2079
-LoopStructural/version.py,sha256=RFX1x9AQ2Z9aP2gCXAUVtaLq0UOmist-rpJN8M8jz9I,23
+LoopStructural/__init__.py,sha256=9tewNqv_9i7vUYMb1srpOWpf65W-moA2HvrQa9gyafA,2241
+LoopStructural/version.py,sha256=I8uXXwavJaLZ9jm7LRGiJ1SesWg2mEPBHjsl8No1pA4,23
 LoopStructural/datasets/__init__.py,sha256=ylb7fzJU_DyQ73LlwQos7VamqkDSGITbbnoKg7KAOmE,677
 LoopStructural/datasets/_base.py,sha256=FB_D5ybBYHoaNbycdkpZcRffzjrrL1xp9X0k-pyob9Y,7618
 LoopStructural/datasets/_example_models.py,sha256=Zg33IeUyh4C-lC0DRMLqCDP2IrX8L-gNV1WxJwBGjzM,113
@@ -72,13 +72,14 @@ LoopStructural/interpolators/supports/_support_factory.py,sha256=XNAxnr-JS3KEhds
 LoopStructural/modelling/__init__.py,sha256=a-bq2gDhyUlcky5l9kl_IP3ExMdohkgYjQz2V8madQE,902
 LoopStructural/modelling/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 LoopStructural/modelling/core/fault_topology.py,sha256=bChp5dnfc-4GJRENWxB14mEW_13uBMh5ZYRKbLdjweE,11195
-LoopStructural/modelling/core/geological_model.py,sha256=23ZQF2Xvs-PeRdrxt-IqrkVaMDWud_JjW00ok2tKs2k,65850
-LoopStructural/modelling/core/stratigraphic_column.py,sha256=GB93W607LY3d_NE75lzwBWrV34YhHN_troCXWuUMBk8,18070
+LoopStructural/modelling/core/geological_model.py,sha256=qlK4yI_6ZWM08lfS8ynqD612_VEHFRgVDDJgjzCIrZA,67414
+LoopStructural/modelling/core/stratigraphic_column.py,sha256=lOQb3zWS6EEqSzCMZsy9Q9ncFFkIku_lNjgpHtD7zCs,21860
 LoopStructural/modelling/features/__init__.py,sha256=Vf-qd5EDBtJ1DpuXXyCcw2-wf6LWPRW5wzxDEO3vOc8,939
 LoopStructural/modelling/features/_analytical_feature.py,sha256=U_g86LgQhYY2359rdsDqpvziYwqrWkc5EdvhJARiUWo,3597
 LoopStructural/modelling/features/_base_geological_feature.py,sha256=kGyrbb8nNzfi-M8WSrVMEQYKtxThdcBxaji5HKXtAqw,13483
 LoopStructural/modelling/features/_cross_product_geological_feature.py,sha256=GIyCHUdE6F-bse2e4puG9V2f7qRtDVfby5PRe2BboD4,3021
-LoopStructural/modelling/features/_geological_feature.py,sha256=u6pbKj9BujX1Ijj5eVdhwGDNjrIAI16CpiAn5n8g3RY,11279
+LoopStructural/modelling/features/_feature_converters.py,sha256=gG6Gxidm4PYV3PqkWi-auefusHB-ZGuVSgORcM9yisQ,499
+LoopStructural/modelling/features/_geological_feature.py,sha256=V5Ars8utx-AsEPVgMsoMzHFREeIByodzPPdEwblPGbo,11283
 LoopStructural/modelling/features/_lambda_geological_feature.py,sha256=GiB19l6v5WvvR8CitATZvCwaOfRyLuzchoXzpNupsfM,5743
 LoopStructural/modelling/features/_projected_vector_feature.py,sha256=aifVLgn2spmK7GGlO0iHDewf1pFL-QoRzZEePTZwX1s,3017
 LoopStructural/modelling/features/_region.py,sha256=TB4qnoTDQM2VgRjgyODN839fKe3kuRYLllJj0xnDKXo,478
@@ -87,18 +88,18 @@ LoopStructural/modelling/features/_unconformity_feature.py,sha256=2Bx0BI38YLdcNv
 LoopStructural/modelling/features/builders/__init__.py,sha256=Gqld1C-PcaXfJ8vpkWMDCmehmd3hZNYQk1knPtl59Bk,266
 LoopStructural/modelling/features/builders/_base_builder.py,sha256=N3txGC98V08A8-k2TLdoIWgWLfblZ91kaTvciPq_QVM,3750
 LoopStructural/modelling/features/builders/_fault_builder.py,sha256=_DZ0Hy_-jjm2fFU-5lY60zGisixdUWbAjsOQzMFKigY,25359
-LoopStructural/modelling/features/builders/_folded_feature_builder.py,sha256=1_0BVTzcvmFl6K3_lX-jF0tiMFPmS8j6vPeSLn9MbrE,6607
-LoopStructural/modelling/features/builders/_geological_feature_builder.py,sha256=tQJJol1U5wH6V0Rw3OgigCFPssv8uOPQ5jdwdLFg3cc,22015
+LoopStructural/modelling/features/builders/_folded_feature_builder.py,sha256=SuJKnTxcrwTIz3y6Ph9xNKm0RbXSNZEy89vd8epAefQ,7377
+LoopStructural/modelling/features/builders/_geological_feature_builder.py,sha256=7XhgwPXQZkky4Gnr4Q3t95YlDdtJ6mjBk7dsjzXB2QI,22236
 LoopStructural/modelling/features/builders/_structural_frame_builder.py,sha256=ms3-fuFpDEarjzYU5W499TquOIlTwHPUibVxIypfmWY,8019
 LoopStructural/modelling/features/fault/__init__.py,sha256=4u0KfYzmoO-ddFGo9qd9ov0gBoLqBiPAUsaw5zhEOAQ,189
 LoopStructural/modelling/features/fault/_fault_function.py,sha256=QEPh2jIvgD68hEJc5SM5xuMzZw-93V1me1ZbK9G2TB0,12655
 LoopStructural/modelling/features/fault/_fault_function_feature.py,sha256=4m0jVNx7ewrVI0pECI1wNciv8Cy8FzhZrYDjKJ_e2GU,2558
 LoopStructural/modelling/features/fault/_fault_segment.py,sha256=BEIVAY_-iQYYuoyIj1doq_cDLgmMpY0PDYBiuBXOjN8,18309
-LoopStructural/modelling/features/fold/__init__.py,sha256=pOv20yQvshZozvmO_YFw2E7Prp9DExlm855N-0SnxbQ,175
+LoopStructural/modelling/features/fold/__init__.py,sha256=Id6XlE4NSXUEBfHtrqcC7yLByngjMfK2IDKaNGEIFJ8,204
 LoopStructural/modelling/features/fold/_fold.py,sha256=bPnnLUSiF4uoMRg8aHoOSTPRgaM0JyLoRQPu5_A-J3w,5448
 LoopStructural/modelling/features/fold/_fold_rotation_angle_feature.py,sha256=CXLbFRQ3CrTMAcHmfdbKcmSvvLs9_6TLe0Wqi1pK2tg,892
 LoopStructural/modelling/features/fold/_foldframe.py,sha256=Rgf5aofN0OVDTZ2pzqLzAGlJUO2rnNm3aFvLSnH77yo,7669
-LoopStructural/modelling/features/fold/_svariogram.py,sha256=uzGaKZ5HGh8xZcsGGg68GUKVjkd5udLy7-4lh0NQc2Y,7765
+LoopStructural/modelling/features/fold/_svariogram.py,sha256=uLeBWZahEmystf8mpPJH_zKxp7hPyPJh0H5ROZO0pZs,7933
 LoopStructural/modelling/features/fold/fold_function/__init__.py,sha256=VqMjabsBd5GnPnDMXeKwXqtd0te2iXnvHxpf6jCC9YU,830
 LoopStructural/modelling/features/fold/fold_function/_base_fold_rotation_angle.py,sha256=5Bu_5xjyu4KL7thZ4fsh938Ep3Oyh5TL7_rfz_13Qng,8047
 LoopStructural/modelling/features/fold/fold_function/_fourier_series_fold_rotation_angle.py,sha256=Cjb6Pt6cdRoH3WGqFyJ2rHxnMe6SKvzRayA6hTuwZA8,4069
@@ -107,7 +108,7 @@ LoopStructural/modelling/features/fold/fold_function/_trigo_fold_rotation_angle.
 LoopStructural/modelling/input/__init__.py,sha256=HhJM3V5b-8_64LiRbF3Bd1pjWhJlcknxMSMPRrqZ0-I,153
 LoopStructural/modelling/input/fault_network.py,sha256=0uxl7lOySdhMhNXoiOkuiHIXqAz1Ls0j-W65cmdQoP8,2348
 LoopStructural/modelling/input/map2loop_processor.py,sha256=T7Fgqd7FNJWylLKvfIniRZBMRMeAoP8iU330-WYU8Fg,7031
-LoopStructural/modelling/input/process_data.py,sha256=9xWZtFWbE5NjJzULSZDJt-qccV0GuZ-oNMi3nfxPT-M,26293
+LoopStructural/modelling/input/process_data.py,sha256=zCzg3_h9lZ4uuzZ3VBguYVTAJqrx0x38yiSY0cKqXyM,26352
 LoopStructural/modelling/input/project_file.py,sha256=WhJkMfDK9uE7MK7HK-YK6ZOBAdwLX5P7ThZgXj444Eg,4604
 LoopStructural/modelling/intrusions/__init__.py,sha256=EpZK3cHJwGQhPUYIwKCKu8vkNdt_nOgWF0zfhiqDYDA,712
 LoopStructural/modelling/intrusions/geom_conceptual_models.py,sha256=jwTlhYySUj7z4DEnJoi4AINZB_N3-SW6ONRFL66OsW0,3665
@@ -129,13 +130,13 @@ LoopStructural/utils/json_encoder.py,sha256=5YNouf1TlhjEqOYgthd07MRXc0JLgxern-ny
 LoopStructural/utils/linalg.py,sha256=tBXyu6NXcG2AcPuzUMnkVI4ncZWtE_MPHGj2PLXRwfY,123
 LoopStructural/utils/logging.py,sha256=dIUWEsS2lT4G1dsf4ZYXknTR7eQkrgvGA4b_E0vMIRU,2402
 LoopStructural/utils/maths.py,sha256=KaLj9RHsxdaSkEHm4t0JEzykhiuETAV14KpjL6lknWY,10374
-LoopStructural/utils/observer.py,sha256=BjoL2-DydNWF1QDfFNd7TQIlRbKus_JNBfqX2ZFDAek,5327
+LoopStructural/utils/observer.py,sha256=etHF2zhDWbrKAaIKAktdVLosD696o_B0P9rH3G5IzV0,5305
 LoopStructural/utils/regions.py,sha256=SjCC40GI7_n03G4mlcmvyrBgJFbxnvB3leBzXWco37o,3891
 LoopStructural/utils/typing.py,sha256=29uVSTZdzXXH-jdlaYyBWZ1gQ2-nlZ2-XoVgG_PXNFY,157
 LoopStructural/utils/utils.py,sha256=2Z4zVE6G752-SPmM29zebk82bROJxEwi_YiiJjcVED4,2438
 LoopStructural/visualisation/__init__.py,sha256=5BDgKor8-ae6DrS7IZybJ3Wq_pTnCchxuY4EgzA7v1M,318
-loopstructural-1.6.17.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
-loopstructural-1.6.17.dist-info/METADATA,sha256=Io5NikqqA3SupAKqkEtWRytgor6JPn9c5nV8L0FzQLw,6453
-loopstructural-1.6.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-loopstructural-1.6.17.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
-loopstructural-1.6.17.dist-info/RECORD,,
+loopstructural-1.6.19.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
+loopstructural-1.6.19.dist-info/METADATA,sha256=JO4cMFLRwyWvEv7rH880jwCGDmIVx_JXqnrfpwplljc,6453
+loopstructural-1.6.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+loopstructural-1.6.19.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
+loopstructural-1.6.19.dist-info/RECORD,,