Changeset 5244

Timestamp:

Apr 27, 2008, 2:30:49 PM (17 years ago)

Author:

herve

Message:

 

Location:

anuga_core/source/anuga/shallow_water

Files:

• test_tsunami_okada.py (modified) (12 diffs)
• tsunami_okada.py (modified) (4 diffs)

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -1 +1 @@
 import unittest
 from Numeric import allclose
-from tsunami_okada_V2 import earthquake_tsunami,Okada_func
+from tsunami_okada import earthquake_tsunami,Okada_func
 
 class Test_eq(unittest.TestCase):
@@ -41 +41 @@
             width =0
             strike = 0.0
-            depth = 15000.0
+            depth = 15.0
             slip = 10.0
             dip =15.0
@@ -56 +56 @@
             width =6.0
             strike = 0.0
-            depth = 15000.0
+            depth = 15.0
             slip = 10.0
             dip =15.0
@@ -73 +73 @@
             width =[6.0,6.0]
             strike = [0.0,0.0]
-            depth = [15000.0,15000.0]
+            depth = [15.0,15.0]
             slip = [10.0,10.0]
             dip = [15.0,15.0]
@@ -116 +116 @@
         zrec0.set_values(topography)
         zrec=zrec0.get_vertex_values(xy=True)
-        print zrec
         # call okada
         Ts= Okada_func(ns=ns, NSMAX=NSMAX,length=length, width=width, dip=dip, \
@@ -138 +137 @@
                 stage.append(Z[0])
             k=k+4000
-
-            
+        
         assert allclose(stage,tmp,atol=1.e-8)
-
-
+        print stage
+        print 'c est fini'
 
     def test_earthquake_tsunami(self):
@@ -153 +151 @@
         from anuga.utilities.system_tools import get_pathname_from_package
         """
-        Pick the test you want to dop; T= 0 test a point source,
+        Pick the test you want to do; T= 0 test a point source,
         T= 1  test single rectangular source, T= 2 test multiple
         rectangular sources
         """
-        
+        print 'ca commence'
         #get path where this test is run
         path= get_pathname_from_package('anuga.shallow_water')
@@ -174 +172 @@
             width =0
             strike = 0.0
-            depth = 15000.0
+            depth = 15.0
             slip = 10.0
             dip =15.0
@@ -189 +187 @@
             width =6.0
             strike = 0.0
-            depth = 15000.0
+            depth = 15.0
             slip = 10.0
             dip =15.0
@@ -206 +204 @@
             width =[6.0,6.0]
             strike = [0.0,0.0]
-            depth = [15000.0,15000.0]
+            depth = [15.0,15.0]
             slip = [10.0,10.0]
             dip = [15.0,15.0]
@@ -242 +240 @@
         domain.set_name('test')
         domain.set_quantity('elevation',topography)
-        zrec0 = Quantity(domain)
-        zrec0.set_values(topography)
-        zrec=zrec0.get_vertex_values(xy=True)
         Ts = earthquake_tsunami(ns=ns,NSMAX=NSMAX,length=length, width=width, strike=strike,\
                                 depth=depth,dip=dip, xi=x0, yi=y0, slip=slip, rake=rake,\
-                                zrec=zrec,domain=domain, verbose=False)
+                                domain=domain, verbose=True)
         
         #create a variable to store vertical displacement throughout the domain
@@ -263 +258 @@
             k=k+4000
 
-            
-        assert allclose(stage,tmp,atol=1.e-8)
+        print tmp
+        print 'hello'
+        print stage    
+        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_Okada_func')
+    suite = unittest.makeSuite(Test_eq,'test_earthquake_tsunami')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/shallow_water/tsunami_okada.py

@@ -21 +21 @@
  slip    metres of fault slip (1)
  rake    angle of slip (w.r.t. horizontal) in fault plane (90 degrees)
- zrec    elevation(km)
+ zrec    elevation(m)
          obtained as followed:
          zrec0 = Quantity(domain)
@@ -35 +35 @@
 def earthquake_tsunami(ns,NSMAX,length, width, strike, depth,\
                        dip, xi, yi, slip, rake,\
-                       zrec,domain=None, verbose=False):
-
+                       domain=None, verbose=False):
+
+    
     from math import sin, radians
     from Numeric import zeros, Float
+
+    #zrec0 = Quantity(domain)
+    zrec0=domain.get_quantity('elevation')
+    zrec=zrec0.get_vertex_values(xy=True)
+
+    
     x0= zeros(ns,Float)
     y0= zeros(ns,Float)
@@ -213 +220 @@
                 if zrec[0][i]==yrec and zrec[1][i]==xrec:
                     Z=zrec[2][i]
+                    Z=0.001*Z
                     break
                 else: continue
@@ -242 +250 @@
                 X=0.001*((xrec[irec]-xs[ist])*csst+(yrec[irec]-ys[ist])*ssst)
                 Y=0.001*((xrec[irec]-xs[ist])*ssst-(yrec[irec]-ys[ist])*csst)
-                DEPTH=depths[ist]*0.001
+                DEPTH=depths[ist]
                 DIP=dips[ist]
                 if lengths[ist]==0 and widths[ist]== 0 :