(BUGFIX) added orthogonality back to structural

frames

Author: lachlangrose

Dockerfile

@@ -6,6 +6,7 @@ LABEL maintainer="lachlan.grose@monash.edu"
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
     gcc \
+    g++ \
     libc-dev
 
 RUN conda install -c conda-forge pip scikit-learn cython numpy==1.20.1 pandas scipy pymc3 jupyter pyamg -y
@@ -44,4 +45,4 @@ RUN mkdir LoopStructural
 CMD ["jupyter", "notebook", "--ip='0.0.0.0'", "--NotebookApp.token=''", "--no-browser" ]
 
 EXPOSE 8050
-EXPOSE 8080:8090
+EXPOSE 8080:8090

LoopStructural/modelling/core/geological_model.py

@@ -1171,8 +1171,8 @@ def create_and_add_fault(self,
                                                       vertical_radius=fault_vectical_radius
                                                       )
         if fault_influence == None or fault_extent == None or fault_vectical_radius == None:
-            fault_frame_builder.origin = self.origin
-            fault_frame_builder.maximum = self.maximum
+            fault_frame_builder.origin = self.bounding_box[0,:]
+            fault_frame_builder.maximum = self.bounding_box[1,:]
         fault_frame_builder.set_mesh_geometry(kwargs.get('fault_buffer',0.1))
         # fault_frame_builder.add_data_from_data_frame(fault_frame_data)
         # check if this fault overprint any existing faults exist in the stack

LoopStructural/modelling/fault/fault_builder.py

@@ -28,7 +28,7 @@ def __init__(self,interpolator=None,interpolators=None,model=None,fault_bounding
         self.maximum_maximum = self.model.bounding_box[1,:] + buffer*(self.model.bounding_box[1,:]-self.model.bounding_box[0,:])
 
     def update_geometry(self,points):
-
+        
         self.origin = np.nanmin(np.array([np.min(points,axis=0),self.origin]),axis=0)
         self.maximum = np.nanmax(np.array([np.max(points,axis=0),self.maximum]),axis=0)
         self.origin[self.origin<self.minimum_origin] = self.minimum_origin[self.origin<self.minimum_origin]

LoopStructural/modelling/features/geological_feature_builder.py

@@ -407,6 +407,7 @@ def build(self, fold=None, fold_weights={}, data_region=None, **kwargs):
             if 'cgw' not in kwargs:
                 # try adding very small cg
                 kwargs['cgw'] = 0.0
+        self.install_gradient_constraint()
         self.interpolator.setup_interpolator(**kwargs)
         self.interpolator.solve_system(**kwargs)
         self._up_to_date = True

LoopStructural/visualisation/model_visualisation.py

@@ -165,6 +165,7 @@ def add_section(self, geological_feature=None, axis='x', value=None,  **kwargs):
             if value is None:
                 value = np.nanmean(self.bounding_box[:, 2])
             zz[:] = value
+
         name = kwargs.get('name', geological_feature.name)
         name = '{}_section_at_{}_of_{}'.format(axis,value,name)
         colour = kwargs.get('colour', 'red')