Changeset 4751

Timestamp:

Oct 24, 2007, 11:34:30 AM (17 years ago)

Author:

duncan

Message:

automating validation

Location:

anuga_validation/automated_validation_tests/UQ_runup_2006

Files:

• . (copied) (copied from anuga_validation/UQ_runup_2006)
• project.py (modified) (1 diff)
• run_dam.py (modified) (2 diffs)

anuga_validation/automated_validation_tests/UQ_runup_2006/project.py

@@ -3 +3 @@
 """
 basename = "uq"
+
 depth_filename = "depth.csv"
 velocity_x_filename =  "velocity_x.csv"
 velocity_y_filename =  "velocity_y.csv"
 
-
 mesh_filename = 'uq-mesh.tsh'
 
+actual_filename = 'actual.csv'

anuga_validation/automated_validation_tests/UQ_runup_2006/run_dam.py

@@ -20 +20 @@
                             Dirichlet_boundary, Time_boundary, File_boundary
 from anuga.abstract_2d_finite_volumes.region import Set_region 
-from anuga.fit_interpolate.interpolate import interpolate_sww2csv
+from anuga.fit_interpolate.interpolate import interpolate_sww2csv, \
+     file_function
 from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, \
      copy_code_files
-import create_mesh
-
-import project
-
+from anuga.shallow_water.data_manager import csv2dict
+from numerical_tools import  err   # norm, corr,  
 
 # Application specific imports
-
-
+import create_mesh
+import project
 def main():
      
@@ -100 +99 @@
         print 'That took %.2f seconds' %(time.time()-t0)
         print 'finished'
-        
-    points = [[0.4,0.2]]
-    #-------------------------------------------------------------------------
-    # Calculate gauge info
-    #-------------------------------------------------------------------------
-    print "name",project.basename +".sww"
-    interpolate_sww2csv( project.basename +".sww",
-                        points,
-                        project.depth_filename + '.csv',
-                        project.velocity_x_filename + '.csv',
-                        project.velocity_y_filename + '.csv')
 
-
+    # Load actual experimental results
+    actual,title_index_dic = csv2dict(project.actual_filename)
+    
+    gauge_locations = [[0.4,0.2]]
+    quantities = ['stage', 'elevation']
+    file_instance = file_function( project.basename +".sww",
+                                      quantities = quantities,
+                                      interpolation_points = gauge_locations,
+                                      verbose = True,
+                                      use_cache = False)
+    # create a list of the simulated_depths at the actual data times. 
+    simulated_depths = []
+    for atime in actual['time']:
+        quantities_slice = file_instance(float(atime),
+                                         point_id=0)
+        depth = quantities_slice[0] - quantities_slice[1]
+        simulated_depths.append(depth)
+    flume_depths = actual["0.4:0.2"]
+    flume_depths = [float(i) for i in flume_depths]
+    # calc the norm
+    #print "map(None, simulated_depths, flume_depths)", \
+    #      map(None, simulated_depths, flume_depths)
+    normmax = 0
+    norm = err(simulated_depths,
+               flume_depths, 2, relative = True)  # 2nd norm (rel. RMS
+    if norm > normmax:
+        normmax = norm
+    print norm
+    print "norm", norm
 #-------------------------------------------------------------
 if __name__ == "__main__":