Changeset 5697

Timestamp:

Aug 27, 2008, 1:19:26 PM (17 years ago)

Author:

duncan

Message:

Hinwood - fix for line overrunning graph in anuga report

Location:

anuga_work/development/Hinwood_2008

Files:

• calc_norm.py (modified) (3 diffs)
• plot.py (modified) (5 diffs)
• run_dam.py (modified) (3 diffs)

anuga_work/development/Hinwood_2008/calc_norm.py

@@ -80 +80 @@
         #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],
+
+        # Trim the experimental data
+        condition_exp = 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)
+        time_exp_cut = compress(condition_exp, 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)
+
+        # Trim the simulation data
+
+
         
         print "Writing to ", file_err
@@ -100 +105 @@
             quantity_exp = [float(x) for x in experiment[location_exp]]
 
-            quantity_exp_cut = compress(condition, quantity_exp)
+            quantity_exp_cut = compress(condition_exp, quantity_exp)
 
             # Now let's do interpolation
@@ -436 +441 @@
     outputdir_tags.append("_no_velocity_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.0001_I")
     
+    outputdir_tags = []
+    outputdir_tags.append("_lmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_I")
     #outputdir_tag = "_test_limiterC"
     #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!

anuga_work/development/Hinwood_2008/plot.py

@@ -6 +6 @@
 import project
 from time import localtime, strftime
+
+from Numeric import compress
+
+from calc_norm import get_max_min_condition_array
 
 def plot_compare_csv(location_sim, file_sim, location_exp, file_exp,
@@ -259 +263 @@
     time_exp = [float(x) for x in experiment['Time']]
 
+
+    # Trim the simulation data, due to strange anuga paper bug
+    condition_sim = get_max_min_condition_array(run_data['wave_times'][0],
+                                                run_data['wave_times'][1],
+                                                time_sim)
+    time_sim = compress(condition_sim, time_sim)
     
     if is_interactive:
@@ -274 +284 @@
         quantity_exp = [float(x) for x in experiment[location_exp]]
 
+        # Trim the simulation data, due to strange anuga paper bug
+        quantity_sim = compress(condition_sim, quantity_sim)
+
     
         l_sim, l_exp = plot(time_sim, quantity_sim, time_exp, quantity_exp)
@@ -280 +293 @@
         grid(True)
         
-        # When the shore gauges out of the are used, don't
+        # When the shore gauges are used, don't
         # use the standard y axis scale
         gauge_elev = run_data['gauge_bed_elevation'][i]
@@ -303 +316 @@
             # the fudge -0.001 is to reduce the ytick's 
 
-        # need to drop the axis name being printed
-        if x_axis is not None:
-            axis(xmin=x_axis[0], xmax=x_axis[1])
+        axis(xmin=x_axis[0], xmax=x_axis[1])
 
         # Only do tick marks on the final graph

anuga_work/development/Hinwood_2008/run_dam.py

@@ -31 +31 @@
                             Transmissive_Momentum_Set_Stage_boundary
 from anuga.fit_interpolate.interpolate import interpolate_sww2csv
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, \
-      file_function
-from anuga.shallow_water.data_manager import copy_code_files
+
+from anuga.abstract_2d_finite_volumes.util import file_function
+from anuga.shallow_water.data_manager import copy_code_files, \
+     start_screen_catcher
 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
      import File_boundary_time
@@ -340 +341 @@
     
     run_type = 1
-    run_type = 0  # for testing
+    #run_type = 0  # for testing
     
     #for run_data in [scenarios[5]]:
@@ -346 +347 @@
     #scenarios = [scenarios[0]]
     
-    width = 1.0
+    #width = 1.0
     width = 0.1
     #width = 0.01
 
-    maximum_triangle_area=0.0001
+    maximum_triangle_area=0.01
     yieldstep = 0.01
     friction=0.0