Changeset 5309

Timestamp:

May 12, 2008, 12:20:39 PM (17 years ago)

Author:

ole

Message:

Reverted tsunami Okada (svn merge -r 5293:5292 test_tsunami_okada.py)
and made it run both tests

File:

• anuga_core/source/anuga/shallow_water/test_tsunami_okada.py (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -127 +127 @@
         # get vertical displacement at each point of the domain respecting
         # original script's order
+        interpolation_points=[]
         k=0.0
         for i in range(0,6):
@@ -133 +134 @@
                 Yt=p
                 Xt=k
-                Z=tsunami.get_values(interpolation_points=[[Xt,Yt]]
-                                     ,location='edges')
-                stage.append(-Z[0])
+                interpolation_points.append([Xt, Yt])
+
             k=k+4000
+        Z=tsunami.get_values(interpolation_points=interpolation_points,
+                             location='edges')
         
         assert allclose(stage,tmp,atol=1.e-8)
-        #print stage
+        print stage
+        print tmp
         print 'c est fini'
 
@@ -155 +158 @@
         rectangular sources
         """
-        print 'ca commence'
+
         #get path where this test is run
         path= get_pathname_from_package('anuga.shallow_water')
@@ -226 +229 @@
 
          
-        #create domain 
+        # Create domain 
         dx = dy = 4000
         l=20000
         w=20000
-        #create topography
+        
+        # Create topography
         def topography(x,y):
             el=-1000
@@ -244 +248 @@
                                 domain=domain, verbose=False)
         
-        #create a variable to store vertical displacement throughout the domain
+        # Create a variable to store vertical displacement throughout the domain
         tsunami = Quantity(domain)
         tsunami.set_values(Ts)
+        interpolation_points=[]
+
+        #k=0.0
+        #for i in range(0,6):
+        #    for j in range(0,6):
+        #        p=j*4000
+        #        Yt=p
+        #        Xt=k
+        #        Z=tsunami.get_values(interpolation_points=[[Xt,Yt]]
+        #                             ,location='edges')
+        #        stage.append(-Z[0])
+        #    k=k+4000
+        #
+        #assert allclose(stage,tmp,atol=1.e-3)
+
+        # Here's a faster way - try that in the first test
         interpolation_points=[]
         k=0.0
@@ -257 +277 @@
 
             k=k+4000
-
         Z=tsunami.get_values(interpolation_points=interpolation_points,
                              location='edges')
@@ -268 +287 @@
         assert allclose(stage,tmp,atol=1.e-3)
 
-        
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_eq,'test_Okada_func')
-    suite = unittest.makeSuite(Test_eq,'test_earthquake_tsunami')
+    suite = unittest.makeSuite(Test_eq,'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)