Changeset 7641

Timestamp:

Feb 26, 2010, 4:52:46 PM (15 years ago)

Author:

ole

Message:

Repaired patong validate reading output dir. I still think this is hacky.

Files:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (1 diff)
• anuga_validation/automated_validation_tests/patong_beach_validation/compare_model_timeseries.py (modified) (2 diffs)
• anuga_validation/automated_validation_tests/patong_beach_validation/validate.py (modified) (4 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -6909 +6909 @@
 
     # check we have a destination directory, create if necessary
-    if access(dir_name, F_OK) == 0:
+    if not os.path.isdir(dir_name):
         if verbose:
             log.critical('Make directory %s' % dir_name)
         mkdir(dir_name, 0777)
+
+    if verbose:
+        log.critical('Output directory: %s' % dir_name)        
 
     copy_file_or_sequence(dir_name, filename1)

anuga_validation/automated_validation_tests/patong_beach_validation/compare_model_timeseries.py

@@ -67 +67 @@
     timevector2, timeseries2 = get_timeseries(swwfile2, gauges)    
 
-    msg = 'Time vector were different in models %s and %s' %\
+    msg = 'Time vectors were different in models %s and %s' %\
           (swwfile1, swwfile2)
     assert num.allclose(timevector1, timevector2), msg
@@ -82 +82 @@
     try:
         res = compare_timeseries(sys.argv[1], sys.argv[2])
-    except e:
-        print e
+    except:
         sys.exit(-1)
     else:

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -65 +65 @@
 
 # text at start of 'output dir' line in RUNMODEL_STDOUT file
-OUTDIR_PREFIX = 'Make directory '
+OUTDIR_PREFIX = 'Output directory: '
 
 # Name of SWW file produced by run_model.py
@@ -335 +335 @@
         if line.startswith(OUTDIR_PREFIX):
             output_directory = line.replace(OUTDIR_PREFIX, '', 1)
-            output_directory = output_directory.strip('\n')
+            output_directory = output_directory.strip()
             break
     if output_directory is None:
@@ -357 +357 @@
     else:
         log.critical('Simulation results are NOT as expected.')
-        fd = open('cmpsww.stdout', 'r')
+        fd = open('compare_model_timeseries.stdout', 'r')
         cmp_error = fd.readlines()
         fd.close()
@@ -369 +369 @@
     
     # remove remote directory and stdout capture file
-    shutil.rmtree(Remote_Data_Directory, ignore_errors=True)
-    try:
-        os.remove(RUNMODEL_STDOUT)
-    except OSError:
-        pass
+    #shutil.rmtree(Remote_Data_Directory, ignore_errors=True)
+    #try:
+    #    os.remove(RUNMODEL_STDOUT)
+    #except OSError:
+    #    pass