Changeset 5279


Ignore:
Timestamp:
May 6, 2008, 3:54:38 PM (16 years ago)
Author:
herve
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

    r5275 r5279  
    249249        tsunami = Quantity(domain)
    250250        tsunami.set_values(Ts)
     251<<<<<<< .mine
     252        interpolation_points=[]
     253=======
    251254
    252255        #k=0.0
     
    265268        # Here's a faster way - try that in the first test
    266269        interpolation_points=[]
     270>>>>>>> .r5278
    267271        k=0.0
    268272        for i in range(0,6):
     
    275279            k=k+4000
    276280
     281<<<<<<< .mine
    277282        Z=tsunami.get_values(interpolation_points=interpolation_points,
    278283                             location='edges')
     284
     285        stage = -Z # FIXME(Ole): Why the sign flip?
     286                   # Displacement in fortran code is looking downward
     287        #print 'c est fini'
     288        #print tmp
     289        #print 'hello',stage   
     290        assert allclose(stage,tmp,atol=1.e-3)
     291=======
     292        Z=tsunami.get_values(interpolation_points=interpolation_points,
     293                             location='edges')
     294>>>>>>> .r5278
    279295
    280296        stage = -Z # FIXME(Ole): Why the sign flip?
Note: See TracChangeset for help on using the changeset viewer.