Fix/map2model fault fault relationships #140
Merged
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
lachlangrose
requested review from
RoyThomsonMonash
and removed request for
RoyThomsonMonash
|
@lachlangrose, do you mind if I add this to v3.2? |
I think its already in master/3,2 now but I changed the base anyway |
AngRodrigues
added a commit
that referenced
this pull request
Dec 16, 2024
* Update issue templates * feat: added issue_templates * fix: add pull request template * fix: few typos grammar * fix: tests should be with pytest * Revert "Update issue templates" * fix: trigger build * style: style fixes by ruff and autoformatting by black * chore(master): release 3.1.1 * fix: update doc deploy * chore(master): release 3.1.2 * docs: remove lavavu; no need for 3D vis for the examples * style: style fixes by ruff and autoformatting by black * fix: remove tini from docker * chore(master): release 3.1.3 * Update issue templates * feat: added issue_templates edit dddf70b chore: added issue_templates * fix: add pull request template * fix: few typos grammar * fix: tests should be with pytest * Revert "Update issue templates" * fix: add issue templates back * fix: correct grammar for clarity * fix: squashed commits of: - fixing the non-use of minimum_fault_length, - use tmpfile to create temporary files, - added random test for mapdata functions:get/set working projection, - added functionality and comments to basal_contacts_build * tests: add more functionality * fix: leave as is for now * fix: finalise the thickness calculator outputs * fix: Remove hjson and rely on json only * fix: update tests/ small fixes * fix: make sure dependencies are right * fix: linting issue * fix: try again * fix: update thickness tests//fix minor typos * fix: correct some typos/update tests * fix: typo in tests * Update README.md * fix: add the basal_contacts_abnormal_check * fix: add error handles for json, url, filenotfound * fix: remove typo * fix: remove tqdm * fix: added check for collocated points * fix: upd gdal as per master * fix: remove test from server * fix: issue 122 * fix: update str format * fix: now use DBSCAN to aggregate collocated poins * fix: removed addition * fix: added warning when collocated points detected * fix: add str for paths - gdal does not accept pathlibs * fix: update minimum_fault_length as per code review * fix: add pathlibs where possible in m2model_wrapper * fix: add pathlib in mapdata.py * fix: revert pathlib in map2model.run * fix: proj should not have temp files * fix: update the minimum_fault_length * tests: add tests for minimum_fault_length * fix: remove redundancy from project.py * fix: update calculate minimum_fault_length for 5% of the map area * fix: linting * fix: typo * fix: remove repetitive print stat * fix: adjust thickness_calc workflow for modularity * fix: remove unnecessary fields * fix: update thickness tests * fix: add ignore_fault_codes and tests for ignore_lithology_code and ignore_fault_code * fix: try relative path ../_datasets * fix: use only path instead of pkg_resources * fix: try full path * fix: load only using path /hamersley * fix: try ./map2loop/_datasets/geodata_files/ * fix: use correct path * refactor: back to original code * fix: add the whole hamersley folder * fix: update docker for docs * fix: update the docs-deploy for master branch only * fix: update CI to build on master only * fix: remove redundancy * fix: update the server test and handle timeout properly * fix: updated ReadMe to have the right install steps (temporary measure) * fix: update CI - test wheels on master only * fix: add test to sdist build in CI to ensure tests are run in the non-master branches * fix: update pytest in ci * fix: revert ci * fix: add pytest in the right place * fix: update pytest location * fix: manifest update * fix: update ci again * investigate * find the install folder * try again * update ci * fix: add checkout step to build sdist * fix: run pytest with test sdist action * fix: revert CI and let tests only run on main branch * fix: add version check new class to check install of dependencies.txt; includes version number check * fix: organise manifest * fix: linting fixes from merges * fix: update CI to run all jobs on branch * fix: update map2model paths * fix: update LPF to install from branch * fix: update install from branch * fix: update the lpf to branch in wheel testing * fix: build the docs on this branch * fix: keep docs separate * fix: pypi and conda upld runs only on master * fix: test the docs on the branch too * fix: update docs docker to build lpf from branch * fix: install sphinx with apt-get? * docs: change sphinx build path * fix: update build path docs * docs: update build requirements * fix: add beartype * docs: typo in docker? * fix: remove redundant beartpe install * chore: typo * fix: simplify issue templates * chore: hjson not in 3.2 * fix: remove hjson from dependencies as not in 3.2 * doc: removing min fault length attribute docstring * fix: adding min fault length setter back to project. Linking to config attribute * fix: min fault length setter/getter for mapdata uses config attribute * No data min fault length is -1 * chore: test unpin gdal from ci * fix: remove sphinx from docs docker build * chore: try again * fix: map2model fault fault relationships (#140) * fix: fault topology merge was using incorrect lookups * fix: run map2model for user defined stratigraphic column * removing logger from this pr * fix: use fault id not Fault_{id} * feat: make map2model optional using geopandas spatial joins as a replacement (#154) * fix: stratigraphic alpha sorter was inverted, reverse sorter * ignore units without contact for max contact length sorter * updated orientation sorter to use correct trigonometry for strike/dip lines. also change to using all intersections along line not only the first intersection. perhaps this should be a different sorter? * revert back to original orientation sorter * style: black * updating WA json to work * remove unused argument documentation * only run doc build on master * use geopandas to produce topology graphs instead of map2model. Basically just using sjoins and buffers. Returns the same for faults and contacts but we have some differences for fault-unit intersections. * update sorter to not use stratigraphic order hint and deprecate hint sorter * update deformation history to use eventId not name for merging * bipass old map2model run * use property accessor to make sure that variables are up to date * remove sorted units from sorter call * removing comment and condaforge channel * fix: remove map2model call from map2loop this is a quick fix, and needs to be cleaned up as the tmp files for map2model are still being created and the old code is just commented * update networkx sorter to have a name2index map * fix: add mode to choose betweeen m2m and geopandas * remove gdal fix * linting * style: black formatting * fix: make the minimum_fault_length updatable through project * fix: add libgdal to docs docker * typo * fix: try other gdal on docs * more gdal issues * fix: revert the gdal pin removal to see if that's the issue * fix: use minimum fault length from project * fix: use separate thickness table in LPF & add active thickness to project (#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]> * feat: do not accept any legacy files * chore: small typo * remove legacy format arguments * add config file path back * fix: allow json files, check for old keys * chore: add/fix/update logger outputs * chore: more logging * chore: update tests to not rely on warnings * chore: proper string formatting * fix: small fixes for deprecation/linting warnings in test sessions * chore: update actions from deprecation * fix: issue 155 (#158) * fix: simple fix for #155 * fix: decimation factor allows floats * fix: decimation int * fix: remove print statement left behind * chore: update docstrings * fix: gdal: test if conda issue * fix: revert * remove gdal pin?? * fix: keep gdal pin for now * fix: add debug info to thickness calculators (#161) * 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 * chore: empty commit to trigger ci run * chore: update typing to avoid deprecation * fix: update ubuntu * ci: small updates * fix: dependencies updated * fix: update LPF dependency * fix: update linting and release-please * ci: typos * ci: keep release-please separate from linting * ci: update testing * ci: add pytest * ci: update testing workflow * ci: update linting action * chore: upd conda meta * style: style fixes by ruff and autoformatting by black * ci: add conda & pypi * ci: add docs * ci: update to ubuntu24.04 * ci: force docs to branch gh ref * chore: add testing badge to readme * chore: add release badge * Update README.md * Update README.md * fix: update conda and pip builds * ci: add classic solver * ci: add extra action to test conda build and install * ci update * ci: update * gdal pin? * add libmamba * chore: typos * Fix: update gdal install in actions (#163) * ci: remove the build test for now --------- Co-authored-by: Lachlan Grose <[email protected]> Co-authored-by: lachlangrose <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: AngRodrigues <[email protected]> Co-authored-by: Rabii Chaarani <[email protected]> Co-authored-by: rabii-chaarani <[email protected]> Co-authored-by: RoyThomsonMonash <[email protected]>
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.
Fixes bug where the fault topology was not exported