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.

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

Update to 0.5.2 #160

Merged
merged 67 commits into from
Apr 12, 2023
Merged

Update to 0.5.2 #160

merged 67 commits into from
Apr 12, 2023

Conversation

rubencalje
Copy link
Collaborator

@rubencalje rubencalje commented Apr 11, 2023

This update adds groundwater transport capabilities, support for the lake package and a lot of smaller improvements to nlmod.

rubencalje and others added 30 commits February 21, 2023 15:58
* Create test_013_surface_water.py

* Edit and add tests

* Fix test

* simplify nlmod.get_ds a bit more

* Fix bugs for future versions of flopy and update tests

* Fix tests
- add auxiliary variable support to GHB and CHD
- add BUY package
- add GWT
- add DIS (copy of GWF, dis, could be more efficient?)
- add DISV (copy of GWT disv, could be more efficient)
- add ADV
- add DSP (determine where to pick up vars)
- add SSM
- add MST
- add CNC
- add OC (_set_record could be generalized between gwf/gwt)
- add IC
- add GWFGWT exchange
- add GWT
- add DIS (copy of GWF, dis, could be more efficient?)
- add DISV (copy of GWT disv, could be more efficient)
- add ADV
- add DSP (determine where to pick up vars)
- add SSM
- add MST
- add CNC
- add OC (_set_record could be generalized between gwf/gwt)
- add IC
- add GWFGWT exchange
- allow aux to be both dataset variable (str) and single float/int
- weighted mean value of source dataarray  per layer defined in model dataset
- make dis/disv work for both gwf and gwt
- improve aux support to ghb/chd
- store ssm_sources if aux is defined and transport is True
- add drn package, similar to GHB
- make _set_record work for both head and concentration for oc pkg
- allow masking where recharge should be applied.
- reuse gwf dis/disv and _set_record
- improve getting vars from dataset or passing directly to function
- for ssm, get sources from ssm_sources attribute (auto added when gwf pkgs are created with aux vars)
- add method to load concentrations as dataarray
- add method to get concentrations at gw surface (first active layer)
- supports chloride (with certain default values)
dbrakenhoff and others added 25 commits March 10, 2023 13:29
Add groundwater transport capabilities to nlmod
Add lake package + example to nlmod
* add reader for meteobase zip files

* add test for reading zipfile from meteobase

* Update __init__.py

add meteobase

* Update meteobase.py

fix | character

* Update meteobase.py

fix if statement

* Update meteobase.py

fix redefining built-in 'type'

* fix test

* Revert "fix test"

This reverts commit e651df1.

* fix test

using os :))

* Create Meteobase_ASCII_test.zip

* Revert "fix test"

This reverts commit cb4c60c.

* Update meteobase.py

codacy fix

* fix hour bug get_datetime_from_fname function

only search name with removed date

* rename test_015 to test_017

* Update meteobase.py

use zeros instead of empty

* Replace np.datetime64 by pd.Timestamp

---------

Co-authored-by: Ruben Caljé <r.calje@artesia-water.nl>
* Improve split_layers_ds

now also works for other variables
now also works for vertex grids
split_dict can contain layer names as keys, and values do not have to add up to 1 anymore
split_reindexer in attrs contains layer names now
First splitted layer gets _1 suffix
Less code

* Some other changes, mostly documentation

* Fix structured_da_to_ds

For when da is in another crs
For when grid-refinement is used

* Improve jarkus

Can now also read data from "kusthoogte" and "vaklodingen"
More options to get a specific time

* Improve documentation and refine method for rotated grids

* Fix bug I introduced in Jarkus

* Fix gdf_to_bool_da for rotated grids

* fix get_bathymetry

* Fix codacy issues

* Fix warning in structured_da_to_ds

fixes UserWarning: Transform that is non-rectilinear or with rotation found. Unable to recalculate.

* Move split_reindexer from attributes of ds, as it cannot be saved to nc-file

* Keep crs and index name in gdf_to_grid

And update some documentation

* Solve bugs

* Improve ds_to_ugrid_nc_file

* spelling error and codacy

* Remove output from tests

* Add calculate_gxg (from imod-python)

* Fix path of some tests, so previous test is not overwritten

Also remove imod-dependency for generation of docs

* Some minor codacy stuff

* Add raise_excepions in download methods of water boards

And add documentation
And change timeout to 120 seconds in some places (from 1200 seconds)

* Use flopy code to download binaries instead of own code

* Improve surface water and small changes to other parts

* fix tests and codacy

* Fix remaining bugs in tests and docs

* Make scripts more robust

And improve error logging

* Add more logging in get_kh_kv

* make units optional in get_kg_kv

* Update documentation of gdf_to_seasonal_pkg

* Small improvements

* Improve add_bottom_height_from_waterboards

* move calculate_gxg to nlmod.gwf.output

* Remove some leftovers of evaluate

* Update index of watercourses De Dommel

* minor improvement
@rubencalje rubencalje marked this pull request as ready for review April 11, 2023 20:33
@rubencalje rubencalje merged commit 7a8e495 into main Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants