Changeset 3757

Timestamp:

Oct 11, 2006, 5:05:39 PM (16 years ago)

Author:

ole

Message:

Work towards automated validation of ANUGA using okushiri

File:

• anuga_validation/automated_validation_tests/okushiri_tank_validation/validate_okushiri.py (modified) (6 diffs)

anuga_validation/automated_validation_tests/okushiri_tank_validation/validate_okushiri.py

@@ -22 +22 @@
 import project
 
+try:
+    import pylab
+except:
+    plotting = False
+else:
+    plotting = True
+    
+
 finaltime = 22.5
 timestep = 0.05
@@ -28 +36 @@
 # Create Domain
 #-------------------------
-#N = 50
-N = 10
+N = 50
+#N = 10
 points, vertices, boundary = rectangular_cross(N, N/5*3,
                                                len1=5.448, len2=3.402)
@@ -110 +118 @@
 
 
-predicted_gauge_values = [[], [],[],[]]
+predicted_gauge_values = [[], [], [], []]
 
 
@@ -126 +134 @@
     stage = domain.get_quantity('stage')
     for i, (x, y) in enumerate(gauge_locations):
-        w = stage.get_values(interpolation_points=[[x,y]])
+        w = stage.get_values(interpolation_points=[[x,y]])[0]
         predicted_gauge_values[i].append(w)
 
-        print 'difference', x, y, w - reference_gauge_values[i][j]
+        #print 'difference', x, y,\
+        #      predicted_gauge_values[i][j] - reference_gauge_values[i][j]
     
 
@@ -138 +147 @@
     predicted_gauge_values[i] = ensure_numeric(predicted_gauge_values[i])
 
+    print predicted_gauge_values[i].shape
+    print reference_gauge_values[i].shape
+    #print predicted_gauge_values.shape
+    #print reference_gauge_values.shape    
     
-    sqsum = sum((predicted_gauge_values[i] - reference_gauge_values)**2)
-    denom = sum(reference_gauge_values**2)
+    sqsum = sum((predicted_gauge_values[i].flat - \
+                 reference_gauge_values[i].flat)**2)
+    denom = sum(reference_gauge_values[i].flat**2)
 
     print i, sqsum, sqsum/denom
 
-    msg 'Rms error is %f' %(sqsum/denom)
+    msg = 'Rms error is %f' %(sqsum/denom)
+    print msg
+    
     assert sqsum/denom < 0.01, msg
+    
 
-    try:
+    if plotting is True:
+        
         from pylab import *
-    except:
-        pass
-    else:
+
         ion()
         hold(False)
@@ -165 +181 @@
         
 
-try:
-    from pylab import *
-except:
-    pass
-else:
+if plotting is True:
     show()