Changeset 8291

Timestamp:

Dec 20, 2011, 5:50:32 PM (13 years ago)

Author:

steve

Message:

Added delete_old flag to sww_merge

Location:

trunk/anuga_core/source

Files:

• anuga/utilities/sww_merge.py (modified) (5 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (1 diff)

trunk/anuga_core/source/anuga/utilities/sww_merge.py

@@ -19 +19 @@
 
 
-def sww_merge_parallel(domain_global_name, np, verbose=False):
+def sww_merge_parallel(domain_global_name, np, verbose=False, delete_old=False):
 
     output = domain_global_name+".sww"
     swwfiles = [ domain_global_name+"_P"+str(np)+"_"+str(v)+".sww" for v in range(np)]
 
-    _sww_merge_parallel(swwfiles, output, verbose)
+    _sww_merge_parallel(swwfiles, output, verbose, delete_old)
 
 
@@ -176 +176 @@
 
 
-def _sww_merge_parallel(swwfiles, output, verbose):
+def _sww_merge_parallel(swwfiles, output,  verbose, delete_old):
     """
         Merge a list of sww files into a single file.
@@ -377 +377 @@
     
     fido.close()
-
+    
+    if delete_old:
+        import os
+        for filename in swwfiles:
+
+            if verbose:
+                print 'Deleting file ', filename, ':'
+            os.remove(filename)
 
 if __name__ == "__main__":
@@ -392 +399 @@
     parser.add_argument('-v', nargs='?', type=bool, const=True, default=False,
                    help='verbosity')
-
+    parser.add_argument('-delete_old', nargs='?', type=bool, const=True, default=False,
+                   help='Flag to delete the input files')
     args = parser.parse_args()
 
@@ -398 +406 @@
     domain_global_name = args.f
     verbose = args.v
+    delete_old = args.delete_old
 
 
     try:
-        sww_merge_parallel(domain_global_name, np, verbose)
+        sww_merge_parallel(domain_global_name, np, verbose, delete_old)
     except:
         msg = 'ERROR: When merging sww files %s '% domain_global_name

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -129 +129 @@
 
 
-    def sww_merge(self, verbose=False):
+    def sww_merge(self, verbose=False, delete_old=False):
 
         if self.processor == 0 and self.numproc > 1:
             import anuga.utilities.sww_merge as merge
             
-            merge.sww_merge_parallel(self.get_global_name(),self.numproc,verbose)
+            merge.sww_merge_parallel(self.get_global_name(),self.numproc,verbose,delete_old)