test: 🐛 fixing tests again

Author: lachlangrose

LoopStructural/modelling/__init__.py

@@ -2,7 +2,7 @@
 Geological modelling classes and functions
 
 """
-__all__ = ['GeologicalModel', 'ProcessInputData', 'LavaVuModelViewer', 'Map2LoopProcessor','LoopProjectfileProcessor','StructuralFrame','FaultSegment']
+__all__ = ['GeologicalModel', 'ProcessInputData', 'LavaVuModelViewer', 'Map2LoopProcessor','LoopProjectfileProcessor']
 from LoopStructural.utils import getLogger
 from LoopStructural.utils import LoopImportError
 
@@ -18,5 +18,5 @@
     logger.warning(
         "Cannot use LoopProjectfileProcessor: Loop project file cannot be imported, try installing LoopProjectFile"
     )
-from LoopStructural.modelling.features import StructuralFrame
-from LoopStructural.modelling.fault import FaultSegment
+# from LoopStructural.modelling.features import StructuralFrame
+# from LoopStructural.modelling.features.fault import FaultSegment

LoopStructural/modelling/core/geological_model.py

@@ -24,12 +24,11 @@
 
 from LoopStructural.interpolators import StructuredGrid
 from LoopStructural.interpolators import TetMesh
-from LoopStructural.modelling.fault import FaultSegment
+from LoopStructural.modelling.features.fault import FaultSegment
 from LoopStructural.interpolators import DiscreteInterpolator
 
 from LoopStructural.interpolators import StructuredGrid
 from LoopStructural.interpolators import TetMesh
-from LoopStructural.modelling.features.fault._fault_segment import FaultSegment
 from LoopStructural.modelling.features.builders import (
     FaultBuilder,
     GeologicalFeatureBuilder,

LoopStructural/modelling/fault/__init__.py

@@ -29,7 +29,7 @@ def __init__(
             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
         """
-        from LoopStructural.modelling import FaultSegment  # defer import until needed
+        from LoopStructural.modelling.features.fault import FaultSegment  # defer import until needed
 
         StructuralFrameBuilder.__init__(
             self, interpolator, interpolators, frame=FaultSegment, **kwargs

LoopStructural/modelling/features/builders/_fault_builder.py

@@ -0,0 +1,3 @@
+from ._fault_function import Composite, CubicFunction, Ones, Zeros
+from ._fault_function_feature import FaultDisplacementFeature
+from ._fault_segment import FaultSegment

LoopStructural/modelling/features/fault/__init__.py

@@ -5,7 +5,7 @@
 )
 from LoopStructural.modelling.features.fault._fault_function import BaseFault
 from LoopStructural.utils import getLogger, NegativeRegion, PositiveRegion
-from LoopStructural.modelling import StructuralFrame
+from LoopStructural.modelling.features import StructuralFrame
 
 logger = getLogger(__name__)
 from concurrent.futures import ThreadPoolExecutor

LoopStructural/modelling/features/fault/_fault_segment.py

@@ -1,5 +1,5 @@
 from LoopStructural import GeologicalModel
-from LoopStructural.modelling.fault import FaultSegment
+from LoopStructural.modelling.features.fault import FaultSegment
 import pandas as pd