Merge branch 'master' into intrusions

Author: Lachlan Grose

.github/workflows/windows_CI.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Installing dependencies
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge cython numpy scipy scikit-image scikit-learn pyamg flake8 pytest networkx osqp
+          conda install -c conda-forge cython numpy scipy scikit-image scikit-learn pyamg flake8 pytest networkx osqp numba statsmodels scikit-fmm 
       - name: Checking formatting of code
         shell: bash -l {0}
         run: |

LoopStructural/interpolators/_geological_interpolator.py

@@ -86,6 +86,7 @@ def set_value_constraints(self, points):
 
         self.data["value"] = points
         self.n_i = points.shape[0]
+        self.up_to_date = False
 
     def set_gradient_constraints(self, points):
         """
@@ -100,6 +101,8 @@ def set_gradient_constraints(self, points):
         """
         self.n_g = points.shape[0]
         self.data["gradient"] = points
+        self.up_to_date = False
+
 
     def set_normal_constraints(self, points):
         """
@@ -114,6 +117,8 @@ def set_normal_constraints(self, points):
         """
         self.n_n = points.shape[0]
         self.data["normal"] = points
+        self.up_to_date = False
+
 
     def set_tangent_constraints(self, points):
         """
@@ -127,12 +132,17 @@ def set_tangent_constraints(self, points):
 
         """
         self.data["tangent"] = points
+        self.up_to_date = False
+
 
     def set_interface_constraints(self, points):
         self.data["interface"] = points
+        self.up_to_date = False
+
 
     def set_inequality_constraints(self, points):
         self.data["inequality"] = points
+        self.up_to_date = False
 
     def get_value_constraints(self):
         """

LoopStructural/interpolators/supports/_3d_base_structured.py

@@ -174,7 +174,6 @@ def position_to_cell_index(self, pos):
             i,j,k indexes of the cell that the point is in
         """
 
-        pos = self.rotate(pos)
         pos = self.check_position(pos)
 
         ix = pos[:, 0] - self.origin[None, 0]
@@ -189,7 +188,6 @@ def position_to_cell_global_index(self, pos):
         ix, iy, iz = self.position_to_cell_index(pos)
 
     def inside(self, pos):
-        pos = self.rotate(pos)
         # check whether point is inside box
         inside = np.ones(pos.shape[0]).astype(bool)
         for i in range(3):

setup.py

@@ -40,6 +40,10 @@
 	'scikit-image',
 	'scikit-learn',
 	'tqdm',
+	'numba',
+	'geostatspy',
+	'statsmodels',
+	'scikit-fmm'
 	],
 	description="Open source 3D structural geology modelling",
           long_description=codecs.open("README.md", "r", "utf-8").read(),