Changeset 4842

Timestamp:

Nov 21, 2007, 11:38:12 AM (17 years ago)

Author:

duncan

Message:

working on validation changes

Location:

anuga_validation/automated_validation_tests

Files:

• UQ_runup_2006/validate_uq_runup.py (modified) (1 diff)
• okushiri_tank_validation/compare_timeseries_with_measures.py (modified) (1 diff)
• urs_mux_files_validation/validate_Bf.py (modified) (1 diff)
• validate_all.py (modified) (1 diff)

anuga_validation/automated_validation_tests/UQ_runup_2006/validate_uq_runup.py

@@ -20 +20 @@
                 os.remove(file)
                 
-    def test_that_output_is_as_expected(self):
+    def test_that_UQ_output_is_as_expected(self):
         norm = run_dam.main()
         #print "norm",norm 

anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -14 +14 @@
 import project
 
-#try:
-#    from pylab import ion, hold, plot, title, legend, xlabel, ylabel, savefig
-#except:
-#    print 'Could not import pylab'
-#    plotting = False
-#else:
-#    # Create plots as png files
-#    plotting = True
-
-plotting = False # No plotting when running automated validation
+try:
+    from pylab import ion, hold, plot, title, legend, xlabel, ylabel, savefig
+    plot([1,2])
+except:
+    print 'Could not plot'
+    plotting = False
+else:
+    # Create plots as png files
+    plotting = True
+    
+    
+#plotting = False # No plotting when running automated validation
 
 

anuga_validation/automated_validation_tests/urs_mux_files_validation/validate_Bf.py

@@ -38 +38 @@
 
         # Remove garbage
-        print 'clean up'
+        # print 'clean up'
         for file in os.listdir('.'):
             if file.endswith('.sww') or\

anuga_validation/automated_validation_tests/validate_all.py

@@ -30 +30 @@
 
 for path, filename in validation_dirs_and_files:
-    print 'filename path', path, filename
+    # print 'filename path', path, filename
 
     os.chdir(path)
     s = 'python %s' %( filename)
     os.system(s)
-    print 'current dir', os.getcwd() 
+    # print 'current dir', os.getcwd() 
     
     # Back to parent directory
     os.chdir(os.pardir)
 
-    print 'current dir', os.getcwd() 
+    # print 'current dir', os.getcwd()