Merge branch 'master' of https://github.com/Loop3D/LoopStructural

Loop3D · Feb 20, 2024 · 8d9e8fd · 8d9e8fd
2 parents 4a4bf92 + 6d38671
commit 8d9e8fd
Show file tree

Hide file tree

Showing 54 changed files with 214 additions and 441 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -37,12 +37,11 @@ jobs:
       - name: Installing dependencies
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge cython numpy scipy scikit-image scikit-learn pyamg pytest networkx osqp matplotlib -y
+          conda install -c conda-forge numpy scipy scikit-image scikit-learn pytest networkx osqp matplotlib -y
       - name: Building and install
         shell: bash -l {0}
         run: |
-          python setup.py install build_ext --inplace
-          pip install .
+          pip install . --user
       - name: pytest
         shell: bash -l {0}
         run: |

diff --git a/LoopStructural/analysis/__init__.py b/LoopStructural/analysis/__init__.py
diff --git a/LoopStructural/analysis/_fault_displacement.py b/LoopStructural/analysis/_fault_displacement.py
diff --git a/LoopStructural/analysis/_fault_intersection.py b/LoopStructural/analysis/_fault_intersection.py
diff --git a/LoopStructural/analysis/_plane_fit.py b/LoopStructural/analysis/_plane_fit.py
diff --git a/LoopStructural/analysis/_topology.py b/LoopStructural/analysis/_topology.py
diff --git a/LoopStructural/api/_interpolate.py b/LoopStructural/api/_interpolate.py
@@ -6,7 +6,7 @@
     InterpolatorFactory,
     InterpolatorType,
 )
-from LoopStructural.utils import BoundingBox
+from LoopStructural.datatypes import BoundingBox
 from LoopStructural.utils import getLogger
 
 logger = getLogger(__name__)

diff --git a/LoopStructural/api/_surface.py b/LoopStructural/api/_surface.py
@@ -11,8 +11,7 @@
     from skimage.measure import marching_cubes_lewiner as marching_cubes
 
 from LoopStructural.interpolators import GeologicalInterpolator
-from LoopStructural.utils import BoundingBox
-from LoopStructural.datatypes import Surface
+from LoopStructural.datatypes import Surface, BoundingBox
 
 surface_list = dict[str, tuple[npt.ArrayLike, npt.ArrayLike, npt.ArrayLike, npt.ArrayLike]]
 

diff --git a/LoopStructural/datasets/_example_models.py b/LoopStructural/datasets/_example_models.py
@@ -1,4 +1,3 @@
-
 vis = True
 try:
     pass

diff --git a/LoopStructural/datatypes/_bounding_box.py b/LoopStructural/datatypes/_bounding_box.py
@@ -190,5 +190,6 @@ def regular_grid(self, nsteps=None, shuffle=False, order="C"):
             [xx.flatten(order=order), yy.flatten(order=order), zz.flatten(order=order)]
         ).T
         if shuffle:
+            # logger.info("Shuffling points")
             rng.shuffle(locs)
         return locs
diff --git a/LoopStructural/export/file_formats.py b/LoopStructural/export/file_formats.py
@@ -1,6 +1,7 @@
 """
 Exported file formats
 """
+
 from enum import Enum
 
 

diff --git a/LoopStructural/export/isosurface.py b/LoopStructural/export/isosurface.py
@@ -1,13 +1,14 @@
 # import numpy as np
 # from skimage.measure import marching_cubes
+
+
 # def extract_isosurface(geologicalfeature, model, isovalue):
-#     xyz=model.regular_grid(shuffle=False)
+#     xyz = model.regular_grid(shuffle=False)
 #     vals = model.evaluate_model(xyz, scale=False)
 
 #     verts, faces, normals, values = marching_cubes(
-#                     vals.reshape(model.nsteps, order='C'),
-#                     isovalue,
-#                     spacing=model.step_vector)
+#         vals.reshape(model.nsteps, order='C'), isovalue, spacing=model.step_vector
+#     )
 #     # verts += np.array([self.bounding_box[0, 0], self.bounding_box[0, 1], self.bounding_box[1, 2]])
 #     self.model.rescale(verts)
 #     return verts, faces
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
     vis = True
     try:
         pass
@@ Expand Down @@