Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
49b707b
initial commit of flushing implementation
guydup Aug 11, 2025
2745373
Update assign_flushing.py
guydup Aug 11, 2025
00781f1
return partial solutions
guydup Aug 15, 2025
b8074bf
use results from expanded search only if more basins are covered
guydup Aug 15, 2025
468c116
dissolveinput flushing geometries by id and value
guydup Aug 15, 2025
ca8694a
less liberal buffer
guydup Aug 15, 2025
4bb4e3a
formatting changes
guydup Aug 15, 2025
c9dd4a9
correct ordering
guydup Aug 15, 2025
acb39b0
pre-commit
guydup Aug 15, 2025
06b27a5
add metadata
guydup Aug 18, 2025
1707fd1
improve performance of _find_upstream_nodes
guydup Aug 18, 2025
6ab61c8
Improve performance of _all_upstream_paths
guydup Aug 18, 2025
375733a
cache predecessors
guydup Aug 19, 2025
8a6853f
Updated control link check
guydup Aug 19, 2025
ef2bf09
Merge branch 'main' into flushing
guydup Aug 19, 2025
cb89c33
pre-commit
guydup Aug 19, 2025
1187301
Merge branch 'main' into flushing
guydup Aug 19, 2025
aaad854
improve partial solution and performance on large nodesets
guydup Aug 19, 2025
419adfe
Merge branch 'main' into flushing
guydup Aug 19, 2025
9da5be9
debug output
guydup Aug 20, 2025
4ee04eb
configurable offset
guydup Aug 20, 2025
1aa1035
remove slow, exact code
guydup Aug 20, 2025
4fa4713
add a default hardcoded demand priority
guydup Aug 21, 2025
4d6daa5
add flushing to the remaining water boards
guydup Aug 21, 2025
c6664bf
pre-commit
guydup Aug 21, 2025
41c5283
Merge branch 'main' into flushing
guydup Aug 21, 2025
a9f283e
set crs explicitly to avoid flood of crs warnings
guydup Aug 22, 2025
f6b1866
align metadata join char
guydup Aug 22, 2025
d9d0ffe
Merge branch 'main' into flushing
guydup Aug 22, 2025
6383057
Merge branch 'main' into flushing
guydup Aug 25, 2025
6e6cd21
use the union of all matching basins and the flushing geometry for th…
guydup Aug 27, 2025
d6f4efb
ignore outlets/pumps in a cycle
guydup Aug 27, 2025
a505d2e
Merge branch 'main' into flushing
guydup Aug 27, 2025
5f927be
fix metacolumn name
guydup Aug 28, 2025
043ebd1
Update assign_parametrization.py
guydup Sep 2, 2025
015072e
Pixi to dev-settings.
Sep 5, 2025
1798c50
Merging main.
Sep 8, 2025
c7b002a
Merge branch 'flushing' of https://github.com/Deltares/Ribasim-NL int…
Sep 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ quarto = "*"
quartodoc = "*"
rasterstats = "*"
requests = "*"
ribasim = "==2025.4.0"
ruff = "*"
seaborn = "*"
shapely = ">=2"
Expand All @@ -82,3 +81,4 @@ bokeh_helpers = { path = "src/bokeh_helpers", editable = true }
hydamo = { path = "src/hydamo", editable = true }
peilbeheerst_model = { path = "src/peilbeheerst_model", editable = true }
ribasim_nl = { path = "src/ribasim_nl", editable = true }
ribasim = { git = "https://github.com/Deltares/Ribasim.git", branch = "main", subdirectory = "python/ribasim" }
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# check basin area
ribasim_param.validate_basin_area(ribasim_model)
Expand Down
6 changes: 6 additions & 0 deletions src/peilbeheerst_model/Parametrize/Delfland_parametrize.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import peilbeheerst_model.ribasim_parametrization as ribasim_param
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -114,6 +115,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# check basin area
ribasim_param.validate_basin_area(ribasim_model)
Expand Down Expand Up @@ -338,6 +340,10 @@
)
ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import peilbeheerst_model.ribasim_parametrization as ribasim_param
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -111,6 +112,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# check basin area
ribasim_param.validate_basin_area(ribasim_model)
Expand Down Expand Up @@ -369,6 +371,10 @@
)
ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import peilbeheerst_model.ribasim_parametrization as ribasim_param
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -112,6 +113,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# model specific tweaks
# merge small basins into larger basins for numerical stability
Expand Down Expand Up @@ -738,6 +740,10 @@
ribasim_model.basin.time.df.precipitation /= meteo_factor # decrease meteo
ribasim_model.basin.time.df.potential_evaporation /= meteo_factor # decrease meteo

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
ribasim_model.use_validation = True
ribasim_model.starttime = starttime
Expand Down
6 changes: 6 additions & 0 deletions src/peilbeheerst_model/Parametrize/Rijnland_parametrize.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from peilbeheerst_model import supply
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -110,6 +111,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

inlaat_pump = []

Expand Down Expand Up @@ -302,6 +304,10 @@

ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import peilbeheerst_model.ribasim_parametrization as ribasim_param
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -110,6 +111,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# check basin area
ribasim_param.validate_basin_area(ribasim_model)
Expand Down Expand Up @@ -467,6 +469,10 @@
)
ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import peilbeheerst_model.ribasim_parametrization as ribasim_param
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -109,6 +110,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# check basin area
ribasim_param.validate_basin_area(ribasim_model)
Expand Down Expand Up @@ -325,6 +327,9 @@
)
ribasim_model = assign.assign_authorities()

flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from peilbeheerst_model import supply
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -113,6 +114,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# model specific tweaks
# change unknown streefpeilen to a default streefpeil
Expand Down Expand Up @@ -450,6 +452,10 @@
)
ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# set numerical settings
# write model output
ribasim_model.use_validation = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from peilbeheerst_model import supply
from peilbeheerst_model.add_storage_basins import AddStorageBasins
from peilbeheerst_model.assign_authorities import AssignAuthorities
from peilbeheerst_model.assign_flushing import Flushing
from peilbeheerst_model.assign_parametrization import AssignMetaData
from peilbeheerst_model.controle_output import Control
from peilbeheerst_model.ribasim_feedback_processor import RibasimFeedbackProcessor
Expand Down Expand Up @@ -111,6 +112,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# Uitlaat toevoegen at Ter Schelling
level_boundary_node = ribasim_model.level_boundary.add(
Expand Down Expand Up @@ -580,6 +582,10 @@
)
ribasim_model = assign.assign_authorities()

# Add flushing data
flush = Flushing(ribasim_model)
flush.add_flushing()

# TEMP CHANGES! VERY IMPORTANT TO REMOVE THIS AFTERWARDS! #@TODO ##################################
reduce_computation_time = False
if reduce_computation_time:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
with warnings.catch_warnings():
warnings.simplefilter(action="ignore", category=FutureWarning)
ribasim_model = Model(filepath=ribasim_work_dir_model_toml)
ribasim_model.set_crs("EPSG:28992")

# merge the smallest basins together
ribasim_model.merge_basins(node_id=30, to_node_id=29) # 4363 m2
Expand Down
Loading
Loading