Index: wflow-py/Scripts/wflow_prepare_step2.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r19ba123a81340a60d1901a26ad6b0af20496b933 --- wflow-py/Scripts/wflow_prepare_step2.py (.../wflow_prepare_step2.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/Scripts/wflow_prepare_step2.py (.../wflow_prepare_step2.py) (revision 19ba123a81340a60d1901a26ad6b0af20496b933) @@ -24,10 +24,8 @@ """ -try: - import wflow.wflow_lib as tr -except ImportError: - import wflow_lib as tr +import wflow.wflow_lib as tr + import os import os.path import getopt @@ -190,7 +188,8 @@ dem = tr.readmap(step2dir + "/wflow_dem.map") demmin = tr.readmap(step2dir + "/wflow_demmin.map") demmax = tr.readmap(step2dir + "/wflow_demmax.map") - catchcut = tr.readmap(step2dir + "/catchment_cut.map") + #catchcut = tr.readmap(step2dir + "/catchment_cut.map") + catchcut = tr.readmap(step2dir + "/cutout.map") # now apply the area of interest (catchcut) to the DEM #dem=tr.ifthen(catchcut >=1 , dem) #