Changeset 5681

Timestamp:

Aug 26, 2008, 9:18:42 AM (15 years ago)

Author:

duncan

Message:

moving Honwood files around

Files:

• anuga_core/source/anuga/utilities/interp.py (moved) (moved from anuga_work/development/Hinwood_2008/interp.py)
• anuga_core/source/anuga/utilities/where_close.py (moved) (moved from anuga_work/development/Hinwood_2008/where_close.py)
• anuga_work/development/Hinwood_2008/boundary.csv (deleted)
• anuga_work/development/Hinwood_2008/calc_norm.py (modified) (13 diffs)
• anuga_work/development/Hinwood_2008/plot.py (modified) (6 diffs)
• anuga_work/development/Hinwood_2008/prepare_time_boundary.py (modified) (1 diff)
• anuga_work/development/Hinwood_2008/run_dam.py (modified) (5 diffs)
• anuga_work/development/Hinwood_2008/scenarios.py (modified) (2 diffs)

anuga_work/development/Hinwood_2008/calc_norm.py

@@ -26 +26 @@
 
 from slope import load_sensors
-from interp import interp
+from anuga.utilities.interp import interp
 
 def get_max_min_condition_array(min, max, vector):
@@ -195 +195 @@
     close()
 
-def auto_plot_test_rmsd(scenarios, outputdir_tag, quantity="stage",
-              save_as=True,
-              is_interactive=False, max_rmsd=0.010):
+def auto_plot_test_rmsd(scenarios, outputdir_tag,
+                        to_publish_indexes, quantity="stage",
+              save_as=True,add_run_info=False,
+              is_interactive=False, max_rmsd=0.012):
     """
     Produce the RMSD graphs for the anuga article.
 
-    to do:
-    labels
     """
     
@@ -209 +208 @@
     
     for i in range(0,len(scenarios),2):
