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

Rws network #67

Merged
merged 53 commits into from
Feb 26, 2024
Merged

Rws network #67

merged 53 commits into from
Feb 26, 2024

Commits on Nov 20, 2023

  1. addes network-class

    @DanielTollenaar
    DanielTollenaar committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0571783 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. added snapping within tolerance

    @DanielTollenaar
    DanielTollenaar committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    743b0c2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into network-class

    @DanielTollenaar
    DanielTollenaar committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    b40aa21 View commit details
    Browse the repository at this point in the history

  3. Update network.py

    @DanielTollenaar
    DanielTollenaar committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    9e8e4ee View commit details
    Browse the repository at this point in the history

  4. fix tests 

    - fix bug in network.py
- speed-up tests by using 'secret' pytest directory
    @DanielTollenaar
    DanielTollenaar committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    50a0701 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. updated network-class

    @DanielTollenaar
    DanielTollenaar committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8cbfb55 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Create kunstwerken.py

    @ngoorden
    ngoorden committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    433e1b3 View commit details
    Browse the repository at this point in the history

  2. commit

    @ngoorden
    ngoorden committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    4eaaefb View commit details
    Browse the repository at this point in the history

  3. Update kunstwerken.py

    @ngoorden
    ngoorden committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    a96cae0 View commit details
    Browse the repository at this point in the history

  4. Update network.py

    @DanielTollenaar
    DanielTollenaar committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    26c15dd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'RWS-network' of https://github.com/Deltares/Ribasim-NL … 

    …into RWS-network
    @DanielTollenaar
    DanielTollenaar committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    2b34308 View commit details
    Browse the repository at this point in the history

  6. major improvements to network class

    @DanielTollenaar
    DanielTollenaar committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    eab038e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Update kunstwerken.py

    @ngoorden
    ngoorden committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7880124 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'RWS-network' of https://github.com/Deltares/Ribasim-NL … 

    …into RWS-network
    @ngoorden
    ngoorden committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    f2772cb View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. netwerk

    @DanielTollenaar
    DanielTollenaar committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    eecfed2 View commit details
    Browse the repository at this point in the history

  2. sample raster

    @DanielTollenaar
    DanielTollenaar committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    29a2b99 View commit details
    Browse the repository at this point in the history

  3. Update netwerk_2.py

    @ngoorden
    ngoorden committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c6d33d5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'RWS-network' of https://github.com/Deltares/Ribasim-NL … 

    …into RWS-network
    @ngoorden
    ngoorden committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    1375fbd View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. network2 and create raster

    @DanielTollenaar
    DanielTollenaar committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    9ef9188 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. commit

    @ngoorden
    ngoorden committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3e46fca View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. misc changes

    @DanielTollenaar
    DanielTollenaar committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    7f0162b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into RWS-network

    @DanielTollenaar
    DanielTollenaar committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    a144ce8 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. driel

    @DanielTollenaar
    DanielTollenaar committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    423867e View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. merge_models

    @DanielTollenaar
    DanielTollenaar committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    0968d9f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Update kunstwerk.py

    @ngoorden
    ngoorden committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    33d4add View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Update kunstwerk.py

    @DanielTollenaar
    DanielTollenaar committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1678d1d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into RWS-network

    @DanielTollenaar
    DanielTollenaar committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    aa3dce1 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Update kunstwerk.py

    @ngoorden
    ngoorden committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    8d73fa8 View commit details
    Browse the repository at this point in the history

  2. Update kunstwerk.py

    @DanielTollenaar
    DanielTollenaar committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    57430bb View commit details
    Browse the repository at this point in the history

  3. Update netwerk.py

    @ngoorden
    ngoorden committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    468c727 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'RWS-network' of https://github.com/Deltares/Ribasim-NL … 

    …into RWS-network
    @ngoorden
    ngoorden committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    e92e060 View commit details
    Browse the repository at this point in the history

  5. Update netwerk.py

    @DanielTollenaar
    DanielTollenaar committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    589a321 View commit details
    Browse the repository at this point in the history

  6. updated Network & reset index

    @DanielTollenaar
    DanielTollenaar committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    4d1d2c0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. misc changes

    @DanielTollenaar
    DanielTollenaar committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    ccb7e6c View commit details
    Browse the repository at this point in the history

  2. Create concat.py

    @DanielTollenaar
    DanielTollenaar committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    4fd4843 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. verdeelsleutels

    @DanielTollenaar
    DanielTollenaar committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    8a55e63 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Update kunstwerk.py

    @ngoorden
    ngoorden committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    96cf0f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. working concat and more

    @DanielTollenaar
    DanielTollenaar committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    bbd643c View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Update samenvoegen_modellen.py

    @DanielTollenaar
    DanielTollenaar committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    5ea3eac View commit details
    Browse the repository at this point in the history

  2. areas and hydroobjects

    @DanielTollenaar
    DanielTollenaar committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e6340fe View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. reogranized rws procssing-scripts

    @DanielTollenaar
    DanielTollenaar committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1262ebd View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Update .vscode/settings.json 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    58fa64b View commit details
    Browse the repository at this point in the history

  2. Update src/ribasim_nl/ribasim_nl/discrete_control.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a450ebc View commit details
    Browse the repository at this point in the history

  3. Update src/ribasim_nl/ribasim_nl/geodataframe.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    ab4e5ac View commit details
    Browse the repository at this point in the history

  4. Update geodataframe.py

    @DanielTollenaar
    DanielTollenaar committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    6f518e7 View commit details
    Browse the repository at this point in the history

  5. Update src/ribasim_nl/ribasim_nl/model.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    1206c7c View commit details
    Browse the repository at this point in the history

  6. Update src/ribasim_nl/ribasim_nl/verdeelsleutels.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    3ef9a16 View commit details
    Browse the repository at this point in the history

  7. Update src/ribasim_nl/ribasim_nl/network.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    90ec9dd View commit details
    Browse the repository at this point in the history

  8. Update src/ribasim_nl/ribasim_nl/network.py 

    Co-authored-by: Martijn Visser <[email protected]>
    @visr
    D2Hydro and visr authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a1d3257 View commit details
    Browse the repository at this point in the history

  9. removed # %%

    @DanielTollenaar
    DanielTollenaar committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    361c74a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'RWS-network' of https://github.com/Deltares/Ribasim-NL … 

    …into RWS-network
    @DanielTollenaar
    DanielTollenaar committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9553e47 View commit details
    Browse the repository at this point in the history

  11. Update 1_create_bathymetrie.py

    @DanielTollenaar
    DanielTollenaar committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    28b55c8 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into RWS-network

    @DanielTollenaar
    DanielTollenaar committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    aef657c View commit details
    Browse the repository at this point in the history