(FEATURE) adding fault bounding box constraint,

speed up interpolation by reducing uncessarary
degrees of freedom

Author: lachlangrose

LoopStructural/modelling/core/geological_model.py

@@ -1139,6 +1139,7 @@ def create_and_add_fault(self,
         interpolator = self.get_interpolator(**kwargs)
         fault_frame_builder = FaultBuilder(interpolator,
                                                      name=fault_surface_data,
+                                                     model=self,
                                                      **kwargs)
         # add data
         fault_frame_data = self.data[ self.data['feature_name'] == fault_surface_data].copy()

LoopStructural/modelling/core/geological_model_graph.py

@@ -148,7 +148,6 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
         self.scale_factor = 1.
         self.bounding_box = np.zeros((2, 3))
         self.bounding_box[1, :] = self.maximum - self.origin
-        self.bounding_box[1, :] = self.maximum - self.origin
         if rescale:
             self.scale_factor = np.max(lengths)
             logger.info('Rescaling model using scale factor {}'.format(self.scale_factor))

LoopStructural/modelling/fault/fault_builder.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 class FaultBuilder(StructuralFrameBuilder):
-    def __init__(self,interpolator=None,interpolators=None,**kwargs):
+    def __init__(self,interpolator=None,interpolators=None,model=None,fault_bounding_box_buffer=0.2,**kwargs):
         """A specialised structural frame builder for building a fault
 
         Parameters
@@ -11,16 +11,29 @@ def __init__(self,interpolator=None,interpolators=None,**kwargs):
             the interpolator to use for building the fault frame, by default None
         interpolators : [GeologicalInterpolator, GeologicalInterpolator, GeologicalInterpolator], optional
             a list of interpolators to use for building the fault frame, by default None
+        model : GeologicalModel
+            reference to the model containing the fault
+        fault_bounding_box_buffer: float, default 0.2
+            the maximum area around the model domain that a fault is modelled. For high displacement faults this
+            may need to be large, smaller values will be result in fewer degrees of freedom = quicker interpolation
         """
 
         StructuralFrameBuilder.__init__(self,interpolator,interpolators,**kwargs)
         self.origin = np.array([np.nan,np.nan,np.nan])
         self.maximum = np.array([np.nan,np.nan,np.nan])
+        self.model = model
+        # define a maximum area to mesh adding buffer to model
+        buffer = .2
+        self.minimum_origin = self.model.bounding_box[0,:] - buffer*(self.model.bounding_box[1,:]-self.model.bounding_box[0,:])
+        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]
+        self.maximum[self.maximum>self.maximum_maximum] = self.maximum_maximum[self.maximum>self.maximum_maximum]
+
     def create_data_from_geometry(self, 
                                 data,
                                 fault_center, 

LoopStructural/visualisation/model_visualisation.py

@@ -883,6 +883,9 @@ def save(self, fname, **kwargs):
         """
         self.lv.image(fname, **kwargs)
 
+    def export_to_webgl(self,fname, **kwargs ):
+        
+        self.lv.webgl(fname,**kwargs)
     def display(self, fname=None, **kwargs):
         """
         Calls the lv object display function. Shows a static image of the viewer inline.

conda/meta.yaml

@@ -15,7 +15,7 @@ build:
 
 requirements:
   build:
-    - cython
+    - Cython
   host:
     - pip
     - python