Skip to content

fix: correct fault-proximity gradient retry loop and stop set_stratigraphic_column from wiping state #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lachlangrose merged 2 commits into from
Aug 14, 2026
+8 −5
Merged

fix: correct fault-proximity gradient retry loop and stop set_stratigraphic_column from wiping state #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98b015
fix: Updating intrusions code
lachlangrose Aug 5, 2026
0370ed2
fix: correct fault-proximity gradient retry loop and stop set_stratig…
lachlangrose Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions LoopStructural/modelling/core/geological_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import json
import pathlib
import warnings

import numpy as np
import pandas as pd
Expand Down Expand Up @@ -830,13 +831,15 @@ def set_stratigraphic_column(self, stratigraphic_column, cmap="tab20"):
}

"""
warnings.warn(
"set_stratigraphic_column is deprecated, use model.stratigraphic_column.add_units instead",
DeprecationWarning,
stacklevel=2,
)
self.stratigraphic_column.clear(basement=False)
# if the colour for a unit hasn't been specified we can just sample from
# a colour map e.g. tab20
logger.info("Adding stratigraphic column to model")
raise DeprecationWarning(
"set_stratigraphic_column is deprecated, use model.stratigraphic_column.add_units instead"
)
for i, g in enumerate(stratigraphic_column.keys()):
if g == 'faults':
logger.info('Not adding faults to stratigraphic column')
Expand Down
4 changes: 2 additions & 2 deletions LoopStructural/modelling/features/_geological_feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ def evaluate_gradient(
tetrahedron = regular_tetraherdron_for_points(pos, element_scale_parameter)

while not resolved:
resolved = True
for f in self.faults:
v = (
f[0]
Expand All @@ -215,8 +216,7 @@ def evaluate_gradient(
)
element_scale_parameter *= 0.5
tetrahedron = regular_tetraherdron_for_points(pos, element_scale_parameter)

resolved = True
resolved = False

tetrahedron_faulted = self._apply_faults(np.array(tetrahedron.reshape(-1, 3))).reshape(
tetrahedron.shape
Expand Down
Loading