Changeset 7520

Timestamp:

Sep 21, 2009, 7:19:55 PM (15 years ago)

Author:

steve

Message:

Improved the fix to sww2dem. Using numpy.savetxt instead of num.array2string

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (6 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2487 +2487 @@
         # change printoptions so that a long string of zeros in not
         # summarized as [0.0, 0.0, 0.0, ... 0.0, 0.0, 0.0]
-        printoptions = num.get_printoptions()
-        num.set_printoptions(threshold=sys.maxint)
-
+        #printoptions = num.get_printoptions()
+        #num.set_printoptions(threshold=sys.maxint)
+
+        format = '%.'+'%g' % number_of_decimal_places +'e'
         for i in range(nrows):
             if verbose and i % ((nrows+10)/10) == 0:
@@ -2497 +2498 @@
 
             slice = grid_values[base_index:base_index+ncols]
-            #s = array2string(slice, max_line_width=sys.maxint)
-
-            s = num.array2string(slice, max_line_width=sys.maxint,
-                                 precision=number_of_decimal_places)
-            ascid.write(s[1:-1] + '\n')
-
-        num.set_printoptions(threshold=printoptions['threshold'])
+
+            num.savetxt(ascid, slice.reshape(1,ncols), format, ' ' )
+            
         
         #Close

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -2106 +2106 @@
     def test_sww2dem_larger_zero(self):
         """Test that sww information can be converted correctly to asc/prj
-        format readable by e.g. ArcView. Here:
-
-        ncols         11
-        nrows         11
+        format readable by e.g. Arcview. This example has rows with a
+        large number of zeros
+
+        ncols         2001
+        nrows         2
         xllcorner     308500
         yllcorner     6189000
-        cellsize      10.000000
+        cellsize      1.000000
         NODATA_value  -9999
-        -100 -110 -120 -130 -140 -150 -160 -170 -180 -190 -200
-         -90 -100 -110 -120 -130 -140 -150 -160 -170 -180 -190
-         -80  -90 -100 -110 -120 -130 -140 -150 -160 -170 -180
-         -70  -80  -90 -100 -110 -120 -130 -140 -150 -160 -170
-         -60  -70  -80  -90 -100 -110 -120 -130 -140 -150 -160
-         -50  -60  -70  -80  -90 -100 -110 -120 -130 -140 -150
-         -40  -50  -60  -70  -80  -90 -100 -110 -120 -130 -140
-         -30  -40  -50  -60  -70  -80  -90 -100 -110 -120 -130
-         -20  -30  -40  -50  -60  -70  -80  -90 -100 -110 -120
-         -10  -20  -30  -40  -50  -60  -70  -80  -90 -100 -110
-           0  -10  -20  -30  -40  -50  -60  -70  -80  -90 -100
-
+        0.0 ....
         """
 
@@ -2133 +2123 @@
         #Setup
 
-        from mesh_factory import rectangular
+        from mesh_factory import rectangular_cross
 
         #Create basic mesh (100m x 100m)
-        points, vertices, boundary = rectangular(2, 2, 100, 100)
+        points, vertices, boundary = rectangular_cross(2000, 1, 2000.0, 1.0)
 
         #Create shallow water domain
@@ -2170 +2160 @@
         sww.store_timestep()
 
-        # Set theshold for printoptions to somrthing small
-        # to pickup Rudy's error caused a long sequence of zeros printing
-        # as [ 0.0, 0.0, 0.0, ... 0.0, 0.0, 0.0] by num.array2string
-        printoptions = num.get_printoptions()
-        num.set_printoptions(threshold=9)
-        
-        cellsize = 10  #10m grid
+        cellsize = 1.0  #0.1 grid
 
 
@@ -2207 +2191 @@
         prjid.close()
 
+
         L = lines[0].strip().split()
         assert L[0].strip().lower() == 'projection'
@@ -2248 +2233 @@
         ascid.close()
 
+
+
         L = lines[0].strip().split()
         assert L[0].strip().lower() == 'ncols'
-        assert L[1].strip().lower() == '11'
+        assert L[1].strip().lower() == '2001'
 
         L = lines[1].strip().split()
         assert L[0].strip().lower() == 'nrows'
-        assert L[1].strip().lower() == '11'
+        assert L[1].strip().lower() == '2'
 
         L = lines[2].strip().split()
@@ -2286 +2273 @@
 
 
-        num.set_printoptions(threshold=printoptions['threshold'])
         #Cleanup
         os.remove(prjfile)