-        tests.append([scenarios[i], scenarios[i+1]])
+        if to_publish_indexes.has_key(scenarios[i]['scenario_id']):            
+            tests.append([scenarios[i], scenarios[i+1]])
+        else:            
+            tests.append([scenarios[i+1], scenarios[i]])
 
     for test in tests:
         file_name = plot_test_rmsd(test, outputdir_tag, quantity,
-              save_as=save_as,
-              is_interactive=is_interactive, max_rmsd=max_rmsd)
+                                   to_publish_indexes,
+                                   save_as=save_as, add_run_info=add_run_info,
+                                   is_interactive=is_interactive,
+                                   max_rmsd=max_rmsd)
         file_names.append(file_name)
     return file_names
         
 def plot_test_rmsd(test, outputdir_tag, quantity,
-              save_as=None,
-              is_interactive=False, max_rmsd=None):
+                   to_publish_indexes,
+                   save_as=None, add_run_info=False,
+                   is_interactive=False, max_rmsd=None):
     """
     For a test, plot rmsd vs x location for both runs.
@@ -230 +235 @@
         
     plot_type = ".pdf"   
-    id = test[0]['scenario_id'][:2]
-    
+    id = 'S' + test[0]['scenario_id'][1:2]
+    
+    if add_run_info is True:
+        plot_title = "Title will not be in final draft \n" + \
+                     id + outputdir_tag
+        
+        title(plot_title)
+    else:
+        plot_title = ""
+            
     if is_interactive:
         ion()
@@ -237 +250 @@
                                       localtime()) 
     #subplot(212)    
-    plot_title = id + " Root Mean Square Deviation comparison" + '\n' \
-                 + time_date
+   
                  
     #title(plot_title)
@@ -251 +263 @@
     for run in test:
         i += 1
-        legend_name.append(run['scenario_id'][:2]+"T"+str(i))    
+        legend_name.append("S" + test[0]['scenario_id'][1:2]+"R"+str(i))    
         outputdir_name = run['scenario_id'] + outputdir_tag
         pro_instance = project.Project(['data','flumes','Hinwood_2008'],
@@ -262 +274 @@
         locations = [float(x) for x in simulation['x location']]
         rmsd_list = [float(x) for x in simulation['rmsd']]
-        lines.append(plot(locations, rmsd_list, '-o'))
-        #plot(locations, rmsd_list, 'o')
+
+        
+        lines.append(plot(locations, rmsd_list, 'k-x')) # k is black
+
+        for i_gauge, (location, rmsd) in enumerate(map(None,
+                                                     locations,
+                                                     rmsd_list)):
+            if to_publish_indexes.has_key(run['scenario_id']) and \
+                   to_publish_indexes[run['scenario_id']].count(i_gauge) == 1:
+                plot([location], [rmsd], 'ko', markeredgewidth=2,
+                     markeredgecolor='k')
+                
+
         
         for break_x in run['break_xs']:
@@ -272 +295 @@
         axis(ymin=0, ymax=max_rmsd)
         
+    if id == 'S2':
+        # Hack to get the desired width
+        axis(xmax=7.0)
+        
+    setp(lines[1], linestyle='--')    
     legend(lines, legend_name,'upper left')
     
@@ -278 +306 @@
 
     save_as = pro_instance.plots_dir + sep + \
-              id + "_rmsd" + plot_type
+              id + "-rmsd" + plot_type
     print "save_as", save_as
     if save_as is not None:
@@ -380 +408 @@
                    save_as=None,
                    is_interactive=False):
+    """
+    The general auto, for comparing things.
+
+    """
     max_rmsd = calc_max_rmsd(scenarios, outputdir_tags, quantity)
     print "max_rmsd", max_rmsd
@@ -400 +432 @@
     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_I")
     outputdir_tags.append("_nolmts_wdth_1.0_z_0.0_ys_0.01_mta_0.01_I")
+    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.0001_I")
+    outputdir_tags.append("_lmts_wdth_0.1_z_0.0_ys_0.01_mta_0.0001_I")
+    outputdir_tags.append("_no_velocity_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.0001_I")
     
     #outputdir_tag = "_test_limiterC"
@@ -405 +440 @@
     #scenarios = scenarios[4:] # !!!!!!!!!!!!!!!!!!!!!!
     calc_norms = True
-    calc_norms = False
+    #calc_norms = False
     if calc_norms:
         for outputdir_tag in outputdir_tags:
@@ -412 +447 @@
     #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
     #auto_plot_rrms_sensor_settings(outputdir_tags, scenarios, "stage")
-    #compare_different_settings(outputdir_tags, scenarios, "stage")
+    compare_different_settings(outputdir_tags, scenarios, "stage")
 
     outputdir_tag = "_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_I" 
-    auto_plot_test_rmsd(scenarios, outputdir_tag)
+    #auto_plot_test_rmsd(scenarios, outputdir_tag)

anuga_work/development/Hinwood_2008/plot.py

@@ -156 +156 @@
                                      y_location_tag=':0.0',
                                      add_run_info=False):
+    """
+    Used by validation graphs to produce the final figures
+    """
     plot_type = ".pdf"
     save_as_list = []
@@ -180 +183 @@
         #save_as = pro_instance.plots_dir + sep + \
         #          outputdir_name + "_" + quantity + "_" + plot_type
-        save_as = pro_instance.plots_dir + sep + id + quantity + \
-                  '_compare' + plot_type
+        save_as = pro_instance.plots_dir + sep + 'S' + id[1:2] + \
+                  '-' + quantity + '-compare' + plot_type
         save_as_list.append(save_as)
 
@@ -210 +213 @@
                                 y_axis=None,
                                 y_location_tag=':0.0'):
-    """ 
+    """
+    Used by validation graphs to produce the final figures
     """
     from pylab import ion, plot, xlabel, ylabel, close, legend, \
          savefig, title, axis, setp, subplot, grid, figlegend, gca, \
-         text
+         text, sqrt
+    import pylab
     
     from anuga.shallow_water.data_manager import csv2dict
     
     print "file_sim", file_sim
+
+    if False:
+        fig_width_pt = 246.0  # Get this from LaTeX using \showthe\columnwidth
+        inches_per_pt = 1.0/72.27               # Convert pt to inch
+        golden_mean = (sqrt(5)-1.0)/2.0         # Aesthetic ratio
+        fig_width = fig_width_pt*inches_per_pt  # width in inches
+        fig_height = fig_width*golden_mean      # height in inches
+        fig_size =  [fig_width,fig_height]
+        print "fig_size", fig_size
+        params = {'backend': 'ps',
+                  'axes.labelsize': 10,
+                  'text.fontsize': 10,
+                  'legend.fontsize': 10,
+                  'xtick.labelsize': 8,
+                  'ytick.labelsize': 8,
+                  'text.usetex': True,
+                  'figure.figsize': [3.4, 2.1]}
+    if False:
+        params = {'backend': 'ps',
+                  'axes.labelsize': 10,
+                  'text.fontsize': 10,
+                  'legend.fontsize': 10,
+                  'xtick.labelsize': 8,
+                  'ytick.labelsize': 8,
+                  'figure.figsize': [3.4, 3.1]}
+        pylab.rcParams.update(params)
+
+
+    
     # Load in the csv files and convert info from strings to floats
     simulation, _ = csv2dict(file_sim)
