LoopStructural 1.6.10__tar.gz → 1.6.12__tar.gz

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/datatypes/_bounding_box.py

@@ -326,9 +326,7 @@ class BoundingBox:
         if iy == -1:
             return self.origin[ix]
 
-        return self.bb[
-            ix,
-        ]
+        return self.bb[ix,]
 
     def __getitem__(self, name):
         if isinstance(name, str):

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/datatypes/_point.py

@@ -147,8 +147,8 @@ class VectorPoints:
         else:
             norm = np.linalg.norm(vectors, axis=1)
             vectors[norm > 0, :] /= norm[norm > 0][:, None]
-            norm = norm[norm > 0] / norm[norm > 0].max()
-            vectors *= norm[:, None]
+            norm[norm > 0] = norm[norm > 0] / norm[norm > 0].max()
+            vectors[norm > 0, :] *= norm[norm > 0, None]
         if scale_function is not None:
             # vectors /= np.linalg.norm(vectors, axis=1)[:, None]
             vectors *= scale_function(self.locations)[:, None]

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/datatypes/_surface.py

@@ -12,7 +12,6 @@ class Surface:
     vertices: np.ndarray = field(default_factory=lambda: np.array([[0, 0, 0]]))
     triangles: np.ndarray = field(default_factory=lambda: np.array([[0, 0, 0]]))
     colour: Optional[Union[str, np.ndarray]] = field(default_factory=lambda: None)
-
     normals: Optional[np.ndarray] = None
     name: str = 'surface'
     values: Optional[np.ndarray] = None

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/interpolators/_finite_difference_interpolator.py

@@ -272,7 +272,12 @@ class FiniteDifferenceInterpolator(DiscreteInterpolator):
             idc[inside, :] = gi[node_idx[inside, :]]
             inside = np.logical_and(~np.any(idc == -1, axis=1), inside)
 
