Wflow

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' of github.com:openstreams/wflow

* 'master' of github.com:openstreams/wflow:

fix broken pcr function calls

multiply parameters fixed for topoflex

summarymaps and dynamic maps change export for topoflex list maps

change e** to pcr.exp for bmi add pcr.ordinal

topoflex test in python 3 - update the import of packages and make model run adapt framework to cope with lists of variables (for different classes) for now this is only done for the csv files, not yet for the maps.

docker file, from ewatercycle

fix broken pcr function calls

fix broken pcr function calls

- removed reinfilt option - solved index error (zi could be larger than SoilThickness

multiply parameters fixed for topoflex

add packages in wflow topoflex to make it run in bmi

summarymaps and dynamic maps change export for topoflex list maps

change e** to pcr.exp for bmi add pcr.ordinal

topoflex test in python 3 - update the import of packages and make model run adapt framework to cope with lists of variables (for different classes) for now this is only done for the csv files, not yet for the maps.

iteration kin wave was not working, fixed now

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

option to iterate for kinematic wave (river and land runoff), more seperate functions (soil moisture movement, infiltration), option for reinfiltration overland flow still available

Update environment.yml

fixed: mass balance issue with kin wave ssf; width (SW) overland flow

Update of the glacier model

zi was not bounded (> SoilThickness), number of soil layers was fixed (4)

gitignore files generated by running the tests

Ideally all tests should clean up afterwards, but until then, ignore these file types.

    • binary
    /tests/wflow_sceleton/outstate/TSoil.map
Python 3.7 doesn't work due to PCRaster

So prevent using that. Otherwise you get this:

ImportError: The 'pcraster' module was built for Python 3.6, the version used is 3.7

wflow_sbm lateral redesign

pcrglobwb small changes

run black formatter

    • -1011
    • +2131
    /wflow/wflow_sediment.py
add module to more unknown functions

some more cleanup from after #22

change code for parameter and forcing multiplication -P and -p (use getattr to really multiply the map with the factor and add warning when it is successful).

Update of wflow_sphy script and example

    • -0
    • +11
    /wflow/sphy/advanced_routing.py
    • -0
    • +18
    /wflow/sphy/dynamic_veg.py
    • -0
    • +52
    /wflow/sphy/lakes.py
    • -0
    • +29
    /wflow/sphy/reservoirs.py
Update of wflow_sphy script and example

    • binary
    /examples/wflow_ganga_sphy/instate/GlacFrac.map
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/CapRiseMax.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/GwDepth.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/GwSat.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/RootDepthFlat.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/SubDepthFlat.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/Tcrit.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/alphaGw.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/deltaGw.tbl
    • -0
    • +18
    /examples/wflow_ganga_sphy/intbl/kc.tbl
    • -0
    • +1
    /examples/wflow_ganga_sphy/intbl/kx.tbl
    • -0
    • +6
    /examples/wflow_ganga_sphy/intbl/lake_function.tbl
    • -0
    • +7
    /examples/wflow_ganga_sphy/intbl/lake_hs.tbl
    • -0
    • +6
    /examples/wflow_ganga_sphy/intbl/lake_id.tbl
  1. … 8 more files in changeset.
Add wflow_sediment doc and example

    • -0
    • +982
    /doc/wflow_sediment.rst
    • binary
    /examples/wflow_rhine_sediment/inmaps/sbm2sed.nc
    • binary
    /examples/wflow_rhine_sediment/instate/ClayLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/GravLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/LaggLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutClayLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutGravLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutLaggLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutSaggLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutSandLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutSedLoad.map
    • binary
    /examples/wflow_rhine_sediment/instate/OutSiltLoad.map
  1. … 64 more files in changeset.
Add wflow_sediment

    • -0
    • +1239
    /wflow/wflow_sediment.py
wflow_sbm: - added 'import pcraster as pcr' as last import - added simple recharge calculation (var self.Recharge)