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

Dei 185 depth average rule #114

Merged
merged 75 commits into from
Jul 8, 2024
Merged

Dei 185 depth average rule #114

merged 75 commits into from
Jul 8, 2024

Commits on Jun 19, 2024

  1. feat[DEI-185]: create depth average rule

    @wschoonveld
    wschoonveld committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    d5e9cf6 View commit details
    Browse the repository at this point in the history

  2. add todo and parser

    @CindyvdVries
    CindyvdVries committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    5a23242 View commit details
    Browse the repository at this point in the history

  3. add data

    @CindyvdVries
    CindyvdVries committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    67bec0a View commit details
    Browse the repository at this point in the history

  4. Update template_input.yaml

    @CindyvdVries
    CindyvdVries committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    fc9051d View commit details
    Browse the repository at this point in the history

  5. add to modelbuilder

    @CindyvdVries
    CindyvdVries committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    8061706 View commit details
    Browse the repository at this point in the history

  6. DEI-185: depth_average_rule: calculate layer heights

    @wschoonveld
    wschoonveld committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    c8521fb View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. feat[DEI-185]: depth_average_rule: calculate depth average

    @wschoonveld
    wschoonveld committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    74709fc View commit details
    Browse the repository at this point in the history

  2. feat[DEI-185]: correct layer data and parser and fix flake issues

    @wschoonveld
    wschoonveld committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    6de8cc4 View commit details
    Browse the repository at this point in the history

  3. feat[DEI-185]: use enumerate (fix flake8)

    @wschoonveld
    wschoonveld committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    69ff442 View commit details
    Browse the repository at this point in the history

  4. feat[DEI-185]: clean up comments

    @wschoonveld
    wschoonveld committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    bd9a9a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. feat[DEI-185]: flake8

    @wschoonveld
    wschoonveld committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    24bdabb View commit details
    Browse the repository at this point in the history

  2. feat[DEI-185]: pylint warning

    @wschoonveld
    wschoonveld committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    22f82c7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta… 

    …res/D-EcoImpact into DEI-185-depth-average-rule
    @CindyvdVries
    CindyvdVries committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b3381e3 View commit details
    Browse the repository at this point in the history

  4. feat[DEI-185]: rename depth_average_layer_data to depth_average_rule_… 

    …data
    @wschoonveld
    wschoonveld committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6868a9f View commit details
    Browse the repository at this point in the history

  5. feat[DEI-185]: rule type implementation

    @wschoonveld
    wschoonveld committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    4aee6cd View commit details
    Browse the repository at this point in the history

  6. Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta… 

    …res/D-EcoImpact into DEI-185-depth-average-rule
    @CindyvdVries
    CindyvdVries committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c7297ff View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Complete workflow for depth averaged rule

    @CindyvdVries
    CindyvdVries committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6620a89 View commit details
    Browse the repository at this point in the history

  2. first implementation depth averaged rule

    @CindyvdVries
    CindyvdVries committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    5292e7c View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. correct calculation + clean up

    @CindyvdVries
    CindyvdVries committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    ec78db9 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. fix typo

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    5f2fa1e View commit details
    Browse the repository at this point in the history

  2. typo. Add test for depth averaged rule

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    86f340c View commit details
    Browse the repository at this point in the history

  3. correct validation test of depth average rule

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    aad71cd View commit details
    Browse the repository at this point in the history

  4. remove trailing spaces

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    dd59628 View commit details
    Browse the repository at this point in the history

  5. typo

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    22cac02 View commit details
    Browse the repository at this point in the history

  6. add test

    @mKlapwijk
    mKlapwijk committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    7f57b9b View commit details
    Browse the repository at this point in the history

  7. feat[DEI-185]: changes in depth average rule

    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    fb5e0bc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta… 

    …res/D-EcoImpact into DEI-185-depth-average-rule
    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    cfed894 View commit details
    Browse the repository at this point in the history

  9. feat[DEI-185]: changes in the depth average rule

    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    e7a5b7b View commit details
    Browse the repository at this point in the history

  10. feat[DEI-185]: clean up print statements

    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1f7baab View commit details
    Browse the repository at this point in the history

  11. feat[DEI-185]: enable error again to check on dummy variable

    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    e480591 View commit details
    Browse the repository at this point in the history

  12. feat[DEI-185]: add water level and bed level to be able to performn c… 

    …orrection for partially wet cells
    @wschoonveld
    wschoonveld committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    52d6e6e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. correction for bed level and waterlevel

    @CindyvdVries
    CindyvdVries committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    cf1c1a0 View commit details
    Browse the repository at this point in the history

  2. add unit test

    @CindyvdVries
    CindyvdVries committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d1c398f View commit details
    Browse the repository at this point in the history

  3. clean up and comments and typo

    @CindyvdVries
    CindyvdVries committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    f068ceb View commit details
    Browse the repository at this point in the history

  4. unit test parser

    @CindyvdVries
    CindyvdVries committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    78f3e6e View commit details
    Browse the repository at this point in the history

  5. correct nan values where it should be 0

    @CindyvdVries
    CindyvdVries committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ab9d6d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. set value back to nan

    @CindyvdVries
    CindyvdVries committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    542c7f8 View commit details
    Browse the repository at this point in the history

  2. feat[DEI-185]: use normal multiply and count on NaN

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    93278d0 View commit details
    Browse the repository at this point in the history

  3. feat[DEI-185]: add simpler unit test

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    fd783bd View commit details
    Browse the repository at this point in the history

  4. feat[DEI-185]: include data in unit test to prevent mix-up

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    7ef1fa7 View commit details
    Browse the repository at this point in the history

  5. feat[DEI-185]: change complex unit test: use tolerance level

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    bd5a70b View commit details
    Browse the repository at this point in the history

  6. feat[DEI-185]: remove useless init (pylint)

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    59a2e4b View commit details
    Browse the repository at this point in the history

  7. feat[DEI-185]: remove List (pylint)

    @wschoonveld
    wschoonveld committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    aa7bf44 View commit details
    Browse the repository at this point in the history

  8. add data object test

    @CindyvdVries
    CindyvdVries committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    cd60128 View commit details
    Browse the repository at this point in the history

  9. parametrize test

    @CindyvdVries
    CindyvdVries committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    4c44a2a View commit details
    Browse the repository at this point in the history

  10. add warning when no dimension is available

    @CindyvdVries
    CindyvdVries committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5c8ac46 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Let user know explicit which rule is missing variables

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    2dabb88 View commit details
    Browse the repository at this point in the history

  2. fix rule_based_model

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    e45aa83 View commit details
    Browse the repository at this point in the history

  3. use dims from variables instead of hardcoded names

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    aebce22 View commit details
    Browse the repository at this point in the history

  4. add warning and unit test if dimension mismatch

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d41e96e View commit details
    Browse the repository at this point in the history

  5. feat[DEI-185]: reduce number of local variables (pylint)

    @wschoonveld
    wschoonveld committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    1c062c0 View commit details
    Browse the repository at this point in the history

  6. removing duplicate code

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    4ee1bc5 View commit details
    Browse the repository at this point in the history

  7. reduce branches (pylint)

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    3b64234 View commit details
    Browse the repository at this point in the history

  8. reduce number of local variables

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    4ec7f4e View commit details
    Browse the repository at this point in the history

  9. Update rule_based_model.py

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    c7f4df7 View commit details
    Browse the repository at this point in the history

  10. fix pylint

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    265da25 View commit details
    Browse the repository at this point in the history

  11. Update depth_average_rule.py

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    bd58cfc View commit details
    Browse the repository at this point in the history

  12. Update rule_based_model.py

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    bee7944 View commit details
    Browse the repository at this point in the history

  13. Update model_builder.py

    @CindyvdVries
    CindyvdVries committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    942e78f View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. update with review comments

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    51d71c6 View commit details
    Browse the repository at this point in the history

  2. Update model_builder.py

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    244516b View commit details
    Browse the repository at this point in the history

  3. Update model_builder.py

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    795cacf View commit details
    Browse the repository at this point in the history

  4. added documentation + extra example test

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    f084d2e View commit details
    Browse the repository at this point in the history

  5. making generic variable list

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    057be2a View commit details
    Browse the repository at this point in the history

  6. pylint....

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    070ab52 View commit details
    Browse the repository at this point in the history

  7. forgot to rename the used variables

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    ded9a47 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into DEI-185-depth-average-rule

    @CindyvdVries
    CindyvdVries committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    acf203a View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. improve readability of the documentation

    @mKlapwijk
    mKlapwijk committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    14ed93b View commit details
    Browse the repository at this point in the history

  2. add space

    @mKlapwijk
    mKlapwijk committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a22e324 View commit details
    Browse the repository at this point in the history

  3. remove pandoc test

    @mKlapwijk
    mKlapwijk committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8515b69 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. update manual and make latex code visible

    @CindyvdVries
    CindyvdVries committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f44f615 View commit details
    Browse the repository at this point in the history

  2. Update 3_depth_average.png

    @CindyvdVries
    CindyvdVries committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    43f3555 View commit details
    Browse the repository at this point in the history

  3. update test cases for complex situations

    @CindyvdVries
    CindyvdVries committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    665f4e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Dei 217 depth average test case (#115) 

    * add script to create simplified netcdf

* add acceptance test

* feat[DEI-217]: extend example with extra variation in data

* Update depth_average_rule.py

* update acceptance test

* Update test17_depth_average_rule.nc

---------

Co-authored-by: Wouter <wouter.schoonveld@deltares.nl>
    @CindyvdVries @wschoonveld
    CindyvdVries and wschoonveld authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    e8b62d7 View commit details
    Browse the repository at this point in the history

  2. include coords

    @CindyvdVries
    CindyvdVries committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a423fe3 View commit details
    Browse the repository at this point in the history