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

Fix LISFLOOD Errors when no lakes or reservoirs in the domain. #3

Open
wants to merge 2 commits into
base: seedfd_develop
Choose a base branch
from
Open

Fix LISFLOOD Errors when no lakes or reservoirs in the domain. #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a619186
Adding check for lakes and reservoirs to check method.
Nov 5, 2024
460db2a
Merge branch 'seedfd_develop' into feature/lakes_checks.SEEDFD-26
Feb 12, 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
23 changes: 23 additions & 0 deletions src/lisflood/global_modules/checkers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,31 @@
import inspect
import warnings

import numpy as np

from .errors import LisfloodError, LisfloodWarning
from .add1 import loadmap, loadsetclone
from ..hydrological_modules import HydroModule
from ..hydrological_modules import (surface_routing, evapowater, snow, routing, leafarea, inflow, waterlevel,
waterbalance, wateruse, waterabstraction, lakes, riceirrigation, indicatorcalc,
landusechange, frost, groundwater, miscInitial, soilloop, soil,
reservoir, transmission)


def lakes_present(lake_type):
"""Check whether there are any lakes/reservoirs."""
present = True
sites_dict = {'lakes': 'LakeSites', 'reservoir': 'ReservoirSites'}
MaskMap = loadsetclone('MaskMap') # need to define mask map to use loadmap
LakeSitesC = loadmap(sites_dict[lake_type])
LakeSitesC[LakeSitesC < 1] = 0
LakeSitesCC = np.compress(LakeSitesC > 0, LakeSitesC)
if LakeSitesCC.size == 0:
present = False

return present


class ModulesInputs:
root_package = 'lisflood.hydrological_modules'
# dict representing modules activated per option
Expand Down Expand Up @@ -82,6 +99,12 @@ def check(cls, settings):
and obj is not HydroModule and str(obj.__module__) == hydro_module.__name__]
total_checks += len(clzzs)
for clz in clzzs:
if clz.__name__ in ['lakes', 'reservoir']:
if not lakes_present(clz.__name__):
# No lakes/reservoirs so skip the check for these input files.
successful_checks += 1
continue

errors = clz.check_input_files(option)
successful_checks += int(bool(not errors))
all_errors += errors
Expand Down