Changeset 8467 for trunk/anuga_core/source/anuga

Timestamp:

Jul 11, 2012, 9:42:12 PM (12 years ago)

Author:

davies

Message:

Moving test_okada_tsunami.py to okada_tsunami_test.py to avoid
automated test run (requires fortran compilation to pass)

Location:

trunk/anuga_core/source/anuga/shallow_water

Files:

• okada_tsunami.py (modified) (1 diff)
• okada_tsunami_fortran.f (modified) (3 diffs)
• okada_tsunami_test.py (moved) (moved from trunk/anuga_core/source/anuga/shallow_water/test_okada_tsunami.py) (12 diffs)

trunk/anuga_core/source/anuga/shallow_water/okada_tsunami.py

@@ -265 +265 @@
     x_offset, y_offset = rotate_coordinates([eq_length/2.0, eq_surface_width/2.0], -(eq_strike-90.))
 
-    print x_offset, y_offset
+    #print x_offset, y_offset
     # Centriod values
     new_x = lower_left[0] + x_offset*1000.

trunk/anuga_core/source/anuga/shallow_water/okada_tsunami_fortran.f

@@ -14 +14 @@
       logical:: DEBUG
 c     Convenience flag for debugging -- will write various outputs to file
-      DEBUG=.TRUE. 
-      open(32, file='mylog.log')
-      write(32,*) ' MYLOGGINGZ'
+      DEBUG=.FALSE. 
    
 c      print*, 'IN FORTRAN'
@@ -22 +20 @@
       IF(DEBUG.eqv..TRUE.) THEN  
 
+          open(32, file='mylog.log')
+          write(32,*) ' MYLOGGINGZ'
 
           write(32,*) 'WRITING TO FILE'
@@ -119 +119 @@
  200  continue
 
-c      IF(DEBUG.eqv..TRUE.) THEN
+      IF(DEBUG.eqv..TRUE.) THEN
           close(32)
-c      END IF
+      END IF
       RETURN
       END

trunk/anuga_core/source/anuga/shallow_water/okada_tsunami_test.py

@@ -7 +7 @@
 import unittest, os
 import warnings
+from os import sep
 
 import anuga
 import okada_tsunami
 import numpy
+from anuga.utilities.system_tools import get_pathname_from_package
 
 class Test_okada_tsunami(unittest.TestCase):
@@ -24 +26 @@
         # These refer to earthquakes with strike = 0 and origin 0,0
         for j in range(2,3):
-            print 'Testing Case ', j
+            #print 'Testing Case ', j
 
             if(j==2):
@@ -76 +78 @@
             #d_cent = d - (W/2.)*numpy.sin(dip/180.*numpy.pi)
 
-            print 'x_cent, y_cent, d_cent = ', x_cent, y_cent, d_cent
+            #print 'x_cent, y_cent, d_cent = ', x_cent, y_cent, d_cent
             
             x_wanted=x*1000. # Desired values of x, y in m
@@ -86 +88 @@
                 dis2=slip*numpy.sin(rake/180.*numpy.pi)
                 dis3=0.
-                print 'dis1, dis2, dis3 = ', dis1, dis2, dis3
+                #print 'dis1, dis2, dis3 = ', dis1, dis2, dis3
                 
                 my_source=numpy.array([x_cent, y_cent, d_cent,strike, dip, L, W, dis1, dis2, dis3])
                 my_source=my_source.reshape((1,10))
                 
-                tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=True)
+                tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=False)
                 uz = tsu_funct(numpy.array([x_wanted]), numpy.array([y_wanted]))
               
@@ -108 +110 @@
             # Test cases 2 - 3 in Okada's table
             for j in range(2,4):
-                print 'Testing Case ', j
+                #print 'Testing Case ', j
                 if(j==2):
                     ##-------
@@ -161 +163 @@
                     my_source=my_source.reshape((1,10))
                     
-                    tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=True)
+                    tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=False)
                     uz = tsu_funct(numpy.array([x_wanted]), numpy.array([y_wanted]))
                   
@@ -187 +189 @@
                 # Loop over okada's test cases 2 and 3
                 for j in range(2,4):
-                    print 'Testing Case ', j, ' Rotation = ', rotation, ' origin = ', [okada_x_origin, okada_y_origin]
+                    #print 'Testing Case ', j, ' Rotation = ', rotation, ' origin = ', [okada_x_origin, okada_y_origin]
 
                     if(j==2):
@@ -253 +255 @@
                         abstol = abs(uz-okada_values[i])
                         assert ((reltol<1.0e-03)|(abstol<1.0e-06)), 'Okada_tsunami error for eq source: ' + str(my_source)
-                        print 'PASS'
+                        #print 'PASS'
 
 #
@@ -329 +331 @@
             
         # Tsunami function with     
-        tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=True)
+        tsu_funct = okada_tsunami.earthquake_source(my_source, verbose=False)
         uz = tsu_funct(numpy.array([x_wanted]), numpy.array([y_wanted]))
       
@@ -336 +338 @@
         abstol = abs(uz-okada_values[0])
         assert ((reltol<1.0e-03)|(abstol<1.0e-06))
-        print 'PASS'
+        #print 'PASS'
 
     def test_against_octave_code(self):
@@ -360 +362 @@
         source=numpy.array([0., 0., depth, strike,dip , length, width, dis1, dis2,0.0])
 
-        tsunami_fun=okada_tsunami.earthquake_source(source=source, verbose=True)
+        tsunami_fun=okada_tsunami.earthquake_source(source=source, verbose=False)
 
         # Make a grid
@@ -376 +378 @@
         ## Now read the same event from an octave code, which is completely
         ## independent of this one (i.e. they don't call okada's fortran)
-        octave=numpy.genfromtxt('okada_tsunami_octave_95.txt')
+        path=get_pathname_from_package('anuga.shallow_water')
+        octave=numpy.genfromtxt(path+sep+'okada_tsunami_octave_95.txt')
         octave_asvec=numpy.transpose(octave).reshape((1,101*101))