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

Test ribasim integration #334

Merged
merged 14 commits into from
Oct 11, 2024
Merged

Test ribasim integration #334

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
47caff8
avoid setting Ribasim's integrated volumes to zero in the coupler
rleander Oct 1, 2024
0dceb03
update test script
rleander Oct 2, 2024
d22479c
linter + changed use of ribasim user_realized array
rleander Oct 3, 2024
3d33ce0
remove test script from this branch before merging
rleander Oct 3, 2024
66e3723
making member names consistent with the corresponding labels in the R…
rleander Oct 3, 2024
9f31a9c
Set time-out to 1.5 hour
rleander Oct 4, 2024
debee94
changed solver algorithm in ribasim to Rodas5p
rleander Oct 4, 2024
88fe3b4
temporary use another build of ribasim windows with the specific bran…
rleander Oct 4, 2024
62e9dc9
user_realized from ribasiim not reduced by the previous value, not co…
rleander Oct 4, 2024
24fe2ec
extended the allowed run time to 2 hours to avoid timeout
rleander Oct 4, 2024
ffa9738
Ribasim user_realized (ribasim.user_demand.inflow) no longer set to z…
rleander Oct 8, 2024
307158e
rename label of user_demand.inflow, set time-out back to 1hr default …
rleander Oct 8, 2024
7e98944
Linter replaced single quotes around QNDF
rleander Oct 8, 2024
ee40fdb
extend timeout again
rleander Oct 9, 2024
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
32 changes: 25 additions & 7 deletions imod_coupler/drivers/ribametamod/ribametamod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ class RibaMetaMod(Driver):
ribasim_level: NDArray[Any]
ribasim_infiltration: NDArray[Any]
ribasim_drainage: NDArray[Any]
ribasim_infiltration_save: NDArray[Any]
ribasim_drainage_save: NDArray[Any]
ribasim_volume: NDArray[Any]
ribasim_user_demand: NDArray[Any]
ribasim_user_realized: NDArray[Any]
ribasim_user_realized_save: NDArray[Any]

# MetaSWAP variables
mf6_sprinkling_wells: NDArray[Any] # the well data for coupled extractions
Expand Down Expand Up @@ -197,18 +200,23 @@ def couple_ribasim(self, mf6_flowmodel_key: str) -> ChainMap[str, Any]:
# Get all Ribasim pointers, relevant for coupling with MODFLOW 6
self.ribasim_infiltration = self.ribasim.get_value_ptr("basin.infiltration")
self.ribasim_drainage = self.ribasim.get_value_ptr("basin.drainage")
self.ribasim_infiltration_sum = self.ribasim.get_value_ptr(
self.ribasim_cumulative_infiltration = self.ribasim.get_value_ptr(
"basin.cumulative_infiltration"
)
self.ribasim_drainage_sum = self.ribasim.get_value_ptr(
self.ribasim_infiltration_save = np.empty_like(
self.ribasim_cumulative_infiltration
)
self.ribasim_cumulative_drainage = self.ribasim.get_value_ptr(
"basin.cumulative_drainage"
)
self.ribasim_drainage_save = np.empty_like(self.ribasim_cumulative_drainage)
self.ribasim_level = self.ribasim.get_value_ptr("basin.level")
self.ribasim_storage = self.ribasim.get_value_ptr("basin.storage")
self.ribasim_user_demand = self.ribasim.get_value_ptr("user_demand.demand")
self.ribasim_user_realized = self.ribasim.get_value_ptr(
"user_demand.inflow"
)
self.ribasim_user_realized_save = np.empty_like(self.ribasim_user_realized)
self.subgrid_level = self.ribasim.get_value_ptr("basin.subgrid_level")

# add to return ChainMap
Expand Down Expand Up @@ -399,8 +407,13 @@ def update(self) -> None:
self.update_ribasim_metaswap()
else:
self.update_ribasim()

self.exchange.flux_to_modflow(
(self.ribasim_drainage_sum - self.ribasim_infiltration_sum),
(self.ribasim_cumulative_drainage[:] - self.ribasim_drainage_save[:])
- (
self.ribasim_cumulative_infiltration[:]
- self.ribasim_infiltration_save[:]
),
self.delt_gw,
)
self.exchange.log_demands(self.get_current_time())
Expand Down Expand Up @@ -464,8 +477,8 @@ def exchange_rib2mod(self) -> None:
def exchange_mod2rib(self) -> None:
self.exchange.add_flux_estimate_mod(self.mf6_head, self.delt_gw)
# reset Ribasim pointers
self.ribasim_infiltration_sum[:] = 0.0
self.ribasim_drainage_sum[:] = 0.0
self.ribasim_infiltration_save[:] = self.ribasim_cumulative_infiltration[:]
self.ribasim_drainage_save[:] = self.ribasim_cumulative_drainage[:]

def exchange_sprinkling_demand_msw2rib(self) -> None:
# flux demand from metaswap sprinkling to Ribasim (demand)
Expand Down Expand Up @@ -494,7 +507,10 @@ def exchange_sprinkling_flux_realised_msw2rib(self) -> None:

self.realised_fractions_swspr[:] = 1.0 # all realized for non-coupled svats
self.realised_fractions_swspr[nonzero_user_indices] = (
self.ribasim_user_realized[nonzero_user_indices]
(
self.ribasim_user_realized[nonzero_user_indices]
- self.ribasim_user_realized_save[nonzero_user_indices]
)
/ (self.delt_sw * day_to_seconds)
) / self.mapped_sprinkling_demand[nonzero_user_indices]

Expand All @@ -504,7 +520,9 @@ def exchange_sprinkling_flux_realised_msw2rib(self) -> None:
msw_sprinkling_realized[:] = (
self.msw.get_surfacewater_sprinking_demand_ptr() * msw_sprfrac_realised
)[:]
self.ribasim_user_realized[:] = 0.0 # reset cummulative for the next timestep
self.ribasim_user_realized_save[:] = self.ribasim_user_realized[
:
] # keep old values
self.exchange_logger.log_exchange(
("sprinkling_realized"),
msw_sprinkling_realized,
Expand Down