Index: wflow-py/Scripts/wflow_subcatch.py
===================================================================
diff -u -ra16df12d232fa447d21e743d8bf7e8f94158cb4b -re883ddf9f74557587987354c2f1f6167e021b0e8
--- wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision a16df12d232fa447d21e743d8bf7e8f94158cb4b)
+++ wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision e883ddf9f74557587987354c2f1f6167e021b0e8)
@@ -146,49 +146,55 @@
         print ddir
         allcmd = []
         for mfile in glob.glob(ddir + '/*.map'):
-            x, y, data, FillVal = readMap(mfile,'PCRaster')
-            try:
-                good = 1
-                xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal)
-            except Exception,e:
-                good = 0
-                print "Skipping: " + mfile + " exception: " + str(e)
+            if not os.path.exists(mfile.replace(caseName,caseNameNew)):
+                x, y, data, FillVal = readMap(mfile,'PCRaster')
+                try:
+                    good = 1
+                    xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal)
+                except Exception,e:
+                    good = 0
+                    print "Skipping: " + mfile + " exception: " + str(e)
 
-            if xn == None:
-                good = 0
-                print "Skipping: " + mfile + " size does not match..."
+                if xn == None:
+                    good = 0
+                    print "Skipping: " + mfile + " size does not match..."
 
 
-            if good:
-                ofile = mfile.replace(caseName,caseNameNew)
-                if data.dtype == np.int32 or  data.dtype == np.uint8:
-                    writeMap(ofile,'PCRaster',xn,yn,datan.astype(np.int32),FillVal)
-                else:
-                    writeMap(ofile, 'PCRaster', xn, yn, datan, FillVal)
+                if good:
+                    ofile = mfile.replace(caseName,caseNameNew)
+                    if data.dtype == np.int32 or  data.dtype == np.uint8:
+                        writeMap(ofile,'PCRaster',xn,yn,datan.astype(np.int32),FillVal)
+                    else:
+                        writeMap(ofile, 'PCRaster', xn, yn, datan, FillVal)
 
-                # Assume ldd and repair
-                if data.dtype == np.uint8:
-                    myldd = ldd(readmap(ofile))
-                    myldd = lddrepair(myldd)
-                    report(myldd,ofile)
+                    # Assume ldd and repair
+                    if data.dtype == np.uint8:
+                        myldd = ldd(readmap(ofile))
+                        myldd = lddrepair(myldd)
+                        report(myldd,ofile)
 
         for mfile in glob.glob(ddir + '/*.[0-9][0-9][0-9]'):
-            x, y, data, FillVal = readMap(mfile,'PCRaster')
-            try:
-                good = 1
-                xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal)
-            except:
-                good = 0
-                print "Skipping: " + mfile
+            if not os.path.exists(mfile.replace(caseName, caseNameNew)):
+                x, y, data, FillVal = readMap(mfile,'PCRaster')
+                try:
+                    good = 1
+                    xn, yn, datan = cutMapById(data, subcatchmap, subcatch, x, y, FillVal)
+                except Exception, e:
+                    good = 0
+                    print "Skipping: " + mfile + " exception: " + str(e)
 
-            if good:
-                ofile = mfile.replace(caseName,caseNameNew)
-                if data.dtype == np.int32 or  data.dtype == np.uint8:
-                    writeMap(ofile,'PCRaster',xn,yn,datan.astype(np.int32),FillVal)
-                else:
-                    writeMap(ofile, 'PCRaster', xn, yn, datan, FillVal)
+                if xn == None:
+                    good = 0
+                    print "Skipping: " + mfile + " size does not match..."
 
+                if good:
+                    ofile = mfile.replace(caseName,caseNameNew)
+                    if data.dtype == np.int32 or  data.dtype == np.uint8:
+                        writeMap(ofile,'PCRaster',xn,yn,datan.astype(np.int32),FillVal)
+                    else:
+                        writeMap(ofile, 'PCRaster', xn, yn, datan, FillVal)
 
+
         for ext in ext_to_copy:
             for mfile in glob.glob(os.path.join(ddir, ext)):
                 shutil.copy(mfile, mfile.replace(caseName,caseNameNew))