Changeset 8715

Timestamp:

Feb 22, 2013, 5:28:56 PM (12 years ago)

Author:

steve

Message:

Getting rid of a unit test error on test_gauge

File:

• trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_gauge.py (modified) (5 diffs)

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

@@ -384 +384 @@
         point1_answers_array = [[0.0,0.0,1.0,3.0,-2.0,3.0,4.0], [2.0,2.0/3600.,10.0,12.0,-2.0,3.0,4.0]]
         point1_filename = 'gauge_point1.csv'
-        point1_handle = file(point1_filename)
+        point1_handle = open(point1_filename)
         point1_reader = reader(point1_handle)
         point1_reader.next()
@@ -397 +397 @@
         point2_answers_array = [[0.0,0.0,1.0,5.0,-4.0,3.0,4.0], [2.0,2.0/3600.,10.0,14.0,-4.0,3.0,4.0]]
         point2_filename = 'gauge_point2.csv' 
-        point2_handle = file(point2_filename)
+        point2_handle = open(point2_filename)
         point2_reader = reader(point2_handle)
         point2_reader.next()
@@ -471 +471 @@
         # Create two sww files with timestep at end. These are to be
         # stored consecutively in the gauge csv files
-        basename='datatest'
+        basename='datatest1'
         domain.set_name(basename) 
         self._create_sww(stage=10.,timestep=timestep)
@@ -501 +501 @@
 
         point1_answers_array = [[0.0,1.0,-5.0], [2.0,10.0,-5.0],[4.0,10.0,-5.0],
-                                [6.0,20.0,-5.0]]
+                                [6.0,20.0,-5.0], [0.0,1.0,-5.0]]
         point1_filename = 'gauge_point1.csv'
         point1_handle = file(point1_filename)
@@ -511 +511 @@
             # note the 'hole' (element 1) below - skip the new 'hours' field
             line.append([float(row[0]),float(row[2]),float(row[3])])
+            #print 'i', i
+            #print 'row',row
             #print 'line',line[i],'point1',point1_answers_array[i]
             assert num.allclose(line[i], point1_answers_array[i])
 
         point2_answers_array = [[0.0,1.0,-0.5], [2.0,10.0,-0.5],[4.0,10.0,-0.5],
-                                [6.0,20.0,-0.5]]
+                                [6.0,20.0,-0.5], [0.0,1.0,-0.5]]
         point2_filename = 'gauge_point2.csv' 
         point2_handle = file(point2_filename)