Index: wflow-py/Scripts/wflow_subcatch.py =================================================================== diff -u -r58f139b2afc2424fc9f8796934878bd6e49c31de -r57cd45746a8a9d24dc7e29b07752576e03b1d6bf --- wflow-py/Scripts/wflow_subcatch.py (.../wflow_subcatch.py) (revision 58f139b2afc2424fc9f8796934878bd6e49c31de) +++ wflow-py/Scripts/wflow_subcatch.py (.../wflow_subcatch.py) (revision 57cd45746a8a9d24dc7e29b07752576e03b1d6bf) @@ -36,7 +36,6 @@ from wflow.wflow_lib import * -import wflow.pcrut as pcrut import os, sys, shlex, time @@ -48,7 +47,8 @@ def usage(*args): sys.stdout = sys.stderr - for msg in args: print(msg) + for msg in args: + print(msg) print(__doc__) sys.exit(0) @@ -85,7 +85,7 @@ procTuple = (command, proc) processes.append(procTuple) while len(processes) >= maxCpu: - time.sleep(.2) + time.sleep(0.2) processes = removeFinishedProcesses(processes) # wait for all processes @@ -98,7 +98,7 @@ def main(): try: - opts, args = getopt.getopt(sys.argv[1:], 'fhC:N:I:s:M:') + opts, args = getopt.getopt(sys.argv[1:], "fhC:N:I:s:M:") except getopt.error as msg: usage(msg) @@ -165,7 +165,9 @@ x, y, data, FillVal = readMap(mfile, "PCRaster") try: good = 1 - xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal) + xn, yn, datan = cutMapById( + data, subcatchmap, subcatch, x, y, FillVal + ) except Exception as e: good = 0 print("Skipping: " + mfile + " exception: " + str(e)) @@ -194,7 +196,9 @@ x, y, data, FillVal = readMap(mfile, "PCRaster") try: good = 1 - xn, yn, datan = cutMapById(data, subcatchmap, subcatch, x, y, FillVal) + xn, yn, datan = cutMapById( + data, subcatchmap, subcatch, x, y, FillVal + ) except Exception as e: good = 0 print("Skipping: " + mfile + " exception: " + str(e))