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

Feature/dei 58 new time add as coord #18

Merged
merged 62 commits into from
Mar 24, 2023
Merged

Feature/dei 58 new time add as coord #18

merged 62 commits into from
Mar 24, 2023

Commits on Feb 22, 2023

  1. DEI-49 Add dataset util functions. Add tests for all utils

    @mKlapwijk
    mKlapwijk committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    88aeb32 View commit details
    Browse the repository at this point in the history

  2. DEI-49 Add non working rename function to utils

    @mKlapwijk
    mKlapwijk committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    0045148 View commit details
    Browse the repository at this point in the history

  3. DEI-49 Remove print statements

    @mKlapwijk
    mKlapwijk committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    7e1275b View commit details
    Browse the repository at this point in the history

  4. Added copying of location and mesh attributes

    @HiddeElzinga
    HiddeElzinga committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    f4bdc1c View commit details
    Browse the repository at this point in the history

  5. Added attributes to variable assignment

    @HiddeElzinga
    HiddeElzinga committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    f0053c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. DEI-39 add merge datasets routine to utils

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    c5f248b View commit details
    Browse the repository at this point in the history

  2. DEI-49 Add function to merge list of datasets

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    ec50362 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'poc/add-location-mesh-attributes' into DEI-49-Select-va… 

    …riables-to-be-included-in-outputdataset
    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    785e09a View commit details
    Browse the repository at this point in the history

  4. DEI-39 Fix utils tests. Add mapping to modelbuilder. Add intermediate… 

    … state to rule_based_model. Not working yet
    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    20da2cc View commit details
    Browse the repository at this point in the history

  5. DEI-49 Make list of input and output variable names. Add system names… 

    …. Make unique
    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    bff1034 View commit details
    Browse the repository at this point in the history

  6. DEI-49 make output_names also a list. Reorder flatten and remove dupl… 

    …icates
    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    7f98225 View commit details
    Browse the repository at this point in the history

  7. DEI-49. Some cleaning. Comment not working test.

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    186f24d View commit details
    Browse the repository at this point in the history

  8. DEI-49 Remove all unneeded variables

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    3142969 View commit details
    Browse the repository at this point in the history

  9. DEI-49 Refactor

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    7d31d5d View commit details
    Browse the repository at this point in the history

  10. DEI-49 Remove now obsolete system mapping

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    8bd4db0 View commit details
    Browse the repository at this point in the history

  11. DEI-49 Do renaming on output dataset

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    d924a0a View commit details
    Browse the repository at this point in the history

  12. DEI-49 Add comment

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    0462ffc View commit details
    Browse the repository at this point in the history

  13. DEI-49 Add mapping keys to variables not to be removed

    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    c8a3ba6 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into DEI-49-Select-variables-to-be-included-in-ou… 

    …tputdataset
    @mKlapwijk
    mKlapwijk committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    14d6c47 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. DEI-49 Add yaml files to git ignore

    @mKlapwijk
    mKlapwijk committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    b151176 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into DEI-49-Select-variables-to-be-included-in-ou… 

    …tputdataset
    @mKlapwijk
    mKlapwijk committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    65dee6a View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Added mapping validation 

    Made some small code improvements
Renamed utls to list_utils
Changed IRule output_variable_name back to string
Moved creation of composite dataset from RuleBasedModel to dataset_utils
    @HiddeElzinga
    HiddeElzinga committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    2903ad7 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Added test for remove_duplicates_from_list

    @HiddeElzinga
    HiddeElzinga committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    cc3cb73 View commit details
    Browse the repository at this point in the history

  2. formatting

    @mKlapwijk
    mKlapwijk committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    88ea44a View commit details
    Browse the repository at this point in the history

  3. Add description of what is returned

    @mKlapwijk
    mKlapwijk committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    cf9dc9e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Add mapping to validation test

    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    2da733c View commit details
    Browse the repository at this point in the history

  2. Move mapping to proper location in test

    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    0ed8ffd View commit details
    Browse the repository at this point in the history

  3. Extend test for duplicate mapping

    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    06b00f2 View commit details
    Browse the repository at this point in the history

  4. Add description of test

    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    fd3d516 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feature/DEI-49-Select-variables-to-be-includ… 

    …ed-in-outputdataset
    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    86d10a3 View commit details
    Browse the repository at this point in the history

  6. Fix test after merge

    @mKlapwijk
    mKlapwijk committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    73cd39d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. DEI-49 Reorder and extend tests for mapping validation

    @mKlapwijk
    mKlapwijk committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    428aa9f View commit details
    Browse the repository at this point in the history

  2. check on dependent variabales and ugrid conventions

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

