-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
v3.2 #153
Open
AngRodrigues
wants to merge
180
commits into
master
Choose a base branch
from
v3.2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
v3.2 #153
+9,112
−1,434
Conversation
This file contains 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
Update issue templates
edit dddf70b chore: added issue_templates
….com/Loop3D/map2loop into revert-75-fix/adding_issue_templates
Revert "Update issue templates" PR
…oject (#157) * fix: use separate thickness table in LPF * docs: remove unused docstring * fix: min fault length can be int * fix: bug in output of StructuralPoint * fix: add the active_thickness_flag --------- Co-authored-by: AngRodrigues <[email protected]>
…remove-legacy_2
* fix: simple fix for #155 * fix: decimation factor allows floats * fix: decimation int
feat: remove option for legacy hson files
* fix: initial commit * fix: add debug info and warning for bad calculations * fix: add line length control to thickness calculators * fix: refactor to avoid repetitive code * fix: typo * fix: remove list comprehension - wky * fix list to df * fix: revert to lst comprehension * fix: make line length attribute of the TC class * fix: typos * fix: syntax * fix: add location tracking * fix: init commit to remove lst comprehension
lachlangrose
approved these changes
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This version is compatible with LPF version available at Loop3D/LoopProjectFile#42
Includes features described in:
PR - #140
PR - #154
PR - #157
PR - #158
PR - #159
Major changes:
Methods
set_thickness_calculator
andget_thickness_calculator
still availableUser can now choose up to 5 thickness calculators; also works with user-defined ThicknessCalculator class.
Default is
InterpolatedStructure
.LPF stores results and name of the thickness calculator as a new field -
LoopProjectFile.thicknessCalculatorType
, which is a part of theStratigraphicLog
object.ThicknessCalculatorAlpha
updated to logic of the other calculators (e.g., to work fromsampled_basal_contacts
)Minimum fault length is now a parameter of the config file,
removes the faults with length under defined value; if set to
None
, minimum fault length is calculated from project'sbbox
,Removed the setter method to avoid double definition; getter method still available through
proj.map_data.get_minimum_fault_length()
added
all_basal_contacts
object to mapdatamapdata.all_basal_contacts
-> abnormal+basal contacts ,mapdata.basal_contacts
-> holds only the basal.Reconstruction of
sampled_basal_contacts
is based onbasal_contacts
Added folder with datasets in
map2loop/_datasets/geodata_files/hamersley
The idea behind this is to have a data loading function, e.g., at the moment
load_hamersley_geology()
returns a gdf with the geology; structure and dtm are available, and others will keep being added as needed. This is quite useful for tests, but should also be useful for when we implement [Feature Request] - create map2loop project from geopandas array not file paths #74. The only thing about this is the location, which implies a long import: from map2loop._datasets.geodata_files.hamersley import load_hamersley_geology. Happy to change the file location - if anyone has a better suggestion?Added
DependencyChecker
class to__init__.py
This was based on LG's suggestion to check the LPF version on import.
I decided to expand on this and add this check for all libraries in
map2loop/dependencies.txt
Added ignore codes both for lithology and faults
works by feature name, and similar to the existing method.
Added methods for set and get with
_ignore_lithology_codes()
and_ignore_fault_codes()
.Example of working example code to achieve this can be seen in
map2loop/tests/project/test_ignore_codes_setters_getters.py
Minor changes:
Added tests:
Fixes #86
Fixes #110
Fixes #111
Fixes #12
Fixes #143
Fixes #137
Fixes #119
Fixes #155
Type of change
How Has This Been Tested?
Branches: