Changeset 7651

Timestamp:

Mar 3, 2010, 2:44:06 PM (15 years ago)

Author:

ole

Message:

Got patong auto validation working and tested for TRIAL run

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• compare_model_timeseries.py (modified) (7 diffs)
• project.py (modified) (1 diff)
• validate.py (modified) (5 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/compare_model_timeseries.py

@@ -17 +17 @@
 import numpy as num
 import sys, os
+
+try:
+    import pylab
+    pylab.hold(False)  # Check if this command can be issued
+except:
+    print 'Could not import pylab'
+    plotting = False
+else:
+    # Create plots as png files
+    plotting = True
+
+
 
 # Model specific data
@@ -27 +39 @@
           'g11c': [422689.1, 872859.8],
           'g11d': [422408.7, 871940.3],
-          'g11e': [421751.7, 871097.8],
           'north': [422572.4, 873992.6],
           'south': [422004.4, 872014.4]}
@@ -86 +97 @@
     assert timeseries2.shape[0] == N        
 
+    print 'Testing gauge "%s"' % name
     print 'epsilon', eps
     # Covariance measure    
@@ -124 +136 @@
     max1 = max(timeseries1)
     max2 = max(timeseries2)
-    print 'Max diff', abs(max1-max2)
+    res = abs(max1-max2)
+    print 'Max diff', res
+    msg = '%s: Difference between maxima was too large: %e' % (name, res)
+    assert res < eps, msg    
 
     min1 = min(timeseries1)
     min2 = min(timeseries2)
-    print 'Min diff', abs(min1-min2)    
+    res = abs(min1-min2)    
+    print 'Min diff', res
+    msg = '%s: Difference between minima was too large: %e' % (name, res)
+    assert res < eps, msg
+
     
     # Locations of extrema
@@ -134 +153 @@
     i2 = num.argmax(timeseries2)
     
-    res = abs(reference_time[i1]-reference_time[i2])
+    res = abs(timevector[i1]-timevector[i2])
     print 'Max loc diff', res
-
+    msg = '%s: Difference between location of maxima was too large: %e' % (name, res)
+    assert res < eps, msg
 
     i1 = num.argmin(timeseries1)
     i2 = num.argmin(timeseries2)
     
-    res = abs(reference_time[i1]-reference_time[i2])
+    res = abs(timevector[i1]-timevector[i2])    
     print 'Min loc diff', res    
-    
-    
-
-    # Generate plots
-    pylab.ion() # No plotting on screen
-    pylab.hold(False)
-    
-    pylab.plot(timevector, timeseries1, 'r-',
-               timevector, timeseries2, 'k-')
-
-    pylab.title('Gauge %s' % name)
-    pylab.xlabel('time(s)')
-    pylab.ylabel('stage (m)')    
-    pylab.legend(legend, shadow=True, loc='upper left')
-    pylab.savefig(name, dpi = 300)        
-
-    # Error vector
-    pylab.ion() # No plotting on screen
-    pylab.hold(False)
-    pylab.plot(timevector, timeseries1-timeseries2, 'b-')
-    pylab.title('Gauge %s (difference)' % name)    
-    pylab.xlabel('time(s)')
-    pylab.ylabel('stage difference (m)')  
-    pylab.savefig(name + '_diff', dpi = 300)                  
-    
+    msg = '%s: Difference between location of minima was too large: %e' % (name, res)
+    assert res < eps, msg
+    
+
+    if plotting:
+        # Generate plots
+        #pylab.ion() # No plotting on screen
+        pylab.hold(False)
+    
+        pylab.plot(timevector, timeseries1, 'r-',
+                   timevector, timeseries2, 'k-')
+
+        pylab.title('Gauge %s' % name)
+        pylab.xlabel('time(s)')
+        pylab.ylabel('stage (m)')    
+        pylab.legend(legend, shadow=True, loc='upper left')
+        pylab.savefig(name, dpi = 300)        
+
+        # Error vector
+        #pylab.ion() # No plotting on screen
+        pylab.hold(False)
+        pylab.plot(timevector, timeseries1-timeseries2, 'b-')
+        pylab.title('Gauge %s (difference)' % name)    
+        pylab.xlabel('time(s)')
+        pylab.ylabel('stage difference (m)')  
+        pylab.savefig(name + '_diff', dpi = 300)                  
+
+
+    print 'Gauge "%s" OK' % name
+    print
     
 
@@ -199 +224 @@
             
     
-    print 'OK'
+    print 'All gauges OK'
     
     
@@ -207 +232 @@
     if len(sys.argv) != 4:
         usage()
-        import sys; sys.exit(-1) 
+        sys.exit(-1) 
 
     eps = float(sys.argv[3]) # Get tolerance to be used in comparisons
-    try:
-        res = compare_all_timeseries(sys.argv[1], sys.argv[2], eps=eps)
-    except:
-        sys.exit(-1)
-    else:
-        sys.exit(0) 
+    res = compare_all_timeseries(sys.argv[1], sys.argv[2], eps=eps)
+    
+    #try:
+    #    res = compare_all_timeseries(sys.argv[1], sys.argv[2], eps=eps)
+    #except:
+    #    print 'Failed'
+    #    sys.exit(-1)
+    #else:
+    #    print 'Good', res
+    #    sys.exit(0) 

anuga_validation/automated_validation_tests/patong_beach_validation/project.py

@@ -36 +36 @@
 
 use_buildings = True
-setup = 'basic'         # This can be one of three values
+setup = 'trial'         # This can be one of three values
                         #    trial - coarsest mesh, fast
                         #    basic - coarse mesh

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -53 +53 @@
                          'patong.sww.FINAL.tgz'
                         )
-#Optional_Data_Objects = ('patong.sww.TRIAL.tgz')
+#Optional_Data_Objects = ('patong.sww.TRIAL.tgz',)
 
 # Associated tolerances to be used in comparisons (would depend on discretisation errors)
@@ -364 +364 @@
     log.debug("check_that_output_is_as_expected: res=%d" % res)
     log.critical()
+    print 'Result', res
     if res == 0:
         log.info('Simulation results are as expected.')
@@ -395 +396 @@
 log.log_logging_level = log.DEBUG
 
-log.debug("Machine we are running on is '%s'" % get_host_name())
+log.debug('Machine we are running on is "%s"' % get_host_name())
 setup()
 
 # prepare user for what is about to happen
 log.critical('''
-Please note that this validation test is accurate only on 64bit Linux or
-Windows.  Running the validation on a 32bit operating system will result in
-small differences in the generated mesh which defeats the simplistic test for
-equality between the generated and expected SWW files.
-
 This validation requires a working internet connection to refresh its files.
 You may still run this validation without an internet connection if you have the
@@ -451 +447 @@
     vtype = vtype.lower()
     log.critical('#' * 72)
-    log.critical("Running Patong '%s' validation ..." % vtype)
+    log.critical('Running Patong "%s" validation ...' % vtype)
     if run_simulation(vtype, odo):
         # get SWW names expected and valid, check 'equal'
@@ -459 +455 @@
 
     stop_time = time.time()
-    log.critical("'%s' validation took %.1fs\n\n\n" % (vtype, stop_time - start_time))
+    log.critical('"%s" validation took %.1fs\n\n\n' % (vtype, stop_time - start_time))
 
 # clean up