diff --git a/src/lisflood/global_modules/default_options.py b/src/lisflood/global_modules/default_options.py
index 16a7fcf4..12a35714 100644
--- a/src/lisflood/global_modules/default_options.py
+++ b/src/lisflood/global_modules/default_options.py
@@ -55,6 +55,7 @@
'repMBTs': False,
'repTotalWaterStorageMaps': False,
'repMeteoUpsGauges': False,
+ 'repOverlandFlowMaps': False,
'repPFMaps': False,
'repPFSites': False,
'repPFUpsGauges': False,
@@ -617,7 +618,7 @@
yearly=False),
'OFDirectMaps': ReportedMap(name='OFDirectMaps', output_var='OFM3Direct',
unit='m3', end=[], steps=[],
- all=[],
+ all=['repOverlandFlowMaps'],
restrictoption=['nonInit'], monthly=False,
yearly=False),
'OFDirectState': ReportedMap(name='OFDirectState', output_var='OFM3Direct',
@@ -630,7 +631,7 @@
yearly=False),
'OFForestMaps': ReportedMap(name='OFForestMaps', output_var='OFM3Forest',
unit='m3', end=[], steps=[],
- all=[],
+ all=['repOverlandFlowMaps'],
restrictoption=['nonInit'], monthly=False,
yearly=False),
'OFForestState': ReportedMap(name='OFForestState', output_var='OFM3Forest',
@@ -643,7 +644,7 @@
yearly=False),
'OFOtherMaps': ReportedMap(name='OFOtherMaps', output_var='OFM3Other',
unit='m3', end=[], steps=[],
- all=[], restrictoption=['nonInit'],
+ all=['repOverlandFlowMaps'], restrictoption=['nonInit'],
monthly=False, yearly=False),
'OFOtherState': ReportedMap(name='OFOtherState', output_var='OFM3Other',
unit='m3', end=[], steps=['repStateMaps'],
@@ -1128,7 +1129,7 @@
unit='mm', end=[], steps=['repTotalAbs'],
all=[],
restrictoption=['nonInit', 'wateruse',
- 'wateruseRegion','inidcator'],
+ 'wateruseRegion','indicator'],
monthly=True, yearly=False),
'TotalAbstractionFromGroundwaterM3': ReportedMap(
name='TotalAbstractionFromGroundwaterM3',
@@ -1158,7 +1159,7 @@
yearly=False),
'TransLossMaps': ReportedMap(name='TransLossMaps', output_var='TransLossM3*self.var.M3toMM',
unit='mm', end=[], steps=[], all=['repGwLossMaps','repE2O2'],
- restrictoption=['nonInit'], monthly=False,
+ restrictoption=['nonInit','TransLoss'], monthly=False,
yearly=False),
'UpstreamInflowUsedM3': ReportedMap(name='UpstreamInflowUsedM3',
output_var='UpstreamInflowUsedM3',
diff --git a/src/lisfloodSettings_reference.xml b/src/lisfloodSettings_reference.xml
index 160d6d26..aab267fb 100644
--- a/src/lisfloodSettings_reference.xml
+++ b/src/lisfloodSettings_reference.xml
@@ -75,6 +75,7 @@ You can use builtin path variables in this template and reference to other paths
#-----------------------------------------------------------
# report discharge TS
+
# report gauges and sites
# sites (pixel average)
@@ -134,6 +135,7 @@ You can use builtin path variables in this template and reference to other paths
#Surface runoff
#Surface runoff + UZ [mm]
#Surface runoff + UZ [mm] + LZ
+
@@ -162,6 +164,7 @@ You can use builtin path variables in this template and reference to other paths
+
@@ -173,33 +176,39 @@ You can use builtin path variables in this template and reference to other paths
**************************************************************
!-- Optimization of netCDF I/O through chunking and caching.
+
+
+
The option "NetCDFTimeChunks" may take the following values:
- "-1" : Load everything upfront
- "[positive integer number]" : Chunk size defined by user
- "auto" : Let xarray to decide
-
+
+
The option "MapsCaching" may take the following values:
- "True" : Cache maps during execution
- "False" : No caching
-
-
+
+
+
The option "OutputMapsChunks" may take the following values:
- "[positive integer number]" : Dump outputs to disk every X steps (default 1)
-
+
+
The option "OutputMapsDataType" sets the output data type and may take the following values:
- "float64"
- "float32"
-
+
**************************************************************
@@ -207,6 +216,8 @@ You can use builtin path variables in this template and reference to other paths
**************************************************************
+
+
!-- Parallelisation of using Numba runtime compiled library .
The option "numCPUs_parallelNumba" may take the following values:
- "0" : set to NUMBA_NUM_THREADS Environment Variable
@@ -214,7 +225,8 @@ You can use builtin path variables in this template and reference to other paths
- "1" : serial execution (not parallel)
- "2", "3", ... : manual setting of the number of parallel threads.
(if exceeding NUMBA_NUM_THREADS, the value is set to NUMBA_NUM_THREADS) -->
-
+
+
**************************************************************
@@ -535,9 +547,9 @@ You can use builtin path variables in this template and reference to other paths
- default: 1.0
-$(PathParams)/params_ChanSMult
-Multiplier [] applied to ChanSdXdY
+ default: 1.0
+ $(PathParams)/params_ChanSMult
+ Multiplier [] applied to ChanSdXdY
@@ -1301,6 +1313,7 @@ Multiplier [] applied to ChanSdXdY
+ # $(PathMaps)/energyconsumptiveuse
# Consumptive Use (1-Recycling ratio) for energy water use (0-1) [-]
# Source: Torcellini et al. (2003) "Consumptive Use for US Power Production"
# map advised by Neil Edwards, Energy Industry
@@ -1320,7 +1333,7 @@ Multiplier [] applied to ChanSdXdY
Default : 0.2
- $(PathRoot)/leakage
+ $(PathMaps)/leakage
Fraction of leakage of public water supply (0=no leakage, 1=100% leakage)
@@ -1381,12 +1394,6 @@ Multiplier [] applied to ChanSdXdY
-
-
- Reported water use [cu m/s], depending on the availability of discharge
-
-
-
Time series of upstream water use at gauging stations
@@ -1589,6 +1596,7 @@ Multiplier [] applied to ChanSdXdY
even for options that are not actually used!
**************************************************************
+
@@ -1899,11 +1907,6 @@ Multiplier [] applied to ChanSdXdY
-
-
- Number of days used for internal spin-up (fluxes computations during prerun)
-
-
@@ -2327,7 +2330,7 @@ Multiplier [] applied to ChanSdXdY
**************************************************************
-
+
PRERUNDIR/lzavin
Reported map of average percolation rate from upper to
@@ -2335,7 +2338,7 @@ Multiplier [] applied to ChanSdXdY
-
+
PRERUNDIR/avgdis
CHANNEL split routing in two lines
@@ -2897,12 +2900,6 @@ Multiplier [] applied to ChanSdXdY
-
-
- Reported water use [cu m/s], depending on the availability of discharge
-
-
-
Time series of upstream water use at gauging stations
@@ -3030,9 +3027,11 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
STATE VARIABLES AT SELECTED TIME STEPS
ONLY FOR INITIALISATION OF SUCCEEDING RUNS
REPORTING TIME STEPS SET THROUGH "ReportSteps" OPTION
+ **************************************************************
@@ -3270,20 +3269,12 @@ Multiplier [] applied to ChanSdXdY
-
-
- Reported transpiration maps, weighted sum over the fractions of each pixel [mm]
-
-
-
-
-
+ **************************************************************
"END" MAPS, AKA REPORTED OUTPUT MAPS CALLED "END"
Same as above, but always at last time step
- Support for these "end" maps will most likely be
- discontinued some time soon
+ **************************************************************
@@ -3405,15 +3396,15 @@ Multiplier [] applied to ChanSdXdY
-
+
- Reported lake storage [m3]
+ Reported reservoir filling [-]
-
+
- Reported reservoir filling [-]
+ name of output map(s) with polder level
@@ -3583,11 +3574,13 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
INDIVIDUAL DRIVING METEOROLOGICAL VARIABLES (AT EVERY TIME STEP)
ONLY IF REPORTING OF EACH RESPECTIVE VARIABLE IS
SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
Note reporting is done as a quantity per time step, not as
an intensity (as in meteo input!)
+ **************************************************************
@@ -3619,14 +3612,23 @@ Multiplier [] applied to ChanSdXdY
Potential evaporation from open water surface [mm per time step]
+
+
+
+ EvaAddM3*self.var.M3toMM [mm per time step]
+
+
+
+ **************************************************************
INDIVIDUAL STATE VARIABLES (AT EVERY TIME STEP)
ONLY IF REPORTING OF EACH RESPECTIVE VARIABLE IS
SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
+ **************************************************************
@@ -3662,30 +3664,6 @@ Multiplier [] applied to ChanSdXdY
-
-
- Reported storage in lower response box [mm]
-
-
-
-
-
- Reported storage in lower response box [mm]
-
-
-
-
-
- Reported storage in lower response box [mm]
-
-
-
-
-
- Reported storage in lower response box [mm]
-
-
-
Reported total water storage [mm]
@@ -3791,7 +3769,7 @@ Multiplier [] applied to ChanSdXdY
-
+
Reported interception (depression) storage, direct runoff (impervious) fraction [mm]
@@ -3800,9 +3778,11 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
INDIVIDUAL RATE VARIABLES (AT EVERY TIME STEP)
ONLY IF REPORTING OF EACH RESPECTIVE VARIABLE IS
SWITCHED ON (DEFAULT: ALL SWITCHED OFF)
+ **************************************************************
@@ -3930,25 +3910,6 @@ Multiplier [] applied to ChanSdXdY
Reported seepage to groundwater(from soil layer 2 to groundwater), weighted sum over the fraction of each pixel [mm]
-
-
-
- Reported infiltration from the soil layer 2 to soil layer 3, other land cover fraction, average flux over the simulation period [mm]
-
-
-
-
-
- Reported infiltration from the soil layer 2 to soil layer 3, forest land cover fraction, average flux over the simulation period [mm]
-
-
-
-
-
- Reported infiltration from the soil layer 2 to soil layer 3, irrigated land cover fraction, average flux over the simulation period [mm]
-
-
-
Reported available groundwater LZ+ GWLoss [mm]
@@ -4063,12 +4024,24 @@ Multiplier [] applied to ChanSdXdY
+
+
+ Reported preferential flow [mm]
+
+
+
Reported preferential flow [mm]
+
+
+ Reported preferential flow [mm]
+
+
+
Reported percolation from 1st to 2nd soil layer [mm]
@@ -4081,6 +4054,12 @@ Multiplier [] applied to ChanSdXdY
+
+
+ Reported upper zone outflow [mm]
+
+
+
Reported upper zone outflow [mm]
@@ -4142,7 +4121,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
MISCELLANEOUS OUTPUT MAPS AND TIME SERIES
+ **************************************************************
@@ -4221,7 +4202,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
OUTPUT AT SITES: STATE VARIABLES
+ **************************************************************
@@ -4319,7 +4302,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
OUTPUT AT SITES: RATE VARIABLES
+ **************************************************************
@@ -4434,9 +4419,11 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
AVERAGE VALUES OF METEOROLOGICAL FORCING VARIABLES
UPSTREAM OF GAUGES
(only if repMeteoUpsGauges option is activated)
+ **************************************************************
@@ -4469,7 +4456,7 @@ Multiplier [] applied to ChanSdXdY
-
+
ESActPixel+self.var.TaPixel+self.var.TaInterceptionAll+self.var.EvaAddM3*self.var.M3toMM
@@ -4479,9 +4466,11 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
AVERAGE VALUES OF MODEL STATE VARIABLES
UPSTREAM OF GAUGES
(only if repStateUpsGauges option is activated)
+ **************************************************************
@@ -4536,9 +4525,11 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
AVERAGE VALUES OF MODEL RATE VARIABLES
UPSTREAM OF GAUGES
(only if repRateUpsGauges option is activated)
+ **************************************************************
@@ -4653,7 +4644,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
NUMERICS
+ **************************************************************
@@ -4761,13 +4754,13 @@ Multiplier [] applied to ChanSdXdY
-
+
trasmission loss in m3/s, for direct comparison with dis.tss
-
+
transmission loss in mm, for direct comparison with gwloss.tss
@@ -4782,6 +4775,7 @@ Multiplier [] applied to ChanSdXdY
BASE INPUT MAPS AND TABLES
**************************************************************
+
@@ -5348,7 +5342,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
Input tables
+ **************************************************************
@@ -5382,7 +5378,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
Output time series
+ **************************************************************
@@ -5409,7 +5407,7 @@ Multiplier [] applied to ChanSdXdY
-
+
Output map(s) (NetCDF format) with reservoir filling (fraction of total storage) [-]
@@ -5475,7 +5473,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
Input tables
+ **************************************************************
@@ -5497,7 +5497,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
Output time series
+ **************************************************************
@@ -5618,6 +5620,7 @@ Multiplier [] applied to ChanSdXdY
name of output map(s) with polder level
+
@@ -5724,7 +5727,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
PF PARAMETERS
+ **************************************************************
@@ -5736,7 +5741,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
PF MAPS
+ **************************************************************
@@ -5770,7 +5777,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
PF TIMESERIES, VALUES AT SITES
+ **************************************************************
@@ -5799,7 +5808,9 @@ Multiplier [] applied to ChanSdXdY
+ **************************************************************
PF TIMESERIES, AVERAGE VALUES UPSTREAM OF GAUGES
+ **************************************************************
@@ -6130,7 +6141,6 @@ Multiplier [] applied to ChanSdXdY
-
**************************************************************
@@ -6156,13 +6166,7 @@ Multiplier [] applied to ChanSdXdY
[mm]
-
-
-
-
-
-
@@ -6171,4 +6175,4 @@ Multiplier [] applied to ChanSdXdY
ReportSteps=$(ReportSteps);
-
\ No newline at end of file
+