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

Commits on Feb 21, 2023

  1. Update version.py

    rubencalje committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    9f8ef5f View commit details
    Browse the repository at this point in the history
  2. Add extra tests

    rubencalje committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    3796bba View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Update tests and simplify nlmod.get_ds a bit more (#146)

    * 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
    rubencalje authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    63dd5e7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dcef7f8 View commit details
    Browse the repository at this point in the history
  3. add workspace to gitignore

    OnnoEbbens committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    b25551a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Configuration menu
    Copy the full SHA
    9799a74 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. fix for #147

    OnnoEbbens committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    c11b60f View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Configuration menu
    Copy the full SHA
    7a9e8d4 View commit details
    Browse the repository at this point in the history
  2. add lake example

    OnnoEbbens committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    027abe2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    543907b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    02e66ff View commit details
    Browse the repository at this point in the history
  5. update gwf for gwt modeling

    - add auxiliary variable support to GHB and CHD
    - add BUY package
    dbrakenhoff committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    772bed4 View commit details
    Browse the repository at this point in the history
  6. add gwt submodule

    - 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
    dbrakenhoff committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8e9b315 View commit details
    Browse the repository at this point in the history
  7. add gwt submodule

    - 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
    dbrakenhoff committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    14bf5da View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4083467 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    56b2122 View commit details
    Browse the repository at this point in the history
  10. add show_versions

    dbrakenhoff committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    fb088a3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    134156b View commit details
    Browse the repository at this point in the history
  12. black + isort

    dbrakenhoff committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8ff68cf View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. black+isort

    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    175e1ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a012f50 View commit details
    Browse the repository at this point in the history
  3. transport flag in ds

    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    6859de6 View commit details
    Browse the repository at this point in the history
  4. add aux support to *_to_reclist functions

    - allow aux to be both dataset variable (str) and single float/int
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    507fd51 View commit details
    Browse the repository at this point in the history
  5. add aggregate_by_weighted_mean_to_ds function

    - weighted mean value of source dataarray  per layer defined in model dataset
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    3ff8ca9 View commit details
    Browse the repository at this point in the history
  6. improve gwf

    - 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
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    9d1221c View commit details
    Browse the repository at this point in the history
  7. add mask to model_datasets_to_rch

    - allow masking where recharge should be applied.
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    304cb94 View commit details
    Browse the repository at this point in the history
  8. improve gwt

    - 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)
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    c364c13 View commit details
    Browse the repository at this point in the history
  9. gwt output

    - add method to load concentrations as dataarray
    - add method to get concentrations at gw surface (first active layer)
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    f63b1a5 View commit details
    Browse the repository at this point in the history
  10. add method to set default transport params

    - supports chloride (with certain default values)
    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    dd2fbaa View commit details
    Browse the repository at this point in the history
  11. simplify IMS call

    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    9a589d4 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    349eda9 View commit details
    Browse the repository at this point in the history
  13. update nb

    dbrakenhoff committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    44c7ba9 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. improve gwt

    - no overwriting stored dataset attributes when building a model
    - introduce _get_var_from_ds_attr for unifying method to obtain attribute data from dataset
    - introduce _get_var_from_ds_datavar for unifying method to obtain data variable from dataset
    - allow setting custom modelname for transport model
    - add docstrings
    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9e88d39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9845707 View commit details
    Browse the repository at this point in the history
  3. docstring

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    e0dfdc8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d5496c View commit details
    Browse the repository at this point in the history
  5. isort and black

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    6ffa697 View commit details
    Browse the repository at this point in the history
  6. codacy

    - introduce _dis and _disv and reuse in gwt/gwt modules
    - fix other issues
    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    7b6e603 View commit details
    Browse the repository at this point in the history
  7. clear nb output

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    fdbc942 View commit details
    Browse the repository at this point in the history
  8. testing is smart 8-)

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    7c56889 View commit details
    Browse the repository at this point in the history
  9. codacy

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9fadc97 View commit details
    Browse the repository at this point in the history
  10. codacy

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    443f4bb View commit details
    Browse the repository at this point in the history
  11. fix comments by @OnnoEbbens

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    42319f8 View commit details
    Browse the repository at this point in the history
  12. fix comments by @OnnoEbbens

    dbrakenhoff committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    1daa0a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. whitespace

    dbrakenhoff committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    d867c4f View commit details
    Browse the repository at this point in the history
  2. fix for #150

    OnnoEbbens committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    c2bb7a0 View commit details
    Browse the repository at this point in the history
  3. codacy

    dbrakenhoff committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    2a2e805 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #148 from ArtesiaWater/gwt

    Add groundwater transport capabilities to nlmod
    dbrakenhoff authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    098013c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Configuration menu
    Copy the full SHA
    06c4372 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f3b1ef3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1510129 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6ac29f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Configuration menu
    Copy the full SHA
    71f5c7e View commit details
    Browse the repository at this point in the history
  2. fix two errors in tests

    OnnoEbbens committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    18f4569 View commit details
    Browse the repository at this point in the history
  3. logging -> logger

    OnnoEbbens committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    5749fcb View commit details
    Browse the repository at this point in the history
  4. codacy fix

    OnnoEbbens committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    3c371cb View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Configuration menu
    Copy the full SHA
    c4f61e2 View commit details
    Browse the repository at this point in the history
  2. processed comments

    OnnoEbbens committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    b3dc0fc View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge pull request #154 from ArtesiaWater/lake

    Add lake package + example to nlmod
    OnnoEbbens authored Mar 27, 2023
    Configuration menu
    Copy the full SHA
    187472c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Add Meteobase ASCII read function (#159)

    * 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>
    martinvonk and rubencalje authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    8d6031f View commit details
    Browse the repository at this point in the history
  2. Improve split layers ds and many other improvements (#156)

    * 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 authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    4ff4430 View commit details
    Browse the repository at this point in the history
  3. Fixes issue #157

    rubencalje committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    2a6c5bc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    26ea770 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2bdce42 View commit details
    Browse the repository at this point in the history
  6. Update version.py

    rubencalje committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    9528e2b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Configuration menu
    Copy the full SHA
    a461e69 View commit details
    Browse the repository at this point in the history
  2. condacy stuff

    rubencalje committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    7386579 View commit details
    Browse the repository at this point in the history