Changeset 8278

Timestamp:

Dec 8, 2011, 11:13:04 PM (13 years ago)

Author:

steve

Message:

sww_merge now saves as float32

Location:

trunk/anuga_core/source/anuga

Files:

• file/sww.py (modified) (2 diffs)
• utilities/sww_merge.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/file/sww.py

@@ -655 +655 @@
         y =  points[:,1]
 
+        x = x.astype(netcdf_float32)
+        y = y.astype(netcdf_float32)
+        
+
         if verbose:
             log.critical('------------------------------------------------')
@@ -668 +672 @@
             log.critical('------------------------------------------------')
 
-        outfile.variables['x'][:] = points[:,0] #- geo_ref.get_xllcorner()
-        outfile.variables['y'][:] = points[:,1] #- geo_ref.get_yllcorner()
+
+        outfile.variables['x'][:] = x #- geo_ref.get_xllcorner()
+        outfile.variables['y'][:] = y #- geo_ref.get_yllcorner()
         outfile.variables['volumes'][:] = volumes.astype(num.int32) #On Opteron 64
 

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

@@ -66 +66 @@
             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;
@@ -136 +113 @@
     points = [[xx, yy] for xx, yy in zip(x, y)]
 
-    points = num.asarray(points, dtype='f')
-    print points
+    points = num.asarray(points).astype(netcdf_float32)
+
     fid.close()