Changeset 5279

Timestamp:

May 6, 2008, 3:54:38 PM (17 years ago)

Author:

herve

Message:

 

File:

• anuga_core/source/anuga/shallow_water/test_tsunami_okada.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -249 +249 @@
         tsunami = Quantity(domain)
         tsunami.set_values(Ts)
+<<<<<<< .mine
+        interpolation_points=[]
+=======
 
         #k=0.0
@@ -265 +268 @@
         # Here's a faster way - try that in the first test
         interpolation_points=[]
+>>>>>>> .r5278
         k=0.0
         for i in range(0,6):
@@ -275 +279 @@
             k=k+4000
 
+<<<<<<< .mine
         Z=tsunami.get_values(interpolation_points=interpolation_points,
                              location='edges')
+
+        stage = -Z # FIXME(Ole): Why the sign flip?
+                   # Displacement in fortran code is looking downward
+        #print 'c est fini'
+        #print tmp
+        #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?