-            (vertices, T, elements, inside_,) = self.support.get_element_gradient_for_location(
+            (
+                vertices,
+                T,
+                elements,
+                inside_,
+            ) = self.support.get_element_gradient_for_location(
                 points[inside, : self.support.dimension]
             )
             # normalise constraint vector and scale element matrix by this
@@ -335,7 +340,12 @@ class FiniteDifferenceInterpolator(DiscreteInterpolator):
             # calculate unit vector for node gradients
             # this means we are only constraining direction of grad not the
             # magnitude
-            (vertices, T, elements, inside_,) = self.support.get_element_gradient_for_location(
+            (
+                vertices,
+                T,
+                elements,
+                inside_,
+            ) = self.support.get_element_gradient_for_location(
                 points[inside, : self.support.dimension]
             )
             # T*=np.product(self.support.step_vector)
@@ -422,7 +432,12 @@ class FiniteDifferenceInterpolator(DiscreteInterpolator):
             vectors[norm > 0, :] /= norm[norm > 0, None]
 
             # normalise element vector to unit vector for dot product
-            (vertices, T, elements, inside_,) = self.support.get_element_gradient_for_location(
+            (
+                vertices,
+                T,
+                elements,
+                inside_,
+            ) = self.support.get_element_gradient_for_location(
                 points[inside, : self.support.dimension]
             )
             T[norm > 0, :, :] /= norm[norm > 0, None, None]

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/interpolators/supports/_3d_base_structured.py

@@ -162,9 +162,9 @@ class BaseStructuredSupport(BaseSupport):
         length = self.maximum - origin
         length /= self.step_vector
         self._nsteps = np.ceil(length).astype(np.int64)
-        self._nsteps[
-            self._nsteps == 0
-        ] = 3  # need to have a minimum of 3 elements to apply the finite difference mask
+        self._nsteps[self._nsteps == 0] = (
+            3  # need to have a minimum of 3 elements to apply the finite difference mask
+        )
         if np.any(~(self._nsteps > 0)):
             logger.error(
                 f"Cannot resize the interpolation support. The proposed number of steps is {self._nsteps}, these must be all > 0"

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/interpolators/supports/_3d_structured_tetra.py

@@ -166,9 +166,9 @@ class TetMesh(BaseStructuredSupport):
         shared_face_index[:] = -1
         shared_face_index[row.reshape(-1, 3)[:, 0], :] = col.reshape(-1, 3)
 
-        self.shared_elements[
-            np.arange(self.shared_element_relationships.shape[0]), :
-        ] = shared_face_index
+        self.shared_elements[np.arange(self.shared_element_relationships.shape[0]), :] = (
+            shared_face_index
+        )
         # resize
         self.shared_elements = self.shared_elements[: len(self.shared_element_relationships), :]
 

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/interpolators/supports/_3d_unstructured_tetra.py

@@ -173,9 +173,9 @@ class UnStructuredTetMesh(BaseSupport):
         shared_face_index[:] = -1
         shared_face_index[row.reshape(-1, 3)[:, 0], :] = col.reshape(-1, 3)
 
-        self.shared_elements[
-            np.arange(self.shared_element_relationships.shape[0]), :
-        ] = shared_face_index
+        self.shared_elements[np.arange(self.shared_element_relationships.shape[0]), :] = (
+            shared_face_index
+        )
         # resize
         self.shared_elements = self.shared_elements[: len(self.shared_element_relationships), :]
         # flag = np.zeros(self.elements.shape[0])

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/interpolators/supports/_face_table.py

@@ -63,8 +63,8 @@ def _init_face_table(grid):
     shared_face_index = np.zeros((shared_faces.shape[0], grid.dimension), dtype=int)
     shared_face_index[:] = -1
     shared_face_index[row.reshape(-1, grid.dimension)[:, 0], :] = col.reshape(-1, grid.dimension)
-    grid._shared_elements[
-        np.arange(grid.shared_element_relationships.shape[0]), :
-    ] = shared_face_index
+    grid._shared_elements[np.arange(grid.shared_element_relationships.shape[0]), :] = (
+        shared_face_index
+    )
     # resize
     grid._shared_elements = grid.shared_elements[: len(grid.shared_element_relationships), :]

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/modelling/core/geological_model.py

@@ -598,12 +598,10 @@ class GeologicalModel:
                 * self._data.loc[mask, "polarity"].to_numpy()[:, None]
             )
             self._data.drop(["strike", "dip"], axis=1, inplace=True)
-        self._data[
-            ['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']
-        ] = self._data[
-            ['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']
-        ].astype(
-            float
+        self._data[['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']] = (
+            self._data[
+                ['X', 'Y', 'Z', 'val', 'nx', 'ny', 'nz', 'gx', 'gy', 'gz', 'tx', 'ty', 'tz']
+            ].astype(float)
         )
 
     def set_model_data(self, data):
@@ -1382,7 +1380,6 @@ class GeologicalModel:
             major_axis = major_axis / self.scale_factor
         if intermediate_axis:
             intermediate_axis = intermediate_axis / self.scale_factor
-        print(fault_dip, fault_normal_vector)
         fault_frame_builder.create_data_from_geometry(
             fault_frame_data=fault_frame_data,
             fault_center=fault_center,
@@ -1806,7 +1803,9 @@ class GeologicalModel:
                     values.to_list(),
                     self.bounding_box,
                     name=names.loc[values.index].to_list(),
-                    colours=unit_table.loc[unit_table['feature_name'] == u, 'colour'].tolist(),
+                    colours=unit_table.loc[unit_table['feature_name'] == u, 'colour'].tolist()[
+                        1:
+                    ],  # we don't isosurface basement, no value
                 )
             )
 

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/modelling/features/fault/_fault_function.py

@@ -9,6 +9,10 @@ from ....utils import getLogger
 logger = getLogger(__name__)
 
 
+def smooth_peak(x):
+    return 0.25 * x**6 + 0.5 * x**4 - 1.75 * x**2 + 1
+
+
 class FaultProfileFunction(metaclass=ABCMeta):
     def __init__(self):
         self.lim = [-1, 1]
@@ -412,14 +416,7 @@ class BaseFault(object):
     # gyf.add_min(-1)
     # gyf.add_max(1)
     gyf = Ones()
-    gzf = CubicFunction()
-    gzf.add_cstr(-1, 0)
-    gzf.add_cstr(1, 0)
-    gzf.add_cstr(-0.2, 1)
-    gzf.add_cstr(0.2, 1)
-    gzf.add_grad(0, 0)
-    gzf.add_min(-1)
-    gzf.add_max(1)
+    gzf = smooth_peak
     gxf = Composite(hw, fw)
     fault_displacement = FaultDisplacement(gx=gxf, gy=gyf, gz=gzf)
 
@@ -441,22 +438,17 @@ class BaseFault3D(object):
     fw.add_cstr(-1, 0)
     fw.add_grad(-1, 0)
     fw.add_min(-1)
-    gyf = CubicFunction()
-    gyf.add_cstr(-1, 0)
-    gyf.add_cstr(1, 0)
-    gyf.add_cstr(-0.2, 1)
-    gyf.add_cstr(0.2, 1)
-    gyf.add_grad(0, 0)
-    gyf.add_min(-1)
-    gyf.add_max(1)
+
+    gyf = smooth_peak
+    # CubicFunction()
+    # gyf.add_cstr(-1, 0)
+    # gyf.add_cstr(1, 0)
+    # gyf.add_cstr(-0.2, 1)
+    # gyf.add_cstr(0.2, 1)
+    # gyf.add_grad(0, 0)
+    # gyf.add_min(-1)
+    # gyf.add_max(1)
     # gyf = Ones()
-    gzf = CubicFunction()
-    gzf.add_cstr(-1, 0)
-    gzf.add_cstr(1, 0)
-    gzf.add_cstr(-0.2, 1)
-    gzf.add_cstr(0.2, 1)
-    gzf.add_grad(0, 0)
-    gzf.add_min(-1)
-    gzf.add_max(1)
+    gzf = smooth_peak
     gxf = Composite(hw, fw)
     fault_displacement = FaultDisplacement(gx=gxf, gy=gyf, gz=gzf)

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/modelling/features/fault/_fault_segment.py

@@ -125,11 +125,17 @@ class FaultSegment(StructuralFrame):
         try:
             import pyvista as pv
 
-            fault_ellipsoid = pv.PolyData(
-                self.model.rescale(self.fault_centre[None, :], inplace=False)
-            )
-            fault_ellipsoid["norm"] = self.builder.fault_normal_vector[None, :]
-
+            if self.model is None:
+                pts = self.fault_centre[None, :]
+            else:
+                pts = self.model.rescale(self.fault_centre[None, :], inplace=False)
+            # pts = self.fault_centre[None, :]
+            fault_ellipsoid = pv.PolyData(pts)
+            # fault_ellipsoid = pv.PolyData(
+            #     self.model.rescale(self.fault_centre[None, :], inplace=False)
+            # )
+            fault_ellipsoid["norm"] = self.fault_normal_vector[None, :]
+            fault_ellipsoid['norm'] /= np.linalg.norm(fault_ellipsoid['norm'], axis=1)[:, None]
             geom = pv.ParametricEllipsoid(
                 self.fault_minor_axis,
                 self.fault_major_axis,

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural/modelling/input/process_data.py

@@ -299,9 +299,9 @@ class ProcessInputData:
             pts = self.fault_locations.loc[
                 self.fault_locations["feature_name"] == fname, ["X", "Y", "Z"]
             ]
-            fault_properties.loc[
-                fname, ["centreEasting", "centreNorthing", "centreAltitude"]
-            ] = np.nanmean(pts, axis=0)
+            fault_properties.loc[fname, ["centreEasting", "centreNorthing", "centreAltitude"]] = (
+                np.nanmean(pts, axis=0)
+            )
         if (
             "avgNormalEasting" not in fault_properties.columns
             or "avgNormalNorthing" not in fault_properties.columns
@@ -449,9 +449,9 @@ class ProcessInputData:
         for _name, sg in self.stratigraphic_order:
             value = 0.0  # reset for each supergroup
             if sg[0] not in self.thicknesses or self.thicknesses[sg[0]] <= 0:
-                self.thicknesses[
-                    sg[0]
-                ] = np.inf  # make the top unit infinite as it should extend to the top of the model
+                self.thicknesses[sg[0]] = (
+                    np.inf
+                )  # make the top unit infinite as it should extend to the top of the model
             for g in reversed(
                 sg[:-1]
             ):  # don't add the last unit as we never see the base of this unit.

loopstructural-1.6.12/LoopStructural/version.py

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

{loopstructural-1.6.10 → loopstructural-1.6.12}/LoopStructural.egg-info/PKG-INFO

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

{loopstructural-1.6.10 → loopstructural-1.6.12}/PKG-INFO

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

loopstructural-1.6.10/LoopStructural/version.py

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