Changeset 5691 for anuga_validation/Hinwood_2008/calc_norm.py

Timestamp:

Aug 27, 2008, 8:52:21 AM (15 years ago)

Author:

duncan

Message:

Adding a header to the boundary files

File:

• anuga_validation/Hinwood_2008/calc_norm.py (modified) (13 diffs)

anuga_validation/Hinwood_2008/calc_norm.py

@@ -1 +1 @@
 """
-This is getting really messy.
 
 All err results are going into the same dir, and it can't really be changed.
@@ -12 +11 @@
 # Standard modules
 import os
-from os import sep, path
 from csv import writer
 from time import localtime, strftime
 
 # Related major packages
-from Numeric import arange, array, zeros, Float, where, greater, less, \
-     compress, argmin, choose, searchsorted, sqrt, sum
-
-import project          
-from os import sep
+from Numeric import zeros, Float, where, greater, less, compress, sqrt, sum
+
 from anuga.shallow_water.data_manager import csv2dict
 from anuga.utilities.numerical_tools import ensure_numeric, err, norm
-
 from anuga.utilities.interp import interp
 
@@ -33 +27 @@
     assert min > SMALL_MIN
     no_maxs = where(less(vector,max), vector, SMALL_MIN)
-    #print "no_maxs", no_maxs
     band_condition = greater(no_maxs, min)
     return band_condition
@@ -41 +34 @@
               y_location_tag=':0.0'):
     """
-    Given a bunch of scenarios that have CSV guage files, calc the
+    Given a list of scenarios that have CSV guage files, calc the
     err, Number_of_samples and rmsd for all gauges in each scenario.
     Write this info to a file for each scenario.
@@ -67 +60 @@
         time_sim = ensure_numeric(time_sim)
         time_exp = ensure_numeric(time_exp)
-        #print "min(time_exp)", min(time_exp)
-        #print "max(time_exp)", max(time_exp)
         
         condition = get_max_min_condition_array(run_data['wave_times'][0],
                                                 run_data['wave_times'][1],
                                                 time_exp)
-        time_exp_cut = compress(condition, time_exp) #, axis=axis)
-        #print "min(time_exp_cut)", min(time_exp_cut)
-        #print "max(time_exp_cut)", max(time_exp_cut)
-        
-        #assert min(time_sim) < min(time_exp)
+        time_exp_cut = compress(condition, time_exp)
         
         print "Writing to ", file_err
@@ -100 +87 @@
             err_list.append(norm)
             points.append(len(quantity_sim_interp))
-            rmsd_list.append(norm/sqrt(len(quantity_sim_interp)))              
-            #print "norm", norm
-            #for i in range(len(quantity_sim_interp)):
-                
-                #print "quantity_sim_interp", quantity_sim_interp[i]
-                #print "quantity_exp_cut", quantity_exp_cut[i]
+            rmsd_list.append(norm/sqrt(len(quantity_sim_interp))) 
         assert len(location_exps) == len(err_list)
 
@@ -124 +106 @@
     the first colum explains the rows.
     """
-    #slope, _ = csv2dict(file_sim)
     
     # Read the depth file
@@ -137 +118 @@
     depths = zeros(n_time, Float)  #
     sensors = zeros((n_time,n_sensors), Float)
-    quantity_locations = title.split(',') #(',')
+    quantity_locations = title.split(',')
     quantity_locations.pop(0) # remove 'time'
 
@@ -144 +125 @@
     
     for i, line in enumerate(lines):
-        fields = line.split(',') #(',')
+        fields = line.split(',')
         fields = [float(j) for j in fields]
         times[i] = fields[0]
         sensors[i] = fields[1:] # 1: to remove time
 
-    #print "times",times
-    #print "locations", locations
-    #print "sensors", sensors
     return times, locations, sensors                  
     
@@ -161 +139 @@
 def err_files(scenarios, outputdir_tag, quantity='stage'):
     """
-    The err files, for a list of scenarios
+    Create a list of err files, for a list of scenarios.
     """
     file_errs = []
@@ -173 +151 @@
 
 def compare_different_settings(outputdir_tag, scenarios, quantity='stage'):
-
+    """
+    Calculate the RMSD for all the tests in a scenario
+    """
     files = err_files(scenarios, outputdir_tag, quantity=quantity)
     err = 0.0
@@ -195 +175 @@
 def err_addition(err_list, number_of_samples_list):
     """
-    err1 is the err value (sqrt(sum_over_x&y((xi - yi)^2))) for a set of values
-    number_of_samples1 is the number of values associated with the err.
+    This function 'sums' a list of errs and sums a list of samples
+    
+    err is the err value (sqrt(sum_over_x&y((xi - yi)^2))) for a set of values.
+    number_of_samples is the number of values associated with the err.
     
     If this function gets used alot, maybe pull this out and make it an object
@@ -212 +194 @@
     from scenarios import scenarios
     
-    
-    scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
-    #scenarios = scenarios[4:] # !!!!!!!!!!!!!!!!!!!!!!
-
-    
-    outputdir_tag = "_nolmts_wdth_0.1_z_0.0_ys_0.5_mta_0.01"
+    #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
+
+    outputdir_tag = "_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01"
     calc_norms = True
     #calc_norms = False