LoopStructural 1.6.8__tar.gz → 1.6.9__tar.gz

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural/datatypes/_bounding_box.py

@@ -429,6 +429,25 @@ class BoundingBox:
             "maximum": self.maximum.tolist(),
             "nsteps": self.nsteps.tolist(),
         }
+    @classmethod
+    def from_dict(cls, data: dict) -> 'BoundingBox':
+        """Create a bounding box from a dictionary
+
+        Parameters
+        ----------
+        data : dict
+            dictionary with origin, maximum and nsteps
+
+        Returns
+        -------
+        BoundingBox
+            bounding box object
+        """
+        return cls(
+            origin=np.array(data["origin"]),
+            maximum=np.array(data["maximum"]),
+            nsteps=np.array(data["nsteps"]),
+        )
 
     def vtk(self):
         """Export the model as a pyvista RectilinearGrid

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural/modelling/features/_base_geological_feature.py

@@ -334,8 +334,14 @@ class BaseFeature(metaclass=ABCMeta):
             bounding_box = self.model.bounding_box
         grid = bounding_box.structured_grid(name=self.name)
         value = self.evaluate_value(
-            self.model.scale(bounding_box.regular_grid(local=False, order='F'))
+            bounding_box.regular_grid(local=False, order='F')
         )
+        if self.model is not None:
+
+            value = self.evaluate_value(
+                self.model.scale(bounding_box.regular_grid(local=False, order='F'))
+            )
+
         grid.properties[self.name] = value
 
         value = self.evaluate_value(bounding_box.cell_centres(order='F'))

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural/modelling/features/_geological_feature.py

@@ -42,6 +42,7 @@ class GeologicalFeature(BaseFeature):
         builder,
         regions: list = [],
         faults: list = [],
+        interpolator=None,
         model=None,
     ):
         """Default constructor for geological feature
@@ -60,7 +61,7 @@ class GeologicalFeature(BaseFeature):
         BaseFeature.__init__(self, name, model, faults, regions, builder)
         self.name = name
         self.builder = builder
-        self.interpolator = self.builder.interpolator if self.builder is not None else None
+        self.interpolator = self.builder.interpolator if self.builder is not None else interpolator
         self.type = FeatureType.INTERPOLATED
 
     def to_json(self):

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural/modelling/features/_lambda_geological_feature.py

@@ -90,3 +90,14 @@ class LambdaGeologicalFeature(BaseFeature):
 
     def get_data(self, value_map: Optional[dict] = None):
         return
+
+    def copy(self, name: Optional[str] = None):
+        return LambdaGeologicalFeature(
+            self.function,
+            name if name is not None else f'{self.name}_copy',
+            self.gradient_function,
+            self.model,
+            self.regions,
+            self.faults,
+            self.builder,
+        )

loopstructural-1.6.9/LoopStructural/version.py

@@ -0,0 +1 @@
+__version__ = "1.6.9"

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.6.8
+Version: 1.6.9
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT
@@ -29,12 +29,12 @@ Requires-Dist: scipy
 Requires-Dist: scikit-image
 Requires-Dist: scikit-learn
 Provides-Extra: all
-Requires-Dist: loopstructural[export,inequalities,visualisation]; extra == "all"
+Requires-Dist: loopstructural[export,inequalities,jupyter,visualisation]; extra == "all"
 Requires-Dist: tqdm; extra == "all"
 Provides-Extra: visualisation
 Requires-Dist: matplotlib; extra == "visualisation"
 Requires-Dist: pyvista; extra == "visualisation"
-Requires-Dist: loopstructuralviusualisation>0.1.4; extra == "visualisation"
+Requires-Dist: loopstructuralviusualisation>=0.1.14; extra == "visualisation"
 Provides-Extra: export
 Requires-Dist: geoh5py; extra == "export"
 Requires-Dist: pyevtk; extra == "export"
@@ -58,6 +58,7 @@ Requires-Dist: geopandas; extra == "docs"
 Requires-Dist: sphinxcontrib-bibtex; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"
 Requires-Dist: sphinx-design; extra == "docs"
+Dynamic: license-file
 
 # LoopStructural: Loop3D Implicit Geological Modelling
 

{loopstructural-1.6.8 → loopstructural-1.6.9}/LoopStructural.egg-info/requires.txt

@@ -5,7 +5,7 @@ scikit-image
 scikit-learn
 
 [all]
-loopstructural[export,inequalities,visualisation]
+loopstructural[export,inequalities,jupyter,visualisation]
 tqdm
 
 [docs]
@@ -38,4 +38,4 @@ pyvista[all]
 [visualisation]
 matplotlib
 pyvista
-loopstructuralviusualisation>0.1.4
+loopstructuralviusualisation>=0.1.14

{loopstructural-1.6.8 → loopstructural-1.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.6.8
+Version: 1.6.9
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT
@@ -29,12 +29,12 @@ Requires-Dist: scipy
 Requires-Dist: scikit-image
 Requires-Dist: scikit-learn
 Provides-Extra: all
-Requires-Dist: loopstructural[export,inequalities,visualisation]; extra == "all"
+Requires-Dist: loopstructural[export,inequalities,jupyter,visualisation]; extra == "all"
 Requires-Dist: tqdm; extra == "all"
 Provides-Extra: visualisation
 Requires-Dist: matplotlib; extra == "visualisation"
 Requires-Dist: pyvista; extra == "visualisation"
-Requires-Dist: loopstructuralviusualisation>0.1.4; extra == "visualisation"
+Requires-Dist: loopstructuralviusualisation>=0.1.14; extra == "visualisation"
 Provides-Extra: export
 Requires-Dist: geoh5py; extra == "export"
 Requires-Dist: pyevtk; extra == "export"
@@ -58,6 +58,7 @@ Requires-Dist: geopandas; extra == "docs"
 Requires-Dist: sphinxcontrib-bibtex; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"
 Requires-Dist: sphinx-design; extra == "docs"
+Dynamic: license-file
 
 # LoopStructural: Loop3D Implicit Geological Modelling
 

{loopstructural-1.6.8 → loopstructural-1.6.9}/pyproject.toml

@@ -41,8 +41,8 @@ dependencies = [
 dynamic = ['version']
 
 [project.optional-dependencies]
-all = ['loopstructural[visualisation,inequalities,export]', 'tqdm']
-visualisation = ["matplotlib", "pyvista", "loopstructuralviusualisation>0.1.4"]
+all = ['loopstructural[visualisation,inequalities,export,jupyter]', 'tqdm']
+visualisation = ["matplotlib", "pyvista", "loopstructuralviusualisation>=0.1.14"]
 export = ["geoh5py", "pyevtk", "dill"]
 jupyter = ["pyvista[all]"]
 inequalities = ["loopsolver"]

loopstructural-1.6.8/LoopStructural/version.py

@@ -1 +0,0 @@
-__version__ = "1.6.8"