Changeset 8277

Timestamp:

Dec 8, 2011, 6:40:28 PM (12 years ago)

Author:

steve

Message:

Trying to fix sww_merge.py

Location:

trunk/anuga_core/source

Files:

• anuga/utilities/sww_merge.py (modified) (6 diffs)
• anuga_parallel/run_parallel_sw_merimbula.py (modified) (2 diffs)

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

@@ -7 +7 @@
 
 from Scientific.IO.NetCDF import NetCDFFile
-from anuga.config import netcdf_mode_r, netcdf_mode_w, \
-                            netcdf_mode_a, netcdf_float
+from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
+from anuga.config import netcdf_float, netcdf_float32, netcdf_int
 from anuga.file.sww import SWW_file, Write_sww
 
@@ -49 +49 @@
     
         fid = NetCDFFile(filename, netcdf_mode_r)
+
+        
+        
         tris = fid.variables['volumes'][:]       
          
@@ -58 +61 @@
             out_s_quantities = {}
             out_d_quantities = {}
+
+
+            xllcorner = fid.xllcorner
+            yllcorner = fid.yllcorner
+
+            print 'zone',fid.zone
+
+            print """
+            fid.order
+            fid.xllcorner;
+            fid.yllcorner ;
+            fid.zone;
+            fid.false_easting;
+            fid.false_northing;
+            fid.datum;
+            fid.projection;
+            """
+
+
+            print fid.order
+            print fid.xllcorner;
+            print fid.yllcorner ;
+            print fid.zone;
+            print fid.false_easting;
+            print fid.false_northing;
+            print fid.datum;
+            print fid.projection;
+
+            order      = fid.order
+            xllcorner  = fid.xllcorner;
+            yllcorner  = fid.yllcorner ;
+            zone       = fid.zone;
+            false_easting  = fid.false_easting;
+            false_northing = fid.false_northing;
+            datum      = fid.datum;
+            projection = fid.projection;
+
             
             for quantity in static_quantities:
@@ -95 +135 @@
     # Mash all points into a single big list    
     points = [[xx, yy] for xx, yy in zip(x, y)]
+
+    points = num.asarray(points, dtype='f')
+    print points
     fid.close()
-    
+
+    #---------------------------
     # Write out the SWW file
+    #---------------------------
 
     if verbose:
@@ -107 +152 @@
                              len(points),
                              description=description,
-                             sww_precision=netcdf_float)
-
-
+                             sww_precision=netcdf_float32)
+
+
+    
+    
     sww.store_triangulation(fido, points, out_tris)
+
+    fido.order      = order
+    fido.xllcorner  = xllcorner;
+    fido.yllcorner  = yllcorner ;
+    fido.zone       = zone;
+    fido.false_easting  = false_easting;
+    fido.false_northing = false_northing;
+    fido.datum      = datum;
+    fido.projection = projection;
        
     sww.store_static_quantities(fido, verbose=verbose, **out_s_quantities)
@@ -118 +174 @@
         q_values = out_d_quantities[q]
         for i, time_slice in enumerate(q_values):
-            fido.variables[q][i] = num.array(time_slice, netcdf_float)
+            fido.variables[q][i] = num.array(time_slice, netcdf_float32)
         
         # This updates the _range values

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -78 +78 @@
 
 if myid == 0 and verbose: print 'DISTRIBUTING DOMAIN'
-domain = distribute(domain,verbose=True)
+domain = distribute(domain)
 
 #domain.smooth = False
@@ -119 +119 @@
 # Merge the individual sww files into one file
 #--------------------------------------------------
-domain.sww_merge(verbose=True)
+domain.sww_merge()
 
 finalize()