Changeset 8655

Timestamp:

Nov 30, 2012, 11:21:04 AM (12 years ago)

Author:

steve

Message:

Problem with merging sww files with changing elevation

File:

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

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

@@ -195 +195 @@
         print "MERGING SWW Files"
         
-    static_quantities = ['elevation']
-    dynamic_quantities = ['stage', 'xmomentum', 'ymomentum']
     
     first_file = True
@@ -211 +209 @@
             n_steps = len(times)
             number_of_timesteps = fid.dimensions['number_of_timesteps']
+            #print n_steps, number_of_timesteps
             starttime = int(fid.starttime)
             
@@ -238 +237 @@
             g_points = num.zeros((number_of_global_nodes,2),num.float32)
 
+            quantities = ['elevation', 'stage', 'xmomentum', 'ymomentum']
+            static_quantities = []
+            dynamic_quantities = []
+
+            for quantity in quantities:
+                # Test if elevation is static
+                if n_steps == fid.variables[quantity].shape[0]:
+                    dynamic_quantities.append(quantity)
+                else:
+                    static_quantities.append(quantity)
+                
             for quantity in static_quantities:
                 out_s_quantities[quantity] = num.zeros((number_of_global_nodes,),num.float32)
@@ -322 +332 @@
             #out_s_quantities[quantity][node_l2g] = \
             #             num.array(fid.variables[quantity],dtype=num.float32)
-
+            q = fid.variables[quantity]
+            print quantity, q.shape
             out_s_quantities[quantity][f_node_l2g] = \
-                         num.array(fid.variables[quantity],dtype=num.float32)[fl_nodes]
+                         num.array(q,dtype=num.float32)[fl_nodes]
 
         
@@ -335 +346 @@
                 #           num.array(q[i],dtype=num.float32)
                 out_d_quantities[quantity][i][f_node_l2g] = \
-                           num.array(q[i][fl_nodes],dtype=num.float32)
+                           num.array(q[i],dtype=num.float32)[fl_nodes]