fix: correct fault-proximity gradient retry loop and stop set_stratigraphic_column from wiping state - #304
Merged
lachlangrose merged 2 commits intoAug 14, 2026
Conversation
This was referenced Aug 14, 2026
- Added a new method `_validate_intrusion_inputs` in `GeologicalModel` to validate inputs for intrusions, ensuring necessary data is present before processing. - Updated `_build_intrusion` to call the new validation method, improving error handling for missing data. - Refactored `IntrusionBuilder.create_geometry_using_geometric_scaling` to clarify that geometric scaling is not currently implemented, raising a `NotImplementedError` immediately. - Simplified threshold handling in `IntrusionFeature` by removing redundant checks for marginal faults. - Removed the unused `intrusion_support_functions.py` file to clean up the codebase. - Updated tests in `test_intrusions.py` to cover new validation logic, ensuring clear error messages for missing data and parameters. - Added regression tests for previously silent errors related to weight handling and geometric scaling. (cherry picked from commit 8cb80c1)
…raphic_column from wiping state evaluate_gradient's tetrahedron-refinement loop set resolved=True unconditionally after one pass, so it never actually retried after shrinking the tetrahedron near a fault. set_stratigraphic_column cleared the model's stratigraphic column before unconditionally raising DeprecationWarning, destroying existing state on every call. (cherry picked from commit 647fe5d)
lachlangrose
force-pushed
the
split/05-fault-proximity-fix
branch
from
August 14, 2026 11:29
9c0a278 to
0370ed2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split out of #298 / #299. PR 5 of 9 in the stack — depends on #300 (base branch only; this fix doesn't touch intrusions code). Starts the "core refactor" line of the stack, independent of the map2loop/visualisation line (#301-#303).
Fixes #296:
set_stratigraphic_columnraisedDeprecationWarningunconditionally, which brokeGeologicalModel.from_processor. Emits the warning withwarnings.warninstead so the legacy dict format keeps working. Also corrects the fault-proximity gradient retry loop in_geological_feature.py.