Skip to content

Commit f3180f3

Browse files
author
Lachlan Grose
committed
fix: recursive error fix
1 parent 728fc5f commit f3180f3

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

LoopStructural/modelling/features/_geological_feature.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def __init__(
6161
self.builder = builder
6262
self.type = FeatureType.INTERPOLATED
6363

64-
6564
def is_valid(self):
6665
return self.interpolator.valid
6766

@@ -103,10 +102,10 @@ def evaluate_value(self, evaluation_points):
103102
mask[:] = True
104103
# check regions
105104
for r in self.regions:
106-
try:
107-
mask = np.logical_and(mask, r(evaluation_points))
108-
except:
109-
logger.error("nan slicing")
105+
# try:
106+
mask = np.logical_and(mask, r(evaluation_points))
107+
# except:
108+
# logger.error("nan slicing")
110109
# apply faulting after working out which regions are visible
111110
if self.faults_enabled:
112111
for f in self.faults:

LoopStructural/modelling/features/_unconformity_feature.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class UnconformityFeature(GeologicalFeature):
66
""" """
77

8-
def __init__(self, feature: GeologicalFeature, value: float):
8+
def __init__(self, feature: GeologicalFeature, value: float, sign=True):
99
"""
1010
1111
Parameters
@@ -26,6 +26,7 @@ def __init__(self, feature: GeologicalFeature, value: float):
2626
)
2727
self.value = value
2828
self.type = FeatureType.UNCONFORMITY
29+
self.sign = sign
2930

3031
def evaluate(self, pos):
3132
"""
@@ -40,4 +41,7 @@ def evaluate(self, pos):
4041
boolean
4142
true if above the unconformity, false if below
4243
"""
43-
return self.evaluate_value(pos) < self.value
44+
if self.sign:
45+
return self.evaluate_value(pos) < self.value
46+
if not self.sign:
47+
return self.evaluate_value(pos) > self.value

0 commit comments

Comments
 (0)