@@ -231 +265 @@
     for position, i in enumerate(gauge_indexs):
         gauge_x = run_data['gauge_x'][i]
-        grid_position = (len(gauge_indexs)+1)*100 + 10 + position +1
+        
+        grid_position = (len(gauge_indexs))*100 + 10 + position +1
         subplot(grid_position)
         location_sim = str(gauge_x) + y_location_tag
@@ -241 +276 @@
     
         l_sim, l_exp = plot(time_sim, quantity_sim, time_exp, quantity_exp)
-        setp(l_sim, color='r', linestyle='--')
-        setp(l_exp, color='b')
+        setp(l_sim, color='k', linestyle='--')
+        setp(l_exp, color='k')
         grid(True)
         
@@ -282 +317 @@
     # The order defines the label
     #legend((legend_exp, legend_sim),'upper left')
-    figlegend((l_sim, l_exp),
-              (legend_sim, legend_exp),
-              'lower center')
+
+    # I couldn't get this working
+    #figlegend((l_sim, l_exp),
+     #         (legend_sim, legend_exp),
+      #        'lower center', axespad = -0.05) 
     
     if is_interactive:

anuga_work/development/Hinwood_2008/prepare_time_boundary.py

@@ -19 +19 @@
 from anuga.utilities.numerical_tools import ensure_numeric
 
-from interp import interp
+from anuga.utilities.interp import interp
 
 

anuga_work/development/Hinwood_2008/run_dam.py

@@ -41 +41 @@
 import create_mesh
 from prepare_time_boundary import prepare_time_boundary
-from interp import interp
+from anuga.utilities.interp import interp
 
 
@@ -99 +99 @@
         finaltime = None        
         maximum_triangle_area=0.01
-        #outputdir_name += '_no_velocity'
         
     elif run_type == 5:
@@ -136 +135 @@
         maximum_triangle_area=0.00001
         #outputdir_name += '_good'
+    #outputdir_name += '_no_velocity'
 
     outputdir_name = paras2outputdir_tag(mta=maximum_triangle_area,
                         yieldstep=yieldstep,
                         width=width,
-                        run_type=run_type,
                         use_limits=use_limits,
                         friction=friction,
@@ -341 +340 @@
     
     run_type = 1
-    run_type = 0
+    run_type = 0  # for testing
     
     #for run_data in [scenarios[5]]:
@@ -351 +350 @@
     #width = 0.01
 
-    maximum_triangle_area=0.01
+    maximum_triangle_area=0.0001
     yieldstep = 0.01
     friction=0.0

anuga_work/development/Hinwood_2008/scenarios.py

@@ -102 +102 @@
         'offshore_water_depth':.4,
         'scenario_id':'T2R8',
-        'gauge_names':['B','1','2','3','4','5','7'],
-        'gauge_x':[-0.68, 1.569, 2.568, 3.566, 4.564, 5.562, 7.559],
-        'gauge_bed_elevation':[-0.400000, -0.293158,
-                               -0.234473, -0.175788, -0.117104,
-                               -0.058419, 0.058950],
+        'gauge_names':['B','1','2','3','4','5'],
+        'gauge_x':[-0.68, 1.569, 2.568, 3.566, 4.564, 5.562],
+        'gauge_bed_elevation':[-0.400000, -0.293158,
+                               -0.234473, -0.175788, -0.117104,
+                               -0.058419],
         'start_slope_x':5,
         'finish_slope_x':6.5,
@@ -258 +258 @@
 # These are the indexes from 'gauge_x' of the gauges for the journal article.
 to_publish_indexes = {'T1R5':[0, 5, 6],
-              'T2R7':[1, 3, 5],
-              'T3R29':[1, 6, 8],
+              'T2R7':[0, 3, 5],
+              'T3R29':[0, 6, 8],
               'T4R32':[0, 5, 8]
               }