Index: examples/wflow_rhine_hbv/wflow_hbv.ini =================================================================== diff -u -ref66b8e21f94f3f322fbf29dbacc22ec45914a9b -rba335304c4e2b5101edf872a0dadfadc9d8a7783 --- examples/wflow_rhine_hbv/wflow_hbv.ini (.../wflow_hbv.ini) (revision ef66b8e21f94f3f322fbf29dbacc22ec45914a9b) +++ examples/wflow_rhine_hbv/wflow_hbv.ini (.../wflow_hbv.ini) (revision ba335304c4e2b5101edf872a0dadfadc9d8a7783) @@ -1,38 +1,59 @@ [framework] outputformat = 1 +debug = 0 +netcdfinput = None +netcdfoutput = None +netcdfstaticoutput = None +netcdfstaticinput = None +EPSG = EPSG:4326 # Model parameters and settings + + [model] -AnnualDischarge=2290 -# Alpha for wiver-width estimation 5 for mountain stream 60 for the river rhine -Alpha=120 -ModelSnow=1 -ScalarInput=0 -InterpolationMethod=inv -Tslice=1 -UpdMaxDist=300000.0 +AnnualDischarge = 2290 +Alpha = 120 +ModelSnow = 1 +ScalarInput = 0 +# Not used at the moment +InterpolationMethod = inv + +Tslice = 1 +UpdMaxDist = 300000.0 P_style = 1 +reinit = 0 +fewsrun = 0 +OverWriteInit = 0 +updating = 0 +updateFile = no_set +sCatch = 0 +intbl = intbl +timestepsecs = 86400 +PET_style = 1 +TEMP_style = 1 +MaxUpdMult = 1.3 +MinUpdMult = 0.7 +UpFrac = 0.8 +ExternalQbase = 0 +SetKquickFlow = 0 +MassWasting = 0 +SubCatchFlowOnly = 0 -[API] -Altitude=0,2 -FreeWater=2,4 -SoilMoisture=2,4 -UpperZoneStorage=2,4 -LowerZoneStorage=2,4 -InterceptionStorage=2,4 -SurfaceRunoff=2,1 -WaterLevel=2,2 -#DrySnow=2,4 -Percolation=1,0 -#ForecQ_qmec=0,1 -#PERC=3,4 -#FC=3,4 -# Below are the forcing variables. By putting these here you MUST -# supply them via the API, if not these will default to 0.0 -#P=0,0 -#PET=0,0 -#TEMP=0,3 +wflow_subcatch = staticmaps/wflow_subcatch.map +wflow_dem = staticmaps/wflow_dem.map +wflow_ldd = staticmaps/wflow_ldd.map +wflow_river = staticmaps/wflow_river.map +wflow_riverlength = staticmaps/wflow_riverlength.map +wflow_riverlength_fact = staticmaps/wflow_riverlength_fact.map +wflow_landuse = staticmaps/wflow_landuse.map +wflow_soil = staticmaps/wflow_soil.map +wflow_gauges = staticmaps/wflow_gauges.map +wflow_inflow = staticmaps/wflow_inflow.map +wflow_mgauges = staticmaps/wflow_mgauges.map +wflow_riverwidth = staticmaps/wflow_riverwidth.map +TemperatureCorrectionMap = staticmapswflow_tempcor.map + [misc] #mapSaveInterval=365 @@ -80,4 +101,73 @@ self.Altitude=Altitude.map +[API] +#static +Altitude = 3, m +Bw = 3, m +River = 3, - +DLC = 3, m +# states +SurfaceRunoff = 2, m^3/s +WaterLevel = 2, m +InterceptionStorage = 2, mm +DrySnow = 2, mm +FreeWater = 2, mm +LowerZoneStorage = 2, mm +UpperZoneStorage = 2, mm +SoilMoisture = 2, mm + +#fluxes +BaseFlow = 1, mm/timestep +Percolation = 1, mm/timestep +QuickFlow = 1, mm/timestep +RealQuickFlow = 1, mm/timestep +CapFlux = 1, mm/timestep +SurfaceRunoffMM = 1, mm/timestep +KinWaveVolume = 1, m^3 + +#parameters +#soil +FC = 3, mm +BetaSeepage = 3, - +LP = 3, - +K4 = 3, 1/timestep + +#If SetKquickFlow is set to 1 +KQuickFlow = 3, 1/timestep +SUZ = 3, mm +K0 = 3, 1/timestep +#If SetKquickFlow is set to 0 +KHQ = 3, 1/timestep +HQ = 3, ??? +# high flow rate HQ for which recession rate of upper reservoir is known (3.27000) +AlphaNL = 3, - + +PERC = 3, mm/timestep +CFR = 3, - +Pcorr = 3, - +RFCF = 3, - +SFCF = 3, - +Cflux = 3, mm/timestep +ICF = 3, mm +CEVPF = 3, - +EPF = 3, - +ECORR = 3, - +ECALT = 3, mm/100m + +#Snow modelling parameters +TTI = 3, oC +TT = 3, oC +Cfmax = 3, mm/oC/timestep +WHC = 3, - + +# routing +N = 3, - +NRiver = 3, - + +# Below are the forcing variables. By putting these here you MUST +# supply them via the API, if not these will default to 0.0 +#P=0, mm/timestep +#PET=0, mm/timestep +#TEMP=0, oC Index: examples/wflow_rhine_sbm/wflow_sbm.ini =================================================================== diff -u -radd65e2f3f0e848e03d5b4f45ab1b4e057e5a2d8 -rba335304c4e2b5101edf872a0dadfadc9d8a7783 --- examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision add65e2f3f0e848e03d5b4f45ab1b4e057e5a2d8) +++ examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision ba335304c4e2b5101edf872a0dadfadc9d8a7783) @@ -1,11 +1,3 @@ -[API] -IF=0,1 -InwaterMM=2,4 -#FirstZoneDepth=2,1 -#Latitude=1,5 -#Longitude=1,5 - - # Define the forcings needed for the model here # the filename is either the name of the pcraster map-stack or the name of the # variable in the netcdf input file @@ -21,31 +13,63 @@ #runinfo=runinfo.xml #starttime= 1995-01-31 00:00:00 GMT #endtime= 1995-02-28 00:00:00 GMT +starttime = None +endtime= None +runinfo = None # required, base timestep of the model timestepsecs = 86400 #start model with cold state reinit=0 + # Model parameters and settings -[model] -modeltype= sbm -AnnualDischarge=2290 -# Alpha for wiver-width estimation 5 for mountain stream 60 for the river rhine -Alpha=120 -ModelSnow=0 -ScalarInput=0 -InterpolationMethod=inv -WIMaxScale=0.8 -Tslice=1 -# Maximum upstream distance to update the flow in metres -UpdMaxDist=300000.0 -#SubCatchFlowOnly = 1 +[model] +modeltype = sbm +AnnualDischarge = 2290 +Alpha = 120 +ModelSnow = 0 +ScalarInput = 0 +InterpolationMethod = inv +WIMaxScale = 0.8 +Tslice = 1 +UpdMaxDist = 300000.0 origTopogLateral = 1 +configfile = wflow_sbm.ini +reinit = 0 +fewsrun = 0 +OverWriteInit = 0 +updating = 0 +updateFile = no_set +lateralmethod = 1 +sCatch = 0 +intbl = intbl +timestepsecs = 86400 +MaxUpdMult = 1.3 +MinUpdMult = 0.7 +UpFrac = 0.8 +# specific for sbm -W and -E +# if -W in the command line, waterdem will be set to 1 +waterdem = 0 +# if -E in the command line, reInfilt will be set to 1 +reInfilt = 0 +MassWasting = 0 +wflow_subcatch = staticmaps/wflow_subcatch.map +wflow_dem = staticmaps/wflow_dem.map +wflow_ldd = staticmaps/wflow_ldd.map +wflow_river = staticmaps/wflow_river.map +wflow_riverlength = staticmaps/wflow_riverlength.map +wflow_riverlength_fact = staticmaps/wflow_riverlength_fact.map +wflow_landuse = staticmaps/wflow_landuse.map +wflow_soil = staticmaps/wflow_soil.map +wflow_gauges = staticmaps/wflow_gauges.map +wflow_inflow = staticmaps/wflow_inflow.map +wflow_riverwidth = staticmaps/wflow_riverwidth.map +RunoffGenSigmaFunction = 0 +SubCatchFlowOnly = 0 +TemperatureCorrectionMap = staticmaps/wflow_tempcor.map -#DynamicVegetation=1 - [misc] #mapSaveInterval=365 @@ -60,6 +84,14 @@ #netcdfstaticoutput = outsum.nc #netcdfwritebuffer=100 +outputformat = 1 +debug = 0 +netcdfinput = None +netcdfoutput = None +netcdfstaticoutput = None +netcdfstaticinput = None +EPSG = EPSG:4326 + [layout] # if set to zero the cell-size is given in lat/long (the default) sizeinmetres = 0 @@ -137,3 +169,80 @@ self.UStoreDepth + self.FirstZoneDepth + self.CanopyStorage = store.csv +# The section below is for the BMI and low level API. It can be empty if you do not use this +[API] +#states +CanopyStorage = 2, mm +FirstZoneDepth = 2, mm +LowerZoneStorage = 2, mm +Snow = 2, mm +SnowWater = 2, mm +SurfaceRunoff = 2, m^3/s +SurfaceRunoffDyn = 2, m^3/s +TSoil = 2, oC +UStoreDepth = 2, mm +WaterLevel = 2, m +WaterLevelDyn = 2, m + +# fluxes +PotTransSoil = 1, mm/timestep +Transpiration = 1, mm/timestep +ActEvapOpenWater = 1, mm/timestep +soilevap = 1, mm/timestep +Interception = 1, mm/timestep +ActEvap = 1, mm/timestep +SurfaceRunoffCatchmentMM = 1, mm/timestep +ActEvap = 1, mm/timestep +ExcessWater = 1, mm/timestep +InfiltExcess = 1, mm/timestep +ActInfilt = 1, mm/timestep +zi = 1, mm/timestep +Transfer = 1, mm/timestep +CapFlux = 1, mm/timestep +RunoffCoeff = 1, - + +# parameters +#Soil +M = 3, - +thetaR = 3, mm/mm +thetaS = 3, mm/mm +FirstZoneKsatVer = 3, mm/timestep +PathFrac = 3, - +InfiltCapSoil = 3, mm/timestep +InfiltCapPath = 3, mm/timestep +FirstZoneMinCapacity = 3, mm +FirstZoneCapacity = 3, mm +RootingDepth = 3, mm +MaxLeakage = 3, mm/timestep +CapScale = 3, mm/timestep +RunoffGeneratingGWPerc = 3, - +rootdistpar = 3, mm + +#Canopy +CanopyGapFraction = 3, - +MaxCanopyStorage = 3, mm +EoverR = 3, - + +#Surface water +N = 3, - +N_river = 3, - + +#Snow and frozen soil modelling parameters +cf_soil = 3, - +TTI = 3, oC +TT = 3, oC +Cfmax = 3, mm/oC/timestep +WHC = 3, - +w_soil = 3, - +#static +Altitude = 3, m +Bw = 3, m +River = 3, - +DLC = 3, m + +# Below are the forcing variables. By putting these here you MUST +# supply them via the API, if not these will default to 0.0 +#P=0, mm/timestep +#PET=0, mm/timestep +#TEMP=0, oC + Index: wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini =================================================================== diff -u -r7cdea110c122f40854a89284f90ae55ba6fac6f4 -rba335304c4e2b5101edf872a0dadfadc9d8a7783 --- wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini (.../wflow_sceleton.ini) (revision 7cdea110c122f40854a89284f90ae55ba6fac6f4) +++ wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini (.../wflow_sceleton.ini) (revision ba335304c4e2b5101edf872a0dadfadc9d8a7783) @@ -1,58 +1,10 @@ -#[API] -#TEMP=0,degrees -#P=0,1 + [API] IF = 0,1 InwaterMM = 2,4 -#states -CanopyStorage = 2, mm -FirstZoneDepth = 2, mm -LowerZoneStorage = 2, mm -Snow = 2, mm -SnowWater = 2, mm -SurfaceRunoff = 2, m^3/s -SurfaceRunoffDyn = 2, m^3/s -TSoil = 2, oC -UStoreDepth = 2, mm -WaterLevel = 2, m -WaterLevelDyn = 2, m -# fluxes -PotTransSoil = 1, mm/timestep -Transpiration = 1, mm/timestep -ActEvapOpenWater = 1, mm/timestep -soilevap = 1, mm/timestep -Interception = 1, mm/timestep -ActEvap = 1, mm/timestep -SurfaceRunoffCatchmentMM = 1, mm/timestep -ActEvap = 1, mm/timestep -ExcessWater = 1, mm/timestep -InfiltExcess = 1, mm/timestep -ActInfilt = 1, mm/timestep -zi = 1, mm/timestep -TSoil = 1, oC -Transfer = 1, mm/timestep -CapFlux = 1, mm/timestep -RunoffCoeff = 1, - -# parameters -#Soil -M = 0, - -thetaR = 0, mm/mm -thetaS = 0, mm/mm -FirstZoneKsatVer = 0, mm/timestep -PathFrac = 0, - -InfiltCapSoil = 0, mm/timestep -InfiltCapPath = 0, mm/timestep -FirstZoneMinCapacity = 0, mm -FirstZoneCapacity = 0, mm -RootingDepth = 0, mm -MaxLeakage = 0, mm/timestep -CapScale = 0, mm/timestep -RunoffGeneratingGWPerc = 0, - -rootdistpar = 0, mm -[model] [framework] # outputformat for the *dynamic* mapstacks (not the states and summary maps)