Changeset 5252

Timestamp:

Apr 30, 2008, 9:35:06 AM (16 years ago)

Author:

herve

Message:

new definition for zrec
change sign for displacement

Location:

anuga_core/source/anuga/shallow_water

Files:

• test_tsunami_okada.py (modified) (7 diffs)
• tsunami_okada.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -51 +51 @@
             filename = path+sep+'fullokada_SS.txt'
         # initial condition of earthquake for multiple source
-            x0 = 7000.0
-            y0 = 10000.0
-            length = 10.0
-            width =6.0
-            strike = 0.0
-            depth = 15.0
-            slip = 10.0
+            x0 = 50000.0
+            y0 = 25000.0
+            length = 50.0
+            width =10.0
+            strike = 0.0
+            depth = 10.0
+            slip = 30.0
             dip =15.0
             rake =90.0
@@ -99 +99 @@
         #create domain 
         dx = dy = 4000
-        l=20000
-        w=20000
+        l=100000
+        w=100000
         #create topography
         def topography(x,y):
-            el=-1.000
+            el=-1000
             return el
         
@@ -114 +114 @@
         #create variable with elevation data to implement in okada
         zrec0 = Quantity(domain)
-        zrec0.set_values(topography)
+        zrec0.set_values(0.0)
         zrec=zrec0.get_vertex_values(xy=True)
         # call okada
@@ -135 +135 @@
                 Z=tsunami.get_values(interpolation_points=[[Xt,Yt]]
                                      ,location='edges')
-                stage.append(Z[0])
+                stage.append(-Z[0])
             k=k+4000
         
@@ -232 +232 @@
         #create topography
         def topography(x,y):
-            el=-1.000
+            el=-1000
             return el
         
@@ -241 +241 @@
         domain.set_quantity('elevation',topography)
         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,\
+                                depth=depth,dip=dip, xi=x0, yi=y0,z0=0, slip=slip, rake=rake,\
                                 domain=domain, verbose=True)
         
@@ -255 +255 @@
                 Z=tsunami.get_values(interpolation_points=[[Xt,Yt]]
                                      ,location='edges')
-                stage.append(Z[0])
+                stage.append(-Z[0])
             k=k+4000
 
         print tmp
-        print 'hello'
-        print stage    
+        print 'hello',stage   
         assert allclose(stage,tmp,atol=1.e-3)
 

anuga_core/source/anuga/shallow_water/tsunami_okada.py

@@ -19 +19 @@
  x0      x origin (0)
  y0      y origin (0)
+ z0      z origin
  slip    metres of fault slip (1)
  rake    angle of slip (w.r.t. horizontal) in fault plane (90 degrees)
- zrec    elevation(m)
-         obtained as followed:
-         zrec0 = Quantity(domain)
-         zrec0.set_values(topography)
-         zrec=zrec0.get_vertex_values(xy=True)
+      
 
 
@@ -34 +31 @@
 
 def earthquake_tsunami(ns,NSMAX,length, width, strike, depth,\
-                       dip, xi, yi, slip, rake,\
+                       dip, xi, yi,z0, slip, rake,\
                        domain=None, verbose=False):
 
-    
+    from anuga.abstract_2d_finite_volumes.quantity import Quantity
     from math import sin, radians
     from Numeric import zeros, Float
 
     #zrec0 = Quantity(domain)
-    zrec0=domain.get_quantity('elevation')
+    zrec0 = Quantity(domain)
+    zrec0.set_values(z0)
     zrec=zrec0.get_vertex_values(xy=True)
-
     
     x0= zeros(ns,Float)
@@ -341 +338 @@
                 for j in range(0,6):
                     strain[irec][j]= strain[irec][j] + strain0[j]
-            z.append(disp[irec][2])
+            z.append(-disp[irec][2])
         return z