Wflow

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SafeConfigParser is now ConfigParser

DeprecationWarning: The SafeConfigParser class has been renamed to ConfigParser in Python 3.2. This alias will be removed in future versions. Use ConfigParser directly instead.

    • -1
    • +1
    /wflow-py/Scripts/wflow_prepare_step1.py
    • -1
    • +1
    /wflow-py/Scripts/wflow_prepare_step2.py
    • -1
    • +1
    /wflow-py/wflow/wf_DynamicFramework.py
    • -1
    • +1
    /wflow-py/wflow/wflow_bmi_combined_mp.py
run 2to3 on all python files

`2to3 -w -n wflow-py`

    • -21
    • +10
    /wflow-py/Sandbox/wflow_HRU_test.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_mswat.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_musle.py
    • -33
    • +19
    /wflow-py/Sandbox/wflow_prepare_rad.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_vegetation.py
    • -32
    • +33
    /wflow-py/Sandbox/wflow_w3ra_v2.py
    • -36
    • +21
    /wflow-py/Scripts/e2o-getfromwci.py
    • -60
    • +44
    /wflow-py/Scripts/read_arcinfo_files.py
  1. … 101 more files in changeset.
run 2to3 on all python files

`2to3 -w -n wflow-py`

    • -21
    • +10
    /wflow-py/Sandbox/wflow_HRU_test.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_mswat.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_musle.py
    • -33
    • +19
    /wflow-py/Sandbox/wflow_prepare_rad.py
    • -15
    • +15
    /wflow-py/Sandbox/wflow_vegetation.py
    • -32
    • +33
    /wflow-py/Sandbox/wflow_w3ra_v2.py
    • -36
    • +21
    /wflow-py/Scripts/e2o-getfromwci.py
    • -60
    • +44
    /wflow-py/Scripts/read_arcinfo_files.py
  1. … 101 more files in changeset.
run 2to3 on all python files

`2to3 -w -n wflow-py`

    • -4
    • +4
    /wflow-py/Sandbox/wflow_prepare_rad.py
    • -12
    • +12
    /wflow-py/Sandbox/wflow_w3ra_v2.py
    • -15
    • +15
    /wflow-py/Scripts/e2o-getfromwci.py
    • -21
    • +21
    /wflow-py/Scripts/read_arcinfo_files.py
  1. … 101 more files in changeset.
restructure setup.py

most importantly, set python_requires=">=3.6", which is also the requirement of pcraster 4.2

restructure setup.py

most importantly, set python_requires=">=3.6", which is also the requirement of pcraster 4.2

restructure setup.py

most importantly, set python_requires=">=3.6", which is also the requirement of pcraster 4.2

conda env require python 3.6

for pcraster 4.2

GDAL 2.2.4 is needed to support map files larger than 2 GB in Windows

conda env require python 3.6

for pcraster 4.2

GDAL 2.2.4 is needed to support map files larger than 2 GB in Windows

conda env require python 3.6

for pcraster 4.2

GDAL 2.2.4 is needed to support map files larger than 2 GB in Windows

remove pcraster dir

  1. … 180 more files in changeset.
remove pcraster dir

  1. … 180 more files in changeset.
remove pcraster dir

  1. … 180 more files in changeset.
remove packages dir with cx_Freeze exes

    • binary
    /packages/cx_Freeze-4.3.4.win-amd64-py2.7.exe
    • binary
    /packages/cx_Freeze-5.0.1.win-amd64-py2.7.exe
remove packages dir with cx_Freeze exes

    • binary
    /packages/cx_Freeze-4.3.4.win-amd64-py2.7.exe
    • binary
    /packages/cx_Freeze-5.0.1.win-amd64-py2.7.exe
remove packages dir with cx_Freeze exes

    • binary
    /packages/cx_Freeze-4.3.4.win-amd64-py2.7.exe
    • binary
    /packages/cx_Freeze-5.0.1.win-amd64-py2.7.exe
modelbuilder update: landuse.map > wflow_landuse.map

add bmi-python to wflow env

solved import issue with rasterio.control (modelbuilder.py now first entry in scriptpaths)

modelbuilder template update intbl files to include infinite no. of subcatch

  1. … 3 more files in changeset.
fix modelbuilder bug with empty geometry

it set all river ends to outlets

small update modelbuilder doc

fix netcdf4 to 1.3.1

since 1.4.0 breaks the build by requiring netcdftime as extra module and cftime (hidden import)

also put modelbuilder as last build, because when combining files the last ones overwrite, might fix the rasterio 'no module named control' error

Merge remote-tracking branch 'origin/master'

Explanatory comments added; some variable names updated. Untested but should be ok.

added hidden import cftime to wflow_all.spec solved small bug in reservoir: wflow_sbm - wf_DynamicFramework - ERROR - <type 'exceptions.AttributeError'>: 'WflowModel' object has no attribute 'filterResArea'

(cherry picked from commit 2ec95d3f4095a51f558ca183f21e1d8fc6088a91)

added hidden import cftime to wflow_all.spec solved small bug in reservoir: wflow_sbm - wf_DynamicFramework - ERROR - <type 'exceptions.AttributeError'>: 'WflowModel' object has no attribute 'filterResArea'

commented out line 167 (raise ValueError) in modelbuilder.py

added netcdftime dependency (netcdf4 version 1.4.0 (tag v1.4.0rel) removed netcdftime, since it is now a separate package. date2num, num2date and date2index still importable from netCDF4.

for simple reservoirs in wflow_sbm possible to include reservoir areas: - for precipitation and evaporation - requires staticmap with reservoir areas (for average precipitation and evaporation) - reservoir area can also included in tbl file ResSimpleArea.tbl or is calculated from staticmap reservoir areas - code checks first ResSimpleArea.tbl for a reservoir and if not available takes calculated area from staticmap