Changeset 5616

Timestamp:

Aug 6, 2008, 9:36:38 AM (16 years ago)

Author:

duncan

Message:

Current Hinwood scenario

Location:

anuga_work/development/Hinwood_2008

Files:

• calc_norm.py (modified) (4 diffs)
• plot.py (modified) (5 diffs)
• run_dam.py (modified) (2 diffs)

anuga_work/development/Hinwood_2008/calc_norm.py

@@ -38 +38 @@
     return band_condition
     
-def auto_rrms(outputdir_tag, scenarios, quantity):
+def auto_rrms(outputdir_tag, scenarios, quantity, y_location_tag=':0.0'):
     """
     Given a bunch of scenarios that have CSV guage files, calc the
@@ -56 +56 @@
         for gauge_x in run_data['gauge_x']:
             gauge_x = str(gauge_x)
-            location_sims.append(gauge_x + ':0.0')
+            location_sims.append(gauge_x + y_location_tag)
             location_exps.append(gauge_x)
         
@@ -236 +236 @@
         sim['rmsd'] = sim['err']/sqrt(sim['amount'])
         settings[outputdir_tag] = sim
-    print "settings", settings
+    #print "settings", settings
 
     aux = [(settings[k]['rmsd'], k) for k in settings.keys()]
@@ -273 +273 @@
     
     outputdir_tags = []
+    #outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_H")
+    outputdir_tags.append("_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_G")
+    #outputdir_tag = "_good_tri_area_0.01_D"
+    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
     outputdir_tags.append("_lmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
+    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
+    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.001_G")
+    outputdir_tags.append("_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G")
+    outputdir_tags = [] # _no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G
     outputdir_tags.append("_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_G")
-    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.001_G")
-    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
-    outputdir_tags.append("_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G")
-    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
-    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
-    outputdir_tags = [] # _no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G
-    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
-    outputdir_tags.append("_no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
-    outputdir_tag = "_good_lmts_wdth_1.0_z_0.012_ys_0.01_mta_0.001_F"
+    
+    #outputdir_tag = "_good_lmts_wdth_1.0_z_0.012_ys_0.01_mta_0.001_H"
     #outputdir_tag = "_test_limiterC"
     #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
     #scenarios = scenarios[4:] # !!!!!!!!!!!!!!!!!!!!!!
     #for outputdir_tag in outputdir_tags:
-    #    auto_rrms(outputdir_tag, scenarios, "stage")
+     #   auto_rrms(outputdir_tag, scenarios, "stage", y_location_tag=':0.0')
     
     #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
-    #auto_plot_rrms_sensor_settings(outputdir_tags, scenarios, "stage")
-    compare_different_settings(outputdir_tags, scenarios, "stage")
+    auto_plot_rrms_sensor_settings(outputdir_tags, scenarios, "stage")
+    #compare_different_settings(outputdir_tags, scenarios, "stage")

anuga_work/development/Hinwood_2008/plot.py

@@ -61 +61 @@
     
 def Hinwood_files_locations(run_data, outputdir_tag, plot_type,
-                            quantity = "depth"):
+                            quantity = "depth",
+                            y_location_tag=':0.0'):
     """
     run_data is a dictionary of data describing a Hinwood experiment
@@ -83 +84 @@
     for gauge_x in run_data['gauge_x']:
         gauge_x = str(gauge_x)
-        location_sims.append(gauge_x + ':0.0')
+        location_sims.append(gauge_x + y_location_tag)
         location_exps.append(gauge_x)
         save_as_list.append(pro_instance.plots_dir + sep + \
@@ -90 +91 @@
     return file_exp, file_sim, location_sims, location_exps, outputdir_name, \
            save_as_list
-def plot(scenarios, outputdir_tag, quantity = "stage",is_interactive=False):
+
+def plot(scenarios, outputdir_tag, quantity = "stage",is_interactive=False,
+         y_location_tag=':0.0'):
     plot_type = ".pdf"
     
@@ -96 +99 @@
         
         temp = Hinwood_files_locations(run_data, outputdir_tag,
-                                       plot_type, quantity)
+                                       plot_type, quantity,
+                                       y_location_tag=y_location_tag)
                                     
         file_exp, file_sim, location_sims, location_exps, outputdir_name, \
                   save_as_list = temp
+        print "file_exp",file_exp 
         print "run_data['scenario_id']", run_data['scenario_id']
         #location_sims = [location_sims[0]]
@@ -135 +140 @@
     from scenarios import scenarios
     outputdir_tag = "_good_tri_area_0.01_limiterE"
-    outputdir_tag = "_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G"
+    outputdir_tag = ""
+    outputdir_tag = "_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_H"
+    outputdir_tag = "_good_tri_area_0.01_D"
     #outputdir_tag = "_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G"
     #outputdir_tag = "_test_C"
     #scenarios = scenarios[1:]
-    #scenarios = [scenarios[0]]
+    #scenarios = [scenarios[4]]
     is_interactive = False
     #is_interactive = True
-    plot(scenarios, outputdir_tag,is_interactive=is_interactive)
+    plot(scenarios, outputdir_tag,is_interactive=is_interactive,
+         y_location_tag=':0.5')
 

anuga_work/development/Hinwood_2008/run_dam.py

@@ -309 +309 @@
     # 8 is 0.00001  yieldstep = 0.05
     
-    #run_type = 1
-    run_type = 4
+    run_type = 1
+    #run_type = 4
     #for run_data in [scenarios[5]]:
-    #scenarios = scenarios[2:]
+    #scenarios = scenarios[3:]
     #scenarios = [scenarios[0]]
     width = 1.0
@@ -325 +325 @@
                              use_limits=False,
                              friction=0.012,
-                             end_tag='_G')
+                             end_tag='_H')
         #gauges_for_slope(pro_instance.outputdir,[run_data])