fix: featuretype enum

Loop3D · Jul 15, 2022 · c256746 · c256746
1 parent 80c2566
commit c256746
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/LoopStructural/analysis/_fault_intersection.py b/LoopStructural/analysis/_fault_intersection.py
@@ -1,6 +1,7 @@
 from skimage.measure import marching_cubes
 import pandas as pd
 import numpy as np
+from LoopStructural.modelling.features import FeatureType
 
 from LoopStructural.utils import getLogger
 
@@ -26,7 +27,7 @@ def calculate_fault_intersections(model, threshold=0.001):
     """
     fault_names = []
     for f in model.features:
-        if f.type == "fault":
+        if f.type == FeatureType.FAULT:
             fault_names.append(f.name)
     fault_matrix = pd.DataFrame(columns=fault_names)
     for f in fault_names:

diff --git a/LoopStructural/modelling/core/geological_model.py b/LoopStructural/modelling/core/geological_model.py
@@ -1791,7 +1791,7 @@ def evaluate_fault_displacements(self, points, scale=True):
             points = self.scale(points, inplace=False)
         vals = np.zeros(points.shape[0])
         for f in self.features:
-            if f.type == "fault":
+            if f.type == FeatureType.FAULT:
                 disp = f.displacementfeature.evaluate_value(points)
                 vals[~np.isnan(disp)] += disp[~np.isnan(disp)]
         return (
@@ -1898,7 +1898,7 @@ def update(self, verbose=False, progressbar=True):
         total_dof = 0
         nfeatures = 0
         for f in self.features:
-            if f.type == "fault":
+            if f.type == FeatureType.FAULT:
                 nfeatures += 3
                 total_dof += f[0].interpolator.nx * 3
             if isinstance(f, StructuralFrame):

diff --git a/LoopStructural/modelling/features/__init__.py b/LoopStructural/modelling/features/__init__.py
@@ -19,6 +19,7 @@ class FeatureType(IntEnum):
     LAMBDA = 6
     UNCONFORMITY = 7
     INTRUSION = 8
+    FAULT = 9
 
 
 from ._base_geological_feature import BaseFeature

diff --git a/LoopStructural/modelling/features/fault/_fault_segment.py b/LoopStructural/modelling/features/fault/_fault_segment.py
@@ -37,7 +37,7 @@ def __init__(
         kwargs
         """
         StructuralFrame.__init__(self, features, name, fold)
-        self.type = FeatureType.INTERPOLATED
+        self.type = FeatureType.FAULT
         self.displacement = displacement
         self._faultfunction = BaseFault.fault_displacement
         self.steps = steps

diff --git a/LoopStructural/visualisation/map_viewer.py b/LoopStructural/visualisation/map_viewer.py
@@ -6,6 +6,7 @@
 from LoopStructural.utils import getLogger
 
 logger = getLogger(__name__)
+from LoopStructural.modelling.features import FeatureType
 
 
 class MapView:
@@ -372,7 +373,7 @@ def add_fault_displacements(self, z=0, cmap="rainbow"):
 
     def add_faults(self, **kwargs):
         for f in self.model.features:
-            if f.type == "fault":
+            if f.type == FeatureType.FAULT:
                 # create a function to return true if displacement > 0
                 def mask(x):
                     val = f.displacementfeature.evaluate_value(x)

diff --git a/LoopStructural/visualisation/model_plotter.py b/LoopStructural/visualisation/model_plotter.py
@@ -1,5 +1,6 @@
 from LoopStructural.utils import getLogger
 from LoopStructural.utils import LoopImportError
+from LoopStructural.modelling.features import FeatureType
 
 logger = getLogger(__name__)
 
@@ -13,7 +14,11 @@
     from skimage.measure import marching_cubes_lewiner as marching_cubes
 
 
-from LoopStructural.modelling.features import GeologicalFeature, BaseFeature
+from LoopStructural.modelling.features import (
+    FeatureType,
+    GeologicalFeature,
+    BaseFeature,
+)
 from LoopStructural.utils.helper import create_surface, get_vectors, create_box
 
 
@@ -634,7 +639,7 @@ def add_model_surfaces(
                         n_units += 1
         n_faults = 0
         for f in self.model.features:
-            if f.type == "fault":
+            if f.type == FeatureType.FAULT:
                 n_faults += 1
 
         if self.model.stratigraphic_column and cmap is None:
@@ -688,7 +693,7 @@ def add_model_surfaces(
 
             if faults:
                 for f in self.model.features:
-                    if f.type == "fault":
+                    if f.type == FeatureType.FAULT:
 
                         def mask(x):
                             val = f.displacementfeature.evaluate_value(x)