Changeset 3416

Timestamp:

Jul 25, 2006, 1:44:50 PM (19 years ago)

Author:

duncan

Message:

finish interpolating sww to csv file function

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (1 diff)
• test_interpolate.py (modified) (5 diffs)

inundation/fit_interpolate/interpolate.py

@@ -330 +330 @@
                 else:
                     velocity = 0
-                    
-            print "depth",depth
-            print "velocity",velocity 
             depths.append(depth)
             velocitys.append(velocity)

inundation/fit_interpolate/test_interpolate.py

@@ -11 +11 @@
 from math import sqrt
 import tempfile
+import csv
 
 from Scientific.IO.NetCDF import NetCDFFile
@@ -1353 +1354 @@
             self.failUnless( z[i,0] == answer[11,0], 'Fail!')
 
-    def ztest_interpolate_sww2csv(self):
+    def test_interpolate_sww2csv(self):
 
         def elevation_function(x, y):
@@ -1377 +1378 @@
         domain.set_quantity('elevation', elevation_function)
         domain.set_quantity('friction', 0.03)
-        domain.set_quantity('xmomentum', 10.0)
-        domain.set_quantity('ymomentum', 100.0)
+        domain.set_quantity('xmomentum', 3.0)
+        domain.set_quantity('ymomentum', 4.0)
 
         ######################
@@ -1400 +1401 @@
         sww.store_connectivity()
         sww.store_timestep(['stage', 'xmomentum', 'ymomentum'])
-        domain.set_quantity('stage', -1.0)
+        domain.set_quantity('stage', 10.0) # This is automatically limmited
+        # so it will not be less than the elevation
         domain.time = 2.
         sww.store_timestep(['stage', 'xmomentum', 'ymomentum'])
@@ -1406 +1408 @@
         # test the function
         points = [[5.0,1.],[0.5,2.]]
-        interpolate_sww2csv(sww.filename, points, "aa.csv", "bb.csv")
-
-        print "sww.filename",sww.filename 
-        #os.remove(sww.filename)
+        depth_file = tempfile.mktemp(".csv") 
+        velocity_file = tempfile.mktemp(".csv") 
+        interpolate_sww2csv(sww.filename, points, depth_file, velocity_file,
+                            verbose=False)
+
+        depth_answers_array = [[6.0, 1.5], [15., 10.5]] 
+        velocity_answers_array = [[5./6.0, 5./1.5], [5./15., 5./10.5]]
+        depth_reader = csv.reader(file(depth_file))
+        depth_reader.next()
+        velocity_reader = csv.reader(file(velocity_file))
+        velocity_reader.next()
+        for depths, velocitys, depth_answers, velocity_answers in map(None,
+                                              depth_reader,
+                                              velocity_reader,
+                                              depth_answers_array,
+                                              velocity_answers_array):
+            for i in range(len(depths)):
+                #print "depths",depths[i] 
+                #print "depth_answers",depth_answers[i]
+                #print "velocitys",velocitys[i] 
+                #print "velocity_answers_array", velocity_answers[i]
+                msg = 'Interpolation failed'
+                assert allclose(float(depths[i]), depth_answers[i]), msg
+                assert allclose(float(velocitys[i]), velocity_answers[i]), msg
+        
+        #print "sww.filename",sww.filename 
+        os.remove(sww.filename)
 #-------------------------------------------------------------
 if __name__ == "__main__":