Changeset 8707

Timestamp:

Feb 19, 2013, 5:16:51 PM (12 years ago)

Author:

steve

Message:

Weird problem with dem2pts on windows.

Location:

trunk/anuga_core/source/anuga/file_conversion

Files:

• dem2pts.py (modified) (2 diffs)
• test_dem2pts.py (modified) (2 diffs)

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

@@ -202 +202 @@
     elevation = outfile.variables['elevation']
 
+    # Number of points
+    N = points.shape[0]
+
     lenv = index2-index1+1
 
@@ -240 +243 @@
 
         if upper_index == lower_index + newcols:
+
             # Seems to be an error with the windows version of
             # Netcdf. The following gave errors
-            points[lower_index:upper_index, :] = tpoints
-            elevation[lower_index:upper_index] = telev
-            # so used the following
-            #for index in range(newcols):
-            #    points[index+lower_index, :] = tpoints[index,:]
-            #    elevation[index+lower_index] = telev[index]
+            try:
+                points[lower_index:upper_index, :] = tpoints
+                elevation[lower_index:upper_index] = telev
+            except:
+                # so used the following if an error occurs
+                for index in range(newcols):
+                    points[index+lower_index, :] = tpoints[index,:]
+                    elevation[index+lower_index] = telev[index]
 
     assert global_index == nopoints, 'index not equal to number of points'

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

@@ -139 +139 @@
 
         #Write test asc file
-        root = 'demtest'
+        root = 'demtest2'
 
         filename = root+'.asc'
@@ -267 +267 @@
 
         #Write test asc file
-        root = 'demtest'
+        root = 'demtest3'
 
         filename = root+'.asc'