Wflow

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Update wflow_sbm.py

Removed subgrid runoff generation part completely (not part of wflow_sbm anymore).

Update wflow_sbm and wflow_subcatch

- also possible to provide a static map with river slope (RiverSlope.map) in wflow_sbm. Possible combinations: 1) wflow_riverlength_fact.map and calculated river slope by wflow_sbm code, 2) RiverSlope.map and wflow_riverlength.map.

- update of wflow_subcatch.py (for py3)

wflow_sbm update (SoilThickness)

Update wflow_sbm

Moved up SoilThickness calculation based on TWI in wflow_sbm (before SoilWaterCapacity and UStoreLayerThickness calculation.

Update wflow_funcs

Improved if statement in wflow_funcs

update unittest

constants slightly adjusted

Comments

Added comments to improve readability

Altered kinematic_wave_ssf

Based on a discussion between myself and Willem v. Verseveld, we decided there was an error in the previous accounting of the recharge rate, their was a type to represent the lateral flow rate of the previous timestep.

Furthermore, it was decided to make use of the waterbalance approach to estimate the groundwater level zi, instead of using its relation with respect to lateral flow ssf_n. The new estimate is more representative for thw whole grid cell (instead of its boundary only and the Newton Raphson procedure iterates faster to a stable solution.

Option to provide slope map for land surface

- river slope is still based on slope of resolution DEM model$'\n'provide land surface slope as Slope.map in staticmaps

actEvap_unsat_SBM should have sumlayer_0 as argument (not sumlayer)

also subtract ActEvapOpenWaterRiver (line 393)

consistently capitalize `UStoreDepth`

There were some `UstoreDepth`, leading to <type 'exceptions.AttributeError'>: 'WflowModel' object has no attribute 'UStoreDepth'

Also updates the docstrings.

Update prep.ini

Update wflow_prepare scripts and linked documentation

- fixed issue with reading X, Y gauges

- function subcatch part of wflow_lib.py

- update of documentation for wflow_prepare.ini file

Update wflow_prepare.py

fixed explicit pcraster function calls

update wflow_prepare_step scripts

fixed explicit pcraster function calls

Update wflow_sbm.py

Feddes reduction switched of for wet conditions until (todo):

- reduction only applied to crops

- improved drainage concept for areas with low slope values

typo it_kin

fixed kin wave iteration issue

soilInfRedu now optional, nominal type for all reservoir static maps, use correct ldd for riverwidth (in combination with reservoirs (pits))

self.ReservoirSimpleAreas is now converted to nominal type

unittest fix

fixed riverwidth estimation (should be based on manning N river (and not landcover)), small changes to estimation kin wave iterations

fixed typo pcr.prc2numpy, set minimum iterations kinematic wave (was 0 ...)

Merge branch 'master' of https://github.com/openstreams/wflow

include all wflow models/scripts in wflow_all.spec

fix pyproj to 1.9

pyproj 2 depends on PROJ 6, which is breaking, and does not yet work with GDAL.

pyproj dir

numba version and markup .yml file