Changeset 5239

Timestamp:

Apr 24, 2008, 12:01:15 PM (16 years ago)

Author:

herve

Message:

following Rajaraman advices to make the code more efficient

Location:

anuga_core/source/anuga/shallow_water

Files:

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

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -1 +1 @@
 import unittest
 from Numeric import allclose
-from tsunami_okada import earthquake_tsunami,Okada_func
+from tsunami_okada_V2 import earthquake_tsunami,Okada_func
 
 class Test_eq(unittest.TestCase):
@@ -113 +113 @@
         
         #create variable with elevation data to implement in okada
-        zrec = Quantity(domain)
-        zrec.set_values(topography)
-        
+        zrec0 = Quantity(domain)
+        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, \
@@ -241 +242 @@
         domain.set_name('test')
         domain.set_quantity('elevation',topography)
-        zrec = Quantity(domain)
-        zrec.set_values(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,\

anuga_core/source/anuga/shallow_water/tsunami_okada.py

@@ -139 +139 @@
         dislocation = self.slip
         ns=self.ns
-        zreci=self.zrec
+        zrec=self.zrec
         #initialization
         disp0=zeros(3,Float)
@@ -199 +199 @@
         #Z=-zrec
         eps = 1.0e-6
+    
 #
         for irec in range(0,N):
             xrec=y
             yrec=x
-            zrec=zreci.get_values(interpolation_points=[[xrec[irec],yrec[irec]]],location='edges')
-            Z=zrec[0]
+            for i in range(0,len(zrec[0])):
+                if zrec[0][i]==yrec and zrec[1][i]==xrec:
+                    Z=zrec[2][i]
+                    break
+                else: continue
+            #zrec=zreci.get_values(interpolation_points=[[xrec[irec],yrec[irec]]],location='edges')
+            
             for ist in range(0,ns):
                 #st = radians(strikes[ist])