Changeset 4410

Timestamp:

Apr 23, 2007, 11:54:29 AM (16 years ago)

Author:

nick

Message:

fix and update boundary file test

Location:

anuga_validation/automated_validation_tests/urs_mux_files_validation

Files:

• boundary_gauges.txt (added)
• gauges.txt (added)
• o_test-e-mux (deleted)
• o_test-n-mux (deleted)
• o_test-z-mux (deleted)
• run_Bf.py (modified) (10 diffs)
• validate_Bf.py (modified) (2 diffs)

anuga_validation/automated_validation_tests/urs_mux_files_validation/run_Bf.py

@@ -81 +81 @@
 
 # convert MUX urs files to an SWW file output
-#print 'boundary file is: ',boundaries_dir_name
-'''
-from caching import cache
-cache(urs2sww,
-          (boundaries_dir_name,
-           boundaries_dir_name), 
-          {'verbose': False,
-           'mint': 9200, 'maxt': 11200,
-#           'origin': domain.geo_reference.get_origin(),
-           'fail_on_NaN': False},
-           verbose = True,
-           )
-'''
 urs2sww(boundaries_dir_name,boundaries_dir_name,
            mint=9200, maxt= 11200,
-#           'origin': domain.geo_reference.get_origin(),
            fail_on_NaN= False,
            verbose=True)
@@ -122 +108 @@
 # Setup boundary conditions 
 #-------------------------------------------------------------------------
-#Bf = File_boundary(out_dir + 'o_test_8500_12000.sww',
-#                  domain, time_thinning=24, use_cache=True, verbose=True)
 Bf = Field_boundary(out_dir + 'o_test.sww',
                   domain, mean_stage=tide, use_cache=True, verbose=False)
-
-#print 'finished reading boundary file'
 
 #Br = Reflective_boundary(domain)
@@ -133 +115 @@
 Bd = Dirichlet_boundary([tide,0,0])
 
-#print'set_boundary'
 
 domain.set_boundary({'back': Bt,
@@ -139 +120 @@
                     'ocean': Bf
                     })
-#print'finish set boundary'
-
 #----------------------------------------------------------------------------
 # Evolve system through time
@@ -156 +135 @@
 #Gets timeseries from boundary sww and evolved sww
 home = getenv('INUNDATIONHOME') #Sandpit's parent dir   
-#user = get_user_name()
 data = 'data'
 state = 'western_australia'
@@ -162 +140 @@
 
 scenario = 'dampier_tsunami_scenario_2006'
-#scenario = 'test_dampier'
 an = 'anuga'
 bo = 'boundaries'
 
 run_time = 'blank'
-#run_time = project.run_time
 production_dirs = {run_time: 'URS evolved data'#,
-                   #'boundaries': 'URS boundary condition'
                    }
 
@@ -178 +153 @@
 
 
-#gauge_boundary_filename = 'boundary_gauge_near_top.csv'
 gauge_boundary_filename = 'gauges_time_series_b_near_top.csv'
 gauge_evolved_filename = 'gauges_time_series_near_top.csv'
@@ -187 +161 @@
 evolved_dir_filename= os.path.join(out_dir,gauge_evolved_filename)
 
-#print'boundary_dir_filename',boundary_dir_filename
-#print'evolved_dir_filename',evolved_dir_filename
-                                     
 swwfiles = {}
 swwfile = out_dir + fileName + '.sww'
 swwfiles[swwfile] = run_time
-#print"swwfiles",swwfiles,"shallow_water"
         
 texname, elev_output = sww2timeseries(swwfiles,
-                                      out_dir+sep+"gauges.csv",
+                                      out_dir+sep+"gauges.txt",
+#                                      out_dir+sep+"gauges.csv",
                                       production_dirs,
                                       report = False,
@@ -213 +184 @@
         
 texname, elev_output = sww2timeseries(swwfiles,
-                                      out_dir+sep+"boundary_gauges.csv",
+                                      out_dir+sep+"boundary_gauges.txt",
+#                                      out_dir+sep+"boundary_gauges.csv",
                                       production_dirs,
                                       report = False,
@@ -269 +241 @@
 print "test successful" 
 print 'fileName',fileName+'.sww'
-os.remove(fileName+'.sww')
+#os.remove(fileName+'.sww')
 #print 'evolved_dir_filename',evolved_dir_filename
-os.remove('gauges_time_series_near_top.csv')
-os.remove('gauges_time_series_b_near_top.csv')
-os.remove('gauges_t0.csv')
-os.remove('gauges_maxmins.csv')
+#os.remove('gauges_time_series_near_top.csv')
+#os.remove('gauges_time_series_b_near_top.csv')
+#os.remove('gauges_t0.csv')
+#os.remove('gauges_maxmins.csv')
 os.remove(meshes_dir_name)
 

anuga_validation/automated_validation_tests/urs_mux_files_validation/validate_Bf.py

@@ -11 +11 @@
 
 class Test_Bf(unittest.TestCase):
-    def setUp(self):
+    def test_setUp(self):
 
         # Remove garbage
         for file in os.listdir('.'):
-            if file.endswith('.stdout'):# or\
-#               file.endswith('.sww') or\
-#               file.endswith('.msh'):
+            if file.endswith('.stdout') or\
+               file.endswith('.sww') or\
+               file.endswith('.csv'):
                 os.remove(file)
                 
-        '''
-        #print
-        s = 'create_okushiri.py'
-        #print s
-        res = os.system('python %s > create_okushiri.stdout' %s)
-        assert res == 0
-        
-        s = 'run_Bf.py'
-        #print s        
-        res = os.system('python %s > run_Bf.stdout' %s)
-        #must run without error        
-        assert res == 0
-    '''        
-
     def tearDown(self):
         pass
-
-    #def test_creation_of_mesh(self):
-    #    s = 'create_okushiri.py'
-    #    os.system('python %s > create_okushiri.stdout' %s)
-
-    #def test_that_simulation_can_run(self):
-    #    s = 'run_okushiri.py'
-    #    os.system('python %s > run_okushiri.stdout' %s)
 
     def test_compare_URSsww_vs_EvolveANUGAsww(self):    
@@ -51 +29 @@
                         %s)
         assert res == 0
+        
+    def test_cleanUp(self):
+
+        # Remove garbage
+        print 'clean up'
+        for file in os.listdir('.'):
+            if file.endswith('.sww') or\
+               file.endswith('.csv'):
+                os.remove(file)
+