Changeset 8396 for trunk/anuga_work/development/gareth/tests/util.py

Timestamp:

Apr 12, 2012, 9:00:47 PM (13 years ago)

Author:

davies

Message:

balanced_dev: Discouraging use of balanced_basic, and updates to
util.py, and experimental boundary conditions

File:

• trunk/anuga_work/development/gareth/tests/util.py (modified) (3 diffs)

trunk/anuga_work/development/gareth/tests/util.py

@@ -13 +13 @@
                        transect (e.g. a channel cross-section) -- see example below
 
-
+    util.sort_sww_filenames -- match sww filenames by a wildcard, and order
+                               them according to their 'time'. This means that
+                               they can be stuck together using 'combine_outputs' correctly
+ 
 
     Here is an example ipython session which uses some of these functions:
@@ -24 +27 @@
     > pyplot.ion() # Interactive plotting
     > pyplot.scatter(xxx[1],p.vel[140,xxx[0]],color='red') # Plot along the transect
+
+    FIXME: TODO -- Convert to a single function 'get_output', which can either take a
+          single filename, a list of filenames, or a wildcard defining a number of
+          filenames, and ensure that in each case, the output will be as desired.
 
 """
@@ -80 +87 @@
                 p1.yvel, p1.vel, p1.minimum_allowed_height
 
-
+####################
+
+def sort_sww_filenames(sww_wildcard):
+    # Function to take a 'wildcard' sww filename, 
+    # and return a list of all filenames of this type,
+    # sorted by their time.
+    # This can then be used efficiently in 'combine_outputs'
+    # if you have many filenames starting with the same pattern
+    import glob
+    filenames=glob.glob(sww_wildcard)
+    
+    # Extract time from filenames
+    file_time=range(len(filenames)) # Predefine
+     
+    for i,filename in enumerate(filenames):
+        filesplit=filename.rsplit('_time_')
+        if(len(filesplit)>1):
+            file_time[i]=int(filesplit[1].split('_0.sww')[0])
+        else:
+            file_time[i]=0         
+    
+    name_and_time=zip(file_time,filenames)
+    name_and_time.sort() # Sort by file_time
+    
+    output_times, output_names = zip(*name_and_time)
+    
+    return list(output_names)
+
+##############
 
 class get_output: