Changeset 5283

Timestamp:

May 6, 2008, 4:33:10 PM (17 years ago)

Author:

herve

Message:

changes made according to Ole's suggestion reducing considerably computation time.

File:

• anuga_core/source/anuga/shallow_water/test_tsunami_okada.py (modified) (6 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)
@@ -249 +251 @@
         tsunami = Quantity(domain)
         tsunami.set_values(Ts)
-<<<<<<< .mine
         interpolation_points=[]
-=======
 
         #k=0.0
@@ -268 +268 @@
         # Here's a faster way - try that in the first test
         interpolation_points=[]
->>>>>>> .r5278
         k=0.0
         for i in range(0,6):
@@ -278 +277 @@
 
             k=k+4000
-
-<<<<<<< .mine
         Z=tsunami.get_values(interpolation_points=interpolation_points,
                              location='edges')
@@ -289 +286 @@
         #print 'hello',stage   
         assert allclose(stage,tmp,atol=1.e-3)
-=======
-        Z=tsunami.get_values(interpolation_points=interpolation_points,
-                             location='edges')
->>>>>>> .r5278
-
-        stage = -Z # FIXME(Ole): Why the sign flip?
-        
-        assert allclose(stage, tmp, atol=1.e-3)
 
 #-------------------------------------------------------------