Changeset 5293

Timestamp:

May 8, 2008, 5:54:45 PM (17 years ago)

Author:

sexton

Message:

minor updates to okada function

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):
@@ -134 +133 @@
                 Yt=p
                 Xt=k
-                interpolation_points.append([Xt, Yt])
-
+                Z=tsunami.get_values(interpolation_points=[[Xt,Yt]]
+                                     ,location='edges')
+                stage.append(-Z[0])
             k=k+4000
-        Z=tsunami.get_values(interpolation_points=interpolation_points,
-                             location='edges')
         
         assert allclose(stage,tmp,atol=1.e-8)
-        print stage
-        print tmp
+        #print stage
         print 'c est fini'
 
@@ -158 +155 @@
         rectangular sources
         """
-
+        print 'ca commence'
         #get path where this test is run
         path= get_pathname_from_package('anuga.shallow_water')
@@ -229 +226 @@
 
          
-        # Create domain 
+        #create domain 
         dx = dy = 4000
         l=20000
         w=20000
-        
-        # Create topography
+        #create topography
         def topography(x,y):
             el=-1000
@@ -248 +244 @@
                                 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
@@ -277 +257 @@
 
             k=k+4000
+
         Z=tsunami.get_values(interpolation_points=interpolation_points,
                              location='edges')
@@ -287 +268 @@
         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')
+    suite = unittest.makeSuite(Test_eq,'test_earthquake_tsunami')
     runner = unittest.TextTestRunner()
     runner.run(suite)