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

ModelComponent Class #769

Merged
merged 69 commits into from
Mar 12, 2024
Merged

ModelComponent Class #769

merged 69 commits into from
Mar 12, 2024

Commits on Feb 7, 2024

  1. initial setup of GridModelComponent

    @Tjalling-dejong
    Tjalling-dejong committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    1e08fcc View commit details
    Browse the repository at this point in the history

  2. created initial abc class for model components

    @Tjalling-dejong
    Tjalling-dejong committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    f2d556e View commit details
    Browse the repository at this point in the history

  3. finalized first iteration of GridModelComponent class

    @Tjalling-dejong
    Tjalling-dejong committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    74075ce View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. added model_utils with model and modelcomponent utility functions

    @Tjalling-dejong
    Tjalling-dejong committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    4910f67 View commit details
    Browse the repository at this point in the history

  2. updated GridModelComponent

    @Tjalling-dejong
    Tjalling-dejong committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    11c8e83 View commit details
    Browse the repository at this point in the history

  3. added test for GridModelComponent.set method

    @Tjalling-dejong
    Tjalling-dejong committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    f63150c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. renamed file

    @Tjalling-dejong
    Tjalling-dejong committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    54aaabb View commit details
    Browse the repository at this point in the history

  2. implemented requested changes

    @Tjalling-dejong
    Tjalling-dejong committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    e5af762 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    2fce053 View commit details
    Browse the repository at this point in the history

  4. incorporated GridComponent in v1

    @Tjalling-dejong
    Tjalling-dejong committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    608cc7a View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge branch 'v1' into model_components

    @savente93
    savente93 authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    f010d8f View commit details
    Browse the repository at this point in the history

  2. added data_catalog as a grid_component attribute

    @Tjalling-dejong
    Tjalling-dejong committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    bc5e7f3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'model_components' of github.com:Deltares/hydromt into m… 

    …odel_components
    @Tjalling-dejong
    Tjalling-dejong committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    2568403 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'v1' into model_components

    @savente93
    savente93 authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    5067635 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1' into model_components

    @savente93
    savente93 authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    d2d13c5 View commit details
    Browse the repository at this point in the history

  6. Added tests for create, set, and write methods

    @Tjalling-dejong
    Tjalling-dejong committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    5700d34 View commit details
    Browse the repository at this point in the history

  7. temporarily commented GridModel test code

    @Tjalling-dejong
    Tjalling-dejong committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    05ccfb5 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. expanded tests on GridComponent

    @Tjalling-dejong
    Tjalling-dejong committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    3b29cd9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. finished test for add_data_from_rasterdataset

    @Tjalling-dejong
    Tjalling-dejong committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b1ffd91 View commit details
    Browse the repository at this point in the history

  2. added tests for add_data_from_raster_reclass

    @Tjalling-dejong
    Tjalling-dejong committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    2575a59 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. added test for GridComponent.add_data_from_geodataframe()

    @Tjalling-dejong
    Tjalling-dejong committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d5bbc73 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    c5fc76b View commit details
    Browse the repository at this point in the history

  3. updated docstring

    @Tjalling-dejong
    Tjalling-dejong committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    e502a8f View commit details
    Browse the repository at this point in the history

  4. updated doc string of grid component class

    @Tjalling-dejong
    Tjalling-dejong committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    5eedc70 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. moved write_nc and read_nc to io module

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    797c76d View commit details
    Browse the repository at this point in the history

  2. removed model_utils

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    f9202b2 View commit details
    Browse the repository at this point in the history

  3. changed return types and used splitext instead of split

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    47abdaf View commit details
    Browse the repository at this point in the history

  4. split tests where applicable

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    c02207c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    f5026a2 View commit details
    Browse the repository at this point in the history

  6. skipped tests that call grid model

    @Tjalling-dejong
    Tjalling-dejong committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    10c3768 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. removed commented import

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    de71a26 View commit details
    Browse the repository at this point in the history

  2. added model weak ref

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    45c29c9 View commit details
    Browse the repository at this point in the history

  3. fixed circular imports

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    4a4ef98 View commit details
    Browse the repository at this point in the history

  4. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    c736a58 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    be5c4a8 View commit details
    Browse the repository at this point in the history

  6. formatted imports

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b390585 View commit details
    Browse the repository at this point in the history

  7. updated tests with model ref

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    39ef05e View commit details
    Browse the repository at this point in the history

  8. skipped TestConventionResolver because its failing on windows test runs

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    99fb90f View commit details
    Browse the repository at this point in the history

  9. added model.region.set_geoms and updated tests

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    03c3d70 View commit details
    Browse the repository at this point in the history

  10. changed tmp_dir to tmpdir

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    3dca12a View commit details
    Browse the repository at this point in the history

  11. removed unused fixture

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    f8de3c5 View commit details
    Browse the repository at this point in the history

  12. removed typo

    @Tjalling-dejong
    Tjalling-dejong committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d698200 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    dbfe1fd View commit details
    Browse the repository at this point in the history

  2. moved test_grid_component.py to models/model_components folder and ad… 

    …ded mock_model object in tests
    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    df2cadd View commit details
    Browse the repository at this point in the history

  3. Added model weakref and ModelComponent properties

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    f04160b View commit details
    Browse the repository at this point in the history

  4. removed tests/model/model_components/test_grid_component.py

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    4e49aed View commit details
    Browse the repository at this point in the history

  5. updated migration guide

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    db7b149 View commit details
    Browse the repository at this point in the history

  6. integrated model_component.py into base.py

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    ddf4979 View commit details
    Browse the repository at this point in the history

  7. updated api.rst

    @Tjalling-dejong
    Tjalling-dejong committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    5524f09 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Update docs/dev/migrating-to-v1.rst 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    e13dab6 View commit details
    Browse the repository at this point in the history

  2. Update docs/dev/migrating-to-v1.rst 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    689758a View commit details
    Browse the repository at this point in the history

  3. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    23b80b0 View commit details
    Browse the repository at this point in the history

  4. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1c91e75 View commit details
    Browse the repository at this point in the history

  5. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    858a264 View commit details
    Browse the repository at this point in the history

  6. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    7db3b8c View commit details
    Browse the repository at this point in the history

  7. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    97b66fd View commit details
    Browse the repository at this point in the history

  8. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    dbb9824 View commit details
    Browse the repository at this point in the history

  9. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    a70cbba View commit details
    Browse the repository at this point in the history

  10. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    19e4cfd View commit details
    Browse the repository at this point in the history

  11. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    a314ca3 View commit details
    Browse the repository at this point in the history

  12. resolved requested changes

    @Tjalling-dejong
    Tjalling-dejong committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    29ff918 View commit details
    Browse the repository at this point in the history

  13. updated write_nc and models/__init__.py

    @Tjalling-dejong
    Tjalling-dejong committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    632c503 View commit details
    Browse the repository at this point in the history

  14. updated typing

    @Tjalling-dejong
    Tjalling-dejong committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    0a18c27 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'v1' into model_components

    @Tjalling-dejong
    Tjalling-dejong committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1583190 View commit details
    Browse the repository at this point in the history

  16. made crs optional

    @Tjalling-dejong
    Tjalling-dejong committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    cb40961 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    a8efc67 View commit details
    Browse the repository at this point in the history

  2. Update hydromt/models/components/grid.py 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    0d17262 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
    @Tjalling-dejong @hboisgon
    Tjalling-dejong and hboisgon authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8e5f266 View commit details
    Browse the repository at this point in the history

  4. removed StrPath

    @Tjalling-dejong
    Tjalling-dejong committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    33a2e07 View commit details
    Browse the repository at this point in the history