Changeset 8273

Timestamp:

Dec 7, 2011, 5:02:30 PM (13 years ago)

Author:

steve

Message:

Updated sww_merge again. Hopefully doesn't break too many codes

File:

• trunk/anuga_core/source/anuga/utilities/sww_merge.py (modified) (5 diffs)

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

@@ -11 +11 @@
 from anuga.file.sww import SWW_file, Write_sww
 
+def sww_merge(domain_global_name, np, verbose=False):
 
-def sww_merge(swwfiles, output, verbose = False):
+    output = domain_global_name+".sww"
+    swwfiles = [ domain_global_name+"_P"+str(v)+"_"+str(np)+".sww" for v in range(np)]
+
+    _sww_merge(swwfiles, output, verbose)
+
+
+def _sww_merge(swwfiles, output, verbose):
     """
         Merge a list of sww files into a single file.
@@ -28 +35 @@
         verbose True to log output information
     """
-    
+
+    if verbose:
+        print "MERGING SWW Files"
+        
     static_quantities = ['elevation']
     dynamic_quantities = ['stage', 'xmomentum', 'ymomentum']
@@ -88 +98 @@
     
     # Write out the SWW file
+
+    if verbose:
+            print 'Writing file ', output, ':'
     fido = NetCDFFile(output, netcdf_mode_w)
     sww = Write_sww(static_quantities, dynamic_quantities)
@@ -130 +143 @@
                    help='number of processors used to produce sww files')
     parser.add_argument('-f', type=str, default="domain",
-                   help='base sww file name')
+                   help='domain global name')
     parser.add_argument('-v', nargs='?', type=bool, const=True, default=False,
                    help='verbosity')
@@ -137 +150 @@
 
     np = args.np
-    filebase = args.f
+    domain_global_name = args.f
     verbose = args.v
 
-    #print np
-    #print filebase
-    #print verbose
-
-
-
-    output = filebase+".sww"
-    swwfiles = [ filebase+"_P"+str(v)+"_"+str(np)+".sww" for v in range(np)]
-
-    #print swwfiles
 
     try:
-        sww_merge(swwfiles, output, verbose)
+        sww_merge(domain_global_name, np, verbose)
     except:
-        msg = 'ERROR: When merging sww files '+" ".join(swwfiles)
+        msg = 'ERROR: When merging sww files %s '% domain_global_name
         print msg
         raise