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.

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

Hanazaki reservoir routine #178

Merged
merged 14 commits into from
Nov 28, 2024
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -25,3 +25,5 @@ lisflood_model.egg-info
.coverage
*.tox.ini
.vscode/
*.ipynb
.ipynb_checkpoints/
4 changes: 2 additions & 2 deletions src/lisflood/Lisflood_initial.py
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@
from .hydrological_modules.routing import routing
from .hydrological_modules.groundwater import groundwater
from .hydrological_modules.surface_routing import surface_routing
from .hydrological_modules.reservoir import reservoir
from .hydrological_modules.reservoir import Reservoir
from .hydrological_modules.lakes import lakes
from .hydrological_modules.polder import polder
from .hydrological_modules.waterabstraction import waterabstraction
@@ -136,7 +136,7 @@ def __init__(self):
self.routing_module = routing(self)
self.groundwater_module = groundwater(self)
self.surface_routing_module = surface_routing(self)
self.reservoir_module = reservoir(self)
self.reservoir_module = Reservoir(self) # get_reservoir(option['reservoirHanazaki'])
self.lakes_module = lakes(self)
self.polder_module = polder(self)
self.waterabstraction_module = waterabstraction(self)
476 changes: 248 additions & 228 deletions src/lisflood/hydrological_modules/reservoir.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/lisflood/hydrological_modules/routing.py
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import numpy as np

from .lakes import lakes
from .reservoir import reservoir
from .reservoir import Reservoir
from .polder import polder
from .inflow import inflow
from .transmission import transmission
@@ -51,7 +51,7 @@ def __init__(self, routing_variable):
self.var = routing_variable

self.lakes_module = lakes(self.var)
self.reservoir_module = reservoir(self.var)
self.reservoir_module = Reservoir(self.var)
self.polder_module = polder(self.var)
self.inflow_module = inflow(self.var)
self.transmission_module = transmission(self.var)
Loading
Loading