Commits on Mar 8, 2023

  1. add tests

    @CindyvdVries
    CindyvdVries committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    0aeca74 View commit details
    Browse the repository at this point in the history

  2. fix flake8

    @CindyvdVries
    CindyvdVries committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    5a283ea View commit details
    Browse the repository at this point in the history

  3. Minor changes (typos and a couple of variable type).

    @Davidrag
    Davidrag committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    b3265fe View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Corrections after code review

    @mKlapwijk
    mKlapwijk committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    817bb11 View commit details
    Browse the repository at this point in the history

  2. fix long_name and standard_name

    @CindyvdVries
    CindyvdVries committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    b7caadf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/DEI-49-Select-variables-to-be-included-in-outpu… 

    …tdataset' into feature/DEI-44-ugrid-conventions
    @CindyvdVries
    CindyvdVries committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    1f418af View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Added couple missing tests and fixed typos.

    @Davidrag
    Davidrag committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    e0a38b1 View commit details
    Browse the repository at this point in the history

  2. Fixed Pylance smell.

    @Davidrag
    Davidrag committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    ddf3d13 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/DEI-49-Select-variables-to-be-included-in-outpu… 

    …tdataset' into feature/DEI-44-ugrid-conventions
    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    26e6c73 View commit details
    Browse the repository at this point in the history

  4. Update test_rule_based_model.py

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    db78e76 View commit details
    Browse the repository at this point in the history

  5. Small fixes in review

    @mKlapwijk
    mKlapwijk committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    a8abc8d View commit details
    Browse the repository at this point in the history

  6. copy coords from rule

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    12d883e View commit details
    Browse the repository at this point in the history

  7. Update time_aggregation_rule.py

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    ab0b4f5 View commit details
    Browse the repository at this point in the history

  8. move recursive funciton to dataset_utiils

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    3325039 View commit details
    Browse the repository at this point in the history

  9. fix flake8

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    ee30423 View commit details
    Browse the repository at this point in the history

  10. Update test_dataset_utils.py

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    6184908 View commit details
    Browse the repository at this point in the history

  11. update documentation

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    72ce734 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into feature/DEI-44-ugrid-conventions

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    173dce2 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into feature/DEI-44-ugrid-conventions

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    93eff3f View commit details
    Browse the repository at this point in the history

  14. fix merge provlems

    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    39a1975 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'feature/DEI-44-ugrid-conventions' into feature/DEI-58-n… 

    …ew-time-add-as-coord
    @CindyvdVries
    CindyvdVries committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    264ef33 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. add test

    @CindyvdVries
    CindyvdVries committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    4687a4c View commit details
    Browse the repository at this point in the history

  2. fix flake8

    @CindyvdVries
    CindyvdVries committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    e89513b View commit details
    Browse the repository at this point in the history

  3. Update time_aggregation_rule.py

    @CindyvdVries
    CindyvdVries committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    abd8558 View commit details
    Browse the repository at this point in the history

  4. Update rule_based_model.py

    @CindyvdVries
    CindyvdVries committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    f564d29 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feature/DEI-58-new-time-add-as-coord

    @CindyvdVries
    CindyvdVries committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    77c0640 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. fix test based on review

    @IoannaMi
    IoannaMi committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    11b47fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/DEI-58-new-time-add-as-coord

    @IoannaMi
    IoannaMi committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    4b96052 View commit details
    Browse the repository at this point in the history

  3. fix flake8 error

    @IoannaMi
    IoannaMi committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    461ba6c View commit details
    Browse the repository at this point in the history