Changeset 5601

Timestamp:

Aug 4, 2008, 12:08:33 PM (16 years ago)

Author:

ole

Message:

Cleaned up in tests and made directories independent on where the test is run from.

Files:

• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (3 diffs)
• anuga_core/source/anuga/shallow_water/test_tsunami_okada.py (modified) (8 diffs)
• anuga_core/source/anuga/shallow_water/urs_test_data/thinned_bound_order_test.txt (moved) (moved from anuga_core/source/anuga/shallow_water/thinned_bound_order_test.txt)
• anuga_work/development/boxingday08/run_boxingday_polyline.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -22 +22 @@
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from anuga.abstract_2d_finite_volumes.util import file_function
+
+from anuga.utilities.system_tools import get_pathname_from_package
 
 # This is needed to run the tests of local functions
@@ -6550 +6552 @@
             compress,zeros,fabs,take,size
         
-        ordering_filename='thinned_bound_order_test.txt'
-        testdir = 'urs_test_data'
+        # Get path where this test is run
+        path = get_pathname_from_package('anuga.shallow_water')        
+        
+        testdir = os.path.join(path, 'urs_test_data')
+        ordering_filename=os.path.join(testdir, 'thinned_bound_order_test.txt')
+        
+        
         sources = ['1-z.grd','2-z.grd','3-z.grd']
         
@@ -6759 +6766 @@
         # make sts file for combined sources
         weights = [1., 2., 3.]
-        ordering_filename='thinned_bound_order_test.txt'
-        testdir = 'urs_test_data'
+        
+        path = get_pathname_from_package('anuga.shallow_water')        
+                
+        testdir = os.path.join(path, 'urs_test_data')        
+        ordering_filename=os.path.join(testdir, 'thinned_bound_order_test.txt')
+
         urs_filenames = [os.path.join(testdir,'1-z.grd'),
                          os.path.join(testdir,'2-z.grd'),

anuga_core/source/anuga/shallow_water/test_tsunami_okada.py

@@ -24 +24 @@
         rectangular sources
         """
-        #get path where this test is run
+        # Get path where this test is run
         path = get_pathname_from_package('anuga.shallow_water')
-        #choose what test to proceed
+        
+        # Choose what test to proceed
         T = 1
         
 
-
         if T==0:
-            # fotran output file
-            
+            # Fortran output file            
             filename = path+sep+'fullokada_SP.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = 7000.0
             y0 = 10000.0
@@ -48 +48 @@
             NSMAX=1
         elif T==1:
-        # fotran output file
+            # Fortran output file        
             filename = path+sep+'fullokada_SS.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = 7000.0
             y0 = 10000.0
@@ -65 +66 @@
         elif T==2:
 
-        # fotran output file
+            # Fortran output file
             filename = path+sep+'fullokada_MS.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = [7000.0,10000.0]
             y0 = [10000.0,7000.0]
@@ -82 +84 @@
 
 
-        # get output file from original okada fortran script.
-        # vertical displacement is listed under tmp.
+        # Get output file from original okada fortran script.
+        # Vertical displacement is listed under tmp.
         polyline_file=open(filename,'r')
         lines=polyline_file.readlines()
@@ -160 +162 @@
         """
 
-        #get path where this test is run
+        # Get path where this test is run
         path= get_pathname_from_package('anuga.shallow_water')
         
-        #choose what test to proceed
+        # Choose what test to proceed
         T=1
 
         if T==0:
-        # fotran output file
-            
+            # Fortran output file
             filename = path+sep+'fullokada_SP.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = 7000.0
             y0 = 10000.0
@@ -183 +185 @@
             NSMAX=1
         elif T==1:
-        # fotran output file
+            # Fortran output file
             filename = path+sep+'fullokada_SS.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = 7000.0
             y0 = 10000.0
@@ -200 +203 @@
         elif T==2:
 
-        # fotran output file
+            # Fortran output file
             filename = path+sep+'fullokada_MS.txt'
-        # initial condition of earthquake for multiple source
+            
+            # Initial condition of earthquake for multiple source
             x0 = [7000.0,10000.0]
             y0 = [10000.0,7000.0]
@@ -217 +221 @@
 
 
-        # get output file from original okada fortran script.
-        # vertical displacement is listed under tmp.
+        # Get output file from original okada fortran script.
+        # Vertical displacement is listed under tmp.
         polyline_file=open(filename,'r')
         lines=polyline_file.readlines()

anuga_work/development/boxingday08/run_boxingday_polyline.py

@@ -136 +136 @@
 domain.set_minimum_storable_height(0.01)
 
-domain.tight_slope_limiters = 1
+domain.tight_slope_limiters = True
 domain.set_default_order(2)
 print 'domain.tight_slope_limiters', domain.tight_slope_limiters