Changeset 8289

Timestamp:

Dec 20, 2011, 9:44:31 AM (13 years ago)

Author:

steve

Message:

Change the way timesteps are stored in sww_merge to have number_of_timesteps = None

File:

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

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

@@ -209 +209 @@
 
             times    = fid.variables['time'][:]
-            number_of_timesteps = len(times)
+            n_steps = len(times)
+            number_of_timesteps = fid.dimensions['number_of_timesteps']
+            starttime = int(fid.starttime)
             
             out_s_quantities = {}
@@ -242 +244 @@
             for quantity in dynamic_quantities:
                 out_d_quantities[quantity] = \
-                      num.zeros((number_of_timesteps,number_of_global_nodes),num.float32)
+                      num.zeros((n_steps,number_of_global_nodes),num.float32)
                  
             description = 'merged:' + getattr(fid, 'description')          
@@ -299 +301 @@
             q = fid.variables[quantity]
             #print q.shape
-            for i in range(number_of_timesteps):
+            for i in range(n_steps):
                 out_d_quantities[quantity][i][node_l2g] = \
                            num.array(q[i],dtype=num.float32)
@@ -322 +324 @@
     fido = NetCDFFile(output, netcdf_mode_w)
     sww = Write_sww(static_quantities, dynamic_quantities)
-    sww.store_header(fido, times,
+    sww.store_header(fido, starttime,
                              number_of_global_triangles,
                              number_of_global_nodes,
@@ -349 +351 @@
     for q in dynamic_quantities:
         q_values = out_d_quantities[q]
-        for i in range(number_of_timesteps):
+        for i in range(n_steps):
             fido.variables[q][i] = q_values[i]