Changeset 8782

Timestamp:

Mar 27, 2013, 8:59:02 PM (12 years ago)

Author:

steve

Message:

Fixed up a few errors when running test_all on windows using scientific python

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• file/sww.py (modified) (5 diffs)
• file_conversion/dem2pts.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -274 +274 @@
         # Test the assumption that all full triangles are stored before
         # the ghost triangles.
-        if not num.allclose(self.tri_full_flag[:self.number_of_full_nodes], 1):
-            log.critical('WARNING: Not all full triangles are stored before '
-                             'ghost triangles')
+        #if not num.allclose(self.tri_full_flag[:self.number_of_full_nodes], 1):
+        #    log.critical('WARNING: Not all full triangles are stored before '
+        #                     'ghost triangles')
 
         # Defaults

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

@@ -697 +697 @@
         outfile.variables['volumes'][:] = volumes
 
-        outfile.sync()
+
 
 
@@ -743 +743 @@
         outfile.variables['tri_full_flag'][:] = tri_full_flag.astype(num.int32)
 
-
-        outfile.sync()
 
 
@@ -794 +792 @@
 
                     
-        outfile.sync()
         
         
@@ -864 +861 @@
 
 
-        outfile.sync()
 
         
@@ -940 +936 @@
     #ymomentum = fid.variables['ymomentum']      # Momentum in the y-direction
 
-    starttime = fid.starttime
+    starttime = float(fid.starttime)
     #starttime = fid.starttime[0]
     volumes = fid.variables['volumes'][:]       # Connectivity

trunk/anuga_core/source/anuga/file_conversion/dem2pts.py

@@ -86 +86 @@
     if verbose: log.critical('Reading DEM from %s' % (name_in))
 
-    ncols = infile.ncols
-    nrows = infile.nrows
-    xllcorner = infile.xllcorner  # Easting of lower left corner
-    yllcorner = infile.yllcorner  # Northing of lower left corner
-    cellsize = infile.cellsize
-    NODATA_value = infile.NODATA_value
+    ncols = int(infile.ncols)
+    nrows = int(infile.nrows)
+    xllcorner = float(infile.xllcorner)  # Easting of lower left corner
+    yllcorner = float(infile.yllcorner)  # Northing of lower left corner
+    cellsize = float(infile.cellsize)
+    NODATA_value = float(infile.NODATA_value)
+
     dem_elevation = infile.variables['elevation']
 
-    zone = infile.zone
-    false_easting = infile.false_easting
-    false_northing = infile.false_northing
+    zone = int(infile.zone)
+    false_easting = float(infile.false_easting)
+    false_northing = float(infile.false_northing)
+
+    #print ncols, nrows, xllcorner,yllcorner, cellsize, NODATA_value, zone
+
 
     # Text strings
@@ -102 +106 @@
     datum = infile.datum
     units = infile.units
+
+    #print projection, datum, units
 
     # Get output file
@@ -124 +130 @@
     if northing_min is None: northing_min = yllcorner
     if northing_max is None: northing_max = yllcorner + nrows*cellsize
+
+
+    #print easting_min, easting_max, northing_min, northing_max
 
     # Compute offsets to update georeferencing
@@ -235 +244 @@
                and northing_min <= y <= northing_max \
                and dem_elevation_r[i,j] != NODATA_value:
+
+                #print [x-easting_min, y-northing_min]
+                #print x , y
+                #print easting_min, northing_min
+                #print xllcorner, yllcorner
+                #print cellsize
+                
                 tpoints[local_index, :] = [x-easting_min, y-northing_min]
                 telev[local_index] = dem_elevation_r[i, j]