From 548929e3b59c393aff3a4dbc99990522d1e165b5 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Thu, 15 Feb 2024 22:08:41 +0100 Subject: [PATCH] Don't add `Basin / static` if there are no flows --- docs/python/examples.ipynb | 42 +------ .../ribasim_testmodels/allocation.py | 109 +----------------- .../ribasim_testmodels/backwater.py | 12 +- .../ribasim_testmodels/basic.py | 20 +--- .../ribasim_testmodels/discrete_control.py | 43 +------ .../ribasim_testmodels/dutch_waterways.py | 13 +-- .../ribasim_testmodels/equations.py | 65 +---------- .../ribasim_testmodels/invalid.py | 52 +-------- .../ribasim_testmodels/pid_control.py | 26 +---- .../ribasim_testmodels/time.py | 13 +-- .../ribasim_testmodels/trivial.py | 3 - .../ribasim_testmodels/two_basin.py | 12 +- 12 files changed, 28 insertions(+), 382 deletions(-) diff --git a/docs/python/examples.ipynb b/docs/python/examples.ipynb index 13097eada..ea59a0afe 100644 --- a/docs/python/examples.ipynb +++ b/docs/python/examples.ipynb @@ -75,11 +75,8 @@ "static = pd.DataFrame(\n", " data={\n", " \"node_id\": [0],\n", - " \"drainage\": [0.0],\n", " \"potential_evaporation\": [evaporation],\n", - " \"infiltration\": [0.0],\n", " \"precipitation\": [precipitation],\n", - " \"urban_runoff\": [0.0],\n", " }\n", ")\n", "static = static.iloc[[0, 0, 0, 0]]\n", @@ -736,20 +733,9 @@ " }\n", ")\n", "\n", - "static = pd.DataFrame(\n", - " data={\n", - " \"node_id\": [1],\n", - " \"drainage\": [0.0],\n", - " \"potential_evaporation\": [0.0],\n", - " \"infiltration\": [0.0],\n", - " \"precipitation\": [0.0],\n", - " \"urban_runoff\": [0.0],\n", - " }\n", - ")\n", - "\n", "state = pd.DataFrame(data={\"node_id\": [1], \"level\": [20.0]})\n", "\n", - "basin = ribasim.Basin(profile=profile, static=static, state=state)" + "basin = ribasim.Basin(profile=profile, state=state)" ] }, { @@ -1162,17 +1148,6 @@ " data={\"node_id\": [2, 2], \"level\": [0.0, 1.0], \"area\": [1000.0, 1000.0]}\n", ")\n", "\n", - "static = pd.DataFrame(\n", - " data={\n", - " \"node_id\": [2],\n", - " \"drainage\": [0.0],\n", - " \"potential_evaporation\": [0.0],\n", - " \"infiltration\": [0.0],\n", - " \"precipitation\": [0.0],\n", - " \"urban_runoff\": [0.0],\n", - " }\n", - ")\n", - "\n", "state = pd.DataFrame(\n", " data={\n", " \"node_id\": [2],\n", @@ -1180,7 +1155,7 @@ " }\n", ")\n", "\n", - "basin = ribasim.Basin(profile=profile, static=static, state=state)" + "basin = ribasim.Basin(profile=profile, state=state)" ] }, { @@ -1553,20 +1528,9 @@ " }\n", ")\n", "\n", - "static = pd.DataFrame(\n", - " data={\n", - " \"node_id\": [2, 5, 12],\n", - " \"drainage\": 0.0,\n", - " \"potential_evaporation\": 0.0,\n", - " \"infiltration\": 0.0,\n", - " \"precipitation\": 0.0,\n", - " \"urban_runoff\": 0.0,\n", - " }\n", - ")\n", - "\n", "state = pd.DataFrame(data={\"node_id\": [2, 5, 12], \"level\": 1.0})\n", "\n", - "basin = ribasim.Basin(profile=profile, static=static, state=state)" + "basin = ribasim.Basin(profile=profile, state=state)" ] }, { diff --git a/python/ribasim_testmodels/ribasim_testmodels/allocation.py b/python/ribasim_testmodels/ribasim_testmodels/allocation.py index a0bfa342d..16598d1ab 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/allocation.py +++ b/python/ribasim_testmodels/ribasim_testmodels/allocation.py @@ -55,20 +55,9 @@ def user_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [1], "level": 1.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the users: user = ribasim.User( @@ -199,20 +188,9 @@ def subnetwork_model(): data={"node_id": [2, 2, 6, 6, 8, 8], "area": 100000.0, "level": 3 * [0.0, 1.0]} ) - static = pd.DataFrame( - data={ - "node_id": [2, 6, 8], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [2, 6, 8], "level": 10.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the flow boundary: flow_boundary = ribasim.FlowBoundary( @@ -450,20 +428,9 @@ def looped_subnetwork_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2, 7, 11, 9, 15, 17, 21], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [2, 7, 9, 11, 15, 17, 21], "level": 1.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the flow boundary: flow_boundary = ribasim.FlowBoundary( @@ -601,20 +568,9 @@ def minimal_subnetwork_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2, 4], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [2, 4], "level": 1.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the flow boundary: flow_boundary = ribasim.FlowBoundary( @@ -758,20 +714,9 @@ def fractional_flow_subnetwork_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2, 5, 8], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [2, 5, 8], "level": 1.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the flow boundary: flow_boundary = ribasim.FlowBoundary( @@ -954,20 +899,9 @@ def allocation_example_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2, 5, 12], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [2, 5, 12], "level": 1.0}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) flow_boundary = ribasim.FlowBoundary( static=pd.DataFrame( @@ -1514,36 +1448,6 @@ def main_network_with_subnetworks_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [ - 2, - 4, - 6, - 8, - 10, - 12, - 16, - 18, - 25, - 28, - 31, - 35, - 40, - 44, - 42, - 48, - 50, - 54, - ], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame( data={ "node_id": [ @@ -1591,7 +1495,6 @@ def main_network_with_subnetworks_model(): basin = ribasim.Basin( profile=profile, - static=static, state=state, ) diff --git a/python/ribasim_testmodels/ribasim_testmodels/backwater.py b/python/ribasim_testmodels/ribasim_testmodels/backwater.py index ea90ad597..96cb497e6 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/backwater.py +++ b/python/ribasim_testmodels/ribasim_testmodels/backwater.py @@ -60,18 +60,8 @@ def backwater_model(): "level": [0.0, 1.0] * n_basin, } ) - static = pd.DataFrame( - data={ - "node_id": basin_ids, - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) state = pd.DataFrame(data={"node_id": basin_ids, "level": 0.05}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) manning_resistance = ribasim.ManningResistance( static=pd.DataFrame( diff --git a/python/ribasim_testmodels/ribasim_testmodels/basic.py b/python/ribasim_testmodels/ribasim_testmodels/basic.py index 179d03a65..e912f68aa 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/basic.py +++ b/python/ribasim_testmodels/ribasim_testmodels/basic.py @@ -27,11 +27,8 @@ def basic_model() -> ribasim.Model: static = pd.DataFrame( data={ "node_id": [0], - "drainage": [0.0], "potential_evaporation": [evaporation], - "infiltration": [0.0], "precipitation": [precipitation], - "urban_runoff": [0.0], } ) static = static.iloc[[0, 0, 0, 0]] @@ -307,11 +304,7 @@ def tabulated_rating_curve_model() -> ribasim.Model: static = pd.DataFrame( data={ "node_id": [1, 4], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, "precipitation": [precipitation, 0.0], - "urban_runoff": 0.0, } ) state = pd.DataFrame( @@ -451,20 +444,9 @@ def outlet_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [3], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, - "precipitation": 0.0, - "urban_runoff": 0.0, - } - ) - state = pd.DataFrame(data={"node_id": [3], "level": 1e-3}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the level boundary: level_boundary = ribasim.LevelBoundary( diff --git a/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py b/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py index a1bb7f88c..324e34949 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py +++ b/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py @@ -67,20 +67,9 @@ def pump_discrete_control_model() -> ribasim.Model: } ) - static = pd.DataFrame( - data={ - "node_id": [1, 3], - "drainage": [0.0] * 2, - "potential_evaporation": [0.0] * 2, - "infiltration": [0.0] * 2, - "precipitation": [0.0] * 2, - "urban_runoff": [0.0] * 2, - } - ) - state = pd.DataFrame(data={"node_id": [1, 3], "level": [1.0, 1e-5]}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the discrete control: condition = pd.DataFrame( @@ -206,20 +195,9 @@ def flow_condition_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame(data={"node_id": [2], "level": [2.5]}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: pump = ribasim.Pump( @@ -503,11 +481,7 @@ def tabulated_rating_curve_control_model() -> ribasim.Model: static = pd.DataFrame( data={ "node_id": [1], - "drainage": 0.0, - "potential_evaporation": 0.0, - "infiltration": 0.0, "precipitation": precipitation, - "urban_runoff": 0.0, } ) @@ -631,20 +605,9 @@ def level_setpoint_with_minmax_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame(data={"node_id": [1], "level": [20.0]}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump pump = ribasim.Pump( diff --git a/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py b/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py index 4920369f5..345aeecb0 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py +++ b/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py @@ -61,22 +61,11 @@ def dutch_waterways_model(): } ) - static = pd.DataFrame( - data={ - "node_id": basin_node_ids, - "drainage": n_basins * [0.0], - "potential_evaporation": n_basins * [0.0], - "infiltration": n_basins * [0.0], - "precipitation": n_basins * [0.0], - "urban_runoff": n_basins * [0.0], - } - ) - state = pd.DataFrame( data={"node_id": basin_node_ids, "level": [8.31, 7.5, 7.5, 7.0, 6.0, 5.5]} ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup linear resistance: linear_resistance = ribasim.LinearResistance( diff --git a/python/ribasim_testmodels/ribasim_testmodels/equations.py b/python/ribasim_testmodels/ribasim_testmodels/equations.py index a801c7684..978199493 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/equations.py +++ b/python/ribasim_testmodels/ribasim_testmodels/equations.py @@ -54,17 +54,6 @@ def linear_resistance_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1], @@ -72,7 +61,7 @@ def linear_resistance_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # setup linear resistance: linear_resistance = ribasim.LinearResistance( @@ -152,17 +141,6 @@ def rating_curve_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1], @@ -170,7 +148,7 @@ def rating_curve_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the rating curve n_datapoints = 100 @@ -261,17 +239,6 @@ def manning_resistance_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1, 3], - "drainage": 2 * [0.0], - "potential_evaporation": 2 * [0.0], - "infiltration": 2 * [0.0], - "precipitation": 2 * [0.0], - "urban_runoff": 2 * [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1, 3], @@ -279,7 +246,7 @@ def manning_resistance_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup the Manning resistance: manning_resistance = ribasim.ManningResistance( @@ -367,17 +334,6 @@ def misc_nodes_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [3, 5], - "drainage": 2 * [0.0], - "potential_evaporation": 2 * [0.0], - "infiltration": 2 * [0.0], - "precipitation": 2 * [0.0], - "urban_runoff": 2 * [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [3, 5], @@ -385,7 +341,7 @@ def misc_nodes_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup flow boundary: flow_boundary = ribasim.FlowBoundary( @@ -499,17 +455,6 @@ def pid_control_equation_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1], @@ -517,7 +462,7 @@ def pid_control_equation_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: pump = ribasim.Pump( diff --git a/python/ribasim_testmodels/ribasim_testmodels/invalid.py b/python/ribasim_testmodels/ribasim_testmodels/invalid.py index 5591df6be..4f71310a9 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/invalid.py +++ b/python/ribasim_testmodels/ribasim_testmodels/invalid.py @@ -50,20 +50,9 @@ def invalid_qh_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [3], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame(data={"node_id": [3], "level": 1.4112729908597084}) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) rating_curve_static = pd.DataFrame( # Invalid: levels must not be repeated @@ -162,17 +151,6 @@ def invalid_fractional_flow_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1, 2], - "drainage": 2 * [0.0], - "potential_evaporation": 2 * [0.0], - "infiltration": 2 * [0.0], - "precipitation": 2 * [0.0], - "urban_runoff": 2 * [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1, 2], @@ -180,7 +158,7 @@ def invalid_fractional_flow_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup terminal: terminal = ribasim.Terminal(static=pd.DataFrame(data={"node_id": [5, 6]})) @@ -261,17 +239,6 @@ def invalid_discrete_control_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1, 3], - "drainage": 2 * [0.0], - "potential_evaporation": 2 * [0.0], - "infiltration": 2 * [0.0], - "precipitation": 2 * [0.0], - "urban_runoff": 2 * [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1, 3], @@ -279,7 +246,7 @@ def invalid_discrete_control_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: pump = ribasim.Pump( @@ -396,17 +363,6 @@ def invalid_edge_types_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [1, 3], - "drainage": 2 * [0.0], - "potential_evaporation": 2 * [0.0], - "infiltration": 2 * [0.0], - "precipitation": 2 * [0.0], - "urban_runoff": 2 * [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [1, 3], @@ -414,7 +370,7 @@ def invalid_edge_types_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: pump = ribasim.Pump( diff --git a/python/ribasim_testmodels/ribasim_testmodels/pid_control.py b/python/ribasim_testmodels/ribasim_testmodels/pid_control.py index 095f506dd..a14385c78 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/pid_control.py +++ b/python/ribasim_testmodels/ribasim_testmodels/pid_control.py @@ -63,17 +63,6 @@ def pid_control_model(): data={"node_id": [2, 2], "level": [0.0, 1.0], "area": [1000.0, 1000.0]} ) - static = pd.DataFrame( - data={ - "node_id": [2], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [2], @@ -81,7 +70,7 @@ def pid_control_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: pump = ribasim.Pump( @@ -216,17 +205,6 @@ def discrete_control_of_pid_control_model(): data={"node_id": [3, 3], "level": [0.0, 1.0], "area": [1000.0, 1000.0]} ) - static = pd.DataFrame( - data={ - "node_id": [3], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [3], @@ -234,7 +212,7 @@ def discrete_control_of_pid_control_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) # Setup pump: outlet = ribasim.Outlet( diff --git a/python/ribasim_testmodels/ribasim_testmodels/time.py b/python/ribasim_testmodels/ribasim_testmodels/time.py index 42a0bdd6a..212ca63f1 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/time.py +++ b/python/ribasim_testmodels/ribasim_testmodels/time.py @@ -55,17 +55,6 @@ def flow_boundary_time_model(): } ) - static = pd.DataFrame( - data={ - "node_id": [2], - "drainage": [0.0], - "potential_evaporation": [0.0], - "infiltration": [0.0], - "precipitation": [0.0], - "urban_runoff": [0.0], - } - ) - state = pd.DataFrame( data={ "node_id": [2], @@ -73,7 +62,7 @@ def flow_boundary_time_model(): } ) - basin = ribasim.Basin(profile=profile, static=static, state=state) + basin = ribasim.Basin(profile=profile, state=state) n_times = 100 time = pd.date_range( diff --git a/python/ribasim_testmodels/ribasim_testmodels/trivial.py b/python/ribasim_testmodels/ribasim_testmodels/trivial.py index 4cca5a8a4..3f22685a1 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/trivial.py +++ b/python/ribasim_testmodels/ribasim_testmodels/trivial.py @@ -66,11 +66,8 @@ def trivial_model() -> ribasim.Model: static = pd.DataFrame( data={ "node_id": [6], - "drainage": [0.0], "potential_evaporation": [evaporation], - "infiltration": [0.0], "precipitation": [precipitation], - "urban_runoff": [0.0], } ) diff --git a/python/ribasim_testmodels/ribasim_testmodels/two_basin.py b/python/ribasim_testmodels/ribasim_testmodels/two_basin.py index afd3e8842..da4705402 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/two_basin.py +++ b/python/ribasim_testmodels/ribasim_testmodels/two_basin.py @@ -42,16 +42,6 @@ def two_basin_model() -> ribasim.Model: } ) state = pd.DataFrame(data={"node_id": [2, 3], "level": [0.01, 0.01]}) - static = pd.DataFrame( - data={ - "node_id": [2, 3], - "drainage": [0.0, 0.0], - "potential_evaporation": [0.0, 0.0], - "infiltration": [0.0, 0.0], - "precipitation": [0.0, 0.0], - "urban_runoff": [0.0, 0.0], - } - ) subgrid = pd.DataFrame( data={ "node_id": [2, 2, 3, 3], @@ -62,7 +52,7 @@ def two_basin_model() -> ribasim.Model: "meta_y": [0.0, 0.0, 0.0, 0.0], } ) - basin = ribasim.Basin(profile=profile, state=state, static=static, subgrid=subgrid) + basin = ribasim.Basin(profile=profile, state=state, subgrid=subgrid) rating_curve = ribasim.TabulatedRatingCurve( static=pd.DataFrame(