Skip to content
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

Jump to bottom

Feature/project developments #38

Merged
merged 39 commits into from
Nov 20, 2024
Merged

Feature/project developments #38

merged 39 commits into from
Nov 20, 2024

Conversation

smknaake
Copy link
Collaborator

No description provided.

smknaake and others added 30 commits October 18, 2024 11:39
@smknaake
Add spatial selections using single or collections of Shapely objects
3dfbd18
@smknaake
Add geost editable install to pyproject.toml
7c94643
@smknaake
Unfreeze versions of packages
c496f49
@smknaake
Moved voxelmodel fixture to main conftest.py
f824525
@smknaake
Change boundaries of voxelmodel fixture to match test borehole depths
dde5d84
@smknaake
Start combining voxelmodel variable with collection object
17b65dd
@smknaake
Small test change
6a436aa
@smknaake
Small test change for push
50df5b1
@smknaake
Minor change
54e4097
@smknaake
Small docstring change
8dd342d
@smknaake
Complete and test add_voxelmodel_variable to Collection containing a …
bbaa711 
…LayeredData object
@smknaake
Add cpt_collection fixture
3b8bed9
@smknaake
Implement combine with DiscreteData
6182888
@smknaake
Add test for combine with DiscreteData and docstrings
3379699
@smknaake
Change to easier use of depth
dd985ba
@smknaake
Renamed method to get_cumulative_thickness
767d95e
@smknaake
Include combine logic for stratigraphic layers are not overlapping wi…
c0fdf1a 
…th boreholes or cpts at all
@smknaake
Add VoxelModel.from_netcdf for local voxelmodel data
aa13f7f
@smknaake
Remove iterative solution in _add_to_layered to reduce .loc overhead
6a3cf4e
@basknaake
Remove iterative solution in _add_to_layered to reduce .loc overhead
9affaa0
@basknaake
Merge branch 'feature/project_developments' of https://github.com/Del…
9fcc4c3 
…tares-research/geost into feature/project_developments
@smknaake
Remove rows that are inserted as duplicates
c8bd28c
@smknaake
Remove top layers that have a thickness of 0 when surface of borehole…
8f16bea 
… is lower than surface of voxelstack
@smknaake
Add UnitEnum for grouping of Geotop units; separate bro_geotop and …
7ef4267 
…bro_regis
@smknaake
Add test for UnitEnum
ec7e1fe
@smknaake
Add StratGeotop and tests
651f80d
@smknaake
Fix: make sure get_cumulative_thickness also accepts int/float columns
451e231
@Erik-Geo
Added simple BORIS XML read function, parser and test
535e607
@Erik-Geo
Improvements to the BORIS XML parser
329b3c9
@Erik-Geo
Improved parsing of BORIS XML attributes
c3551b1
@Erik-Geo Erik-Geo merged commit f3c2bcb into main Nov 20, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smknaake @Erik-Geo @basknaake