Index: wflow-py/Scripts/wflow_flood_lib.py =================================================================== diff -u -r414daa740d69a0674195d0bc996218a61f76207e -r78869427fc1538fb6f1b316b9d8188e1c66edff2 --- wflow-py/Scripts/wflow_flood_lib.py (.../wflow_flood_lib.py) (revision 414daa740d69a0674195d0bc996218a61f76207e) +++ wflow-py/Scripts/wflow_flood_lib.py (.../wflow_flood_lib.py) (revision 78869427fc1538fb6f1b316b9d8188e1c66edff2) @@ -23,6 +23,7 @@ from osgeo import osr, gdal, gdalconst import pcraster as pcr +import pdb def setlogger(logfilename, logReference, verbose=True): """ @@ -103,7 +104,7 @@ except: Def = True ret = default - configset(config, section, var, str(default), overwrite=False) + #configset(config, section, var, str(default), overwrite=False) default = Def return ret @@ -335,11 +336,12 @@ return hand, dist -def subcatch_stream(ldd, threshold): +def subcatch_stream(ldd, stream, threshold): """ Derive catchments based upon strahler threshold Input: ldd -- pcraster object direction, local drain directions + stream -- pcraster object direction, streamorder threshold -- integer, strahler threshold, subcatchments ge threshold are derived output: @@ -349,7 +351,7 @@ """ # derive stream order - stream = pcr.streamorder(ldd) + # stream = pcr.streamorder(ldd) stream_ge = pcr.ifthen(stream >= threshold, stream) stream_up_sum = pcr.ordinal(pcr.upstream(ldd, pcr.cover(pcr.scalar(stream_ge), 0))) # detect any transfer of strahler order, to a higher strahler order.