Code

Feature/project developments#38

Code

Merged

Erik-Geo merged 39 commits intomainDeltares-research/geost:mainfrom feature/project_developmentsDeltares-research/geost:feature/project_developmentsCopy head branch name to clipboardNov 20, 2024

+12,278-12,191

Commits

Commits on Oct 18, 2024

• Add spatial selections using single or collections of Shapely objects

  smknaake

  committed
  3dfbd18

Commits on Oct 29, 2024

• Add geost editable install to pyproject.toml

  smknaake

  committed
  7c94643

• Unfreeze versions of packages

  smknaake

  committed
  c496f49

• Moved voxelmodel fixture to main conftest.py

  smknaake

  committed
  f824525

• Change boundaries of voxelmodel fixture to match test borehole depths

  smknaake

  committed
  dde5d84

• Start combining voxelmodel variable with collection object

  smknaake

  committed
  17b65dd

Commits on Oct 30, 2024

• Small test change

  smknaake

  committed
  6a436aa

Commits on Oct 31, 2024

• Small test change for push

  smknaake

  committed
  50df5b1

• Minor change

  smknaake

  committed
  54e4097

Commits on Nov 5, 2024

• Small docstring change

  smknaake

  committed
  8dd342d

• Complete and test add_voxelmodel_variable to Collection containing a LayeredData object

  smknaake

  committed
  bbaa711

• Add cpt_collection fixture

  smknaake

  committed
  3b8bed9

• Implement combine with DiscreteData

  smknaake

  committed
  6182888

• Add test for combine with DiscreteData and docstrings

  smknaake

  committed
  3379699

• Change to easier use of depth

  smknaake

  committed
  dd985ba

Commits on Nov 12, 2024

• Renamed method to get_cumulative_thickness

  smknaake

  committed
  767d95e

• Include combine logic for stratigraphic layers are not overlapping with boreholes or cpts at all

  smknaake

  committed
  c0fdf1a

• Add VoxelModel.from_netcdf for local voxelmodel data

  smknaake

  committed
  aa13f7f

Commits on Nov 13, 2024

• Remove iterative solution in _add_to_layered to reduce .loc overhead

  smknaake

  committed
  6a3cf4e

• Remove iterative solution in _add_to_layered to reduce .loc overhead

  basknaake

  committed
  9affaa0

• Merge branch 'feature/project_developments' of https://github.com/Deltares-research/geost into feature/project_developments

  basknaake

  committed
  9fcc4c3

Commits on Nov 14, 2024

• Remove rows that are inserted as duplicates

  smknaake

  committed
  c8bd28c

• Remove top layers that have a thickness of 0 when surface of borehole is lower than surface of voxelstack

  smknaake

  committed
  8f16bea

• Add UnitEnum for grouping of Geotop units; separate bro_geotop and bro_regis

  smknaake

  committed
  7ef4267

• Add test for UnitEnum

  smknaake

  committed
  ec7e1fe

• Add StratGeotop and tests

  smknaake

  committed
  651f80d

• Fix: make sure get_cumulative_thickness also accepts int/float columns

  smknaake

  committed
  451e231

Commits on Nov 18, 2024

• Added simple BORIS XML read function, parser and test

  Erik-Geo

  committed
  535e607

Commits on Nov 19, 2024

• Improvements to the BORIS XML parser

  Erik-Geo

  committed
  329b3c9

• Improved parsing of BORIS XML attributes

  Erik-Geo

  committed
  c3551b1

• Coerce BORIS xml parsed data to best possible dtype; small kingdom export bugfix.

  Erik-Geo

  committed
  4b24377

• Require user-input reference system to boris xml reader due to non-standard BORIS CRS strings.

  Erik-Geo

  committed
  5865abd

Commits on Nov 20, 2024

• Merge branch 'main' into feature/project_developments

  Erik-Geo

  committed
  82d6a07

• Updated lock file

  Erik-Geo

  committed
  0aeffa0

• Update pyproject.toml for removed install task

  Erik-Geo

  committed
  cd148ba

• Updated pixi lock file for CI run

  Erik-Geo

  committed
  5f073ec

• Updates to pixi.loc; Use tmp_path fixture for file IO

  smknaake

  committed
  8137318

• test_read makes use of data_dir fixture for all tests

  Erik-Geo

  committed
  268e68a

• Removed test with excel IO, which failed in the window CI pipeline

  Erik-Geo

  committed
  0ba52b2