Changeset 631 for inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py

Timestamp:

Nov 26, 2004, 12:23:25 PM (20 years ago)

Author:

duncan

Message:

user can choose the quantity to interpolate

File:

• inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py

@@ -159 +159 @@
 
         #print "self.domain.filename",self.domain.filename
-        interp = Interpolate_sww(sww.filename)
+        interp = Interpolate_sww(sww.filename, 'height')
         
         assert allclose(interp.time,[0.0,2.0])
-        answer = [ 0.15, 0.1, 0., -0.3, -0.35, -0.4, -0.7, -0.8, -0.850]
+
+        #answer = [ 0.15, 0.1, 0., -0.3, -0.35, -0.4, -0.7, -0.8, -0.850]
         #print "answer",answer
         #print interp.stage[0]
-        stage_t = transpose(interp.stage)
-        assert allclose(stage_t[0], answer)
-        assert allclose(stage_t[1],stage_t[0])
+        #stage_t = transpose(interp.stage)
+        #assert allclose(stage_t[0], answer)
+        #assert allclose(stage_t[1],stage_t[0])
 
         # create an .xya file
@@ -177 +178 @@
         interp.interpolate_xya(point_file)
 
-
         answer = [[0.08, 0.08], [0.02, 0.02], [0.14, 0.14], [.08,.08]]
         #print "answer",answer
-        assert allclose(interp.depth,answer)
+        assert allclose(interp.interpolated_quantity,answer)
 
         # create an output .xya file
@@ -190 +190 @@
 
         assert allclose(interp.point_coordinates, xya_dict['pointlist'])
-        assert allclose(interp.depth,
+        assert allclose(interp.interpolated_quantity,
                         xya_dict['pointattributelist'] )
         
@@ -198 +198 @@
         time_list = []
 
-        # this is if titles start with x,y
-        #answer = string_list.pop(0)
-        #self.failUnless( answer == 'x', 'Title is wrong!')
-        #self.failUnless( string_list.pop(0) == 'y', 'Title is wrong!')
-        
-        for time in string_list:
-            time_list.append(float(time))
-        #print "interp.time", interp.time
-        #print "time_list", time_list
-        assert allclose(interp.time,
-                        time_list)
-        
-        
+        # Try another quantity      
+        interp = Interpolate_sww(sww.filename, 'stage')
+        interp.interpolate_xya(point_file)
+
+        answer = [[0.08, 0.08], [0.02, 0.02], [0.14, 0.14], [-.32,-.32]]
+        #print "answer",answer
+        assert allclose(interp.interpolated_quantity,answer)
+
+        
+        # look at error catching
+        try:
+            interp = Interpolate_sww(sww.filename, 'funky!')
+        except KeyError:
+            pass
+        else:
+            self.failUnless(0==1,
+                        'bad key did not raise an error!')
+        
+        # look at error catching
+        try:
+            interp = Interpolate_sww(sww.filename, 'z')
+        except KeyError:
+            pass
+        else:
+            self.failUnless(0==1,
+                        'bad key did not raise an error!')
+                
         #Cleanup
         os.remove(sww.filename)