Changeset 8285

Timestamp:

Dec 15, 2011, 9:15:19 PM (11 years ago)

Author:

steve

Message:

Hopefully sww_merge is working now

File:

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

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

@@ -253 +253 @@
         node_l2g = fid.variables['node_l2g'][:]
         tri_full_flag = fid.variables['tri_full_flag'][:]
-        volumes = fid.variables['volumes'][:]
+        volumes = num.array(fid.variables['volumes'][:],dtype=num.int)
+        l_volumes = num.zeros_like(volumes)
+
+
+        # Change the local node ids to global id in the
+        # volume array
+ 
+        for i in range(len(l_volumes)):
+            g_n0 = node_l2g[volumes[i,0]]
+            g_n1 = node_l2g[volumes[i,1]]
+            g_n2 = node_l2g[volumes[i,2]]
+        
+            l_volumes[i,:] = [g_n0,g_n1,g_n2]
 
         # Just pick out the full triangles
         ftri_l2g = num.compress(tri_full_flag, tri_l2g)
-        g_volumes[ftri_l2g] = num.compress(tri_full_flag,volumes,axis=0)
+
+        #print l_volumes
+        #print tri_full_flag
+        #print tri_l2g
+        #print ftri_l2g
+    
+        g_volumes[ftri_l2g] = num.compress(tri_full_flag,l_volumes,axis=0)
+
+
+
 
         #g_x[node_l2g] = fid.variables['x']
@@ -266 +287 @@
         
 
-        print number_of_timesteps
+        #print number_of_timesteps
         
         # Read in static quantities
@@ -277 +298 @@
         for quantity in dynamic_quantities:
             q = fid.variables[quantity]
-            print q.shape
+            #print q.shape
             for i in range(number_of_timesteps):
                 out_d_quantities[quantity][i][node_l2g] = \
@@ -291 +312 @@
     # Write out the SWW file
     #---------------------------
-    print g_points.shape
-
-    print number_of_global_triangles
-    print number_of_global_nodes
+    #print g_points.shape
+
+    #print number_of_global_triangles
+    #print number_of_global_nodes
 
 
@@ -341 +362 @@
 
                                         
-    print out_s_quantities
-    print out_d_quantities
-    
-    print g_x
-    print g_y
+    #print out_s_quantities
+    #print out_d_quantities
+    
+    #print g_x
+    #print g_y
 
     #print g_volumes
@@ -374 +395 @@
 
     try:
-        sww_merge(domain_global_name, np, verbose)
+        sww_merge_parallel(domain_global_name, np, verbose)
     except:
         msg = 'ERROR: When merging sww files %s '% domain_global_name