Changeset 5447

Timestamp:

Jun 27, 2008, 3:10:16 PM (17 years ago)

Author:

duncan

Message:

Current Hinwood scenario

Files:

• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (3 diffs)
• anuga_work/development/Hinwood_2008/run_dam.py (modified) (3 diffs)
• anuga_work/development/Hinwood_2008/slope.py (modified) (6 diffs)
• anuga_work/development/Hinwood_2008/test_slope.py (added)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -430 +430 @@
                         stage_file=None,
                         #quantities = ['depth', 'velocity'],
+                        time_thinning=1,
                         verbose=True,
                         use_cache = True):
@@ -436 +437 @@
     an sww file.
     The results are written to a csv file.
+    
+    Time_thinning_number controls how many timesteps to use. Only
+        timesteps with index%time_thinning_number == 0 will used, or
+        in other words a value of 3, say, will cause the algorithm to
+        use every third time step.
 
     In the future let points be a points file.
@@ -453 +459 @@
                                  interpolation_points=points,
                                  verbose=verbose,
+                                 time_thinning=time_thinning,
                                  use_cache=use_cache)
     

anuga_work/development/Hinwood_2008/run_dam.py

@@ -67 +67 @@
     if run_type == 1:
         outputdir_name += '_test'
-        yieldstep = 0.1
+        yieldstep = 1.0
         finaltime = 15.
-        maximum_triangle_area=0.01
+        maximum_triangle_area=0.1
         
     elif run_type == 2:
@@ -230 +230 @@
     #-------------------------------------------------------------------------
 
-    if run_type >= 2:
+    if run_type >= 1:
         id = metadata_dic['scenario_id']
         interpolate_sww2csv(pro_instance.outputdir + basename +".sww",
@@ -253 +253 @@
 
     #4 is 0.01 5 is 0.001
-    run_type = 4
-    for run_data in [scenarios[5]]:
+    run_type = 1
+    #for run_data in [scenarios[5]]:
+    for run_data in scenarios:
         main( run_data['scenario_id'] + '_boundary.tsm'  , run_data,
               run_type = run_type,

anuga_work/development/Hinwood_2008/slope.py

@@ -8 +8 @@
 
 from Numeric import arange, array, zeros, Float
-from pylab import meshgrid, cm, contourf, contour, ion, plot, xlabel, \
-     ylabel, close, legend, savefig, title, figure ,colorbar, show #, cbar
 
 from anuga.fit_interpolate.interpolate import interpolate_sww2csv
@@ -64 +62 @@
     return times, slope_locations, slopes
 
-def graph_slopes(slope_file):
+def graph_slopes(slope_file, break_xs=None, break_times=None):
+    from pylab import meshgrid, cm, contourf, contour, ion, plot, xlabel, \
+         ylabel, close, legend, savefig, title, figure ,colorbar, show , axis
     origin = 'lower'
     times, slope_locations, slopes = load_slopes(slope_file)
-    X, Y = meshgrid(times, slope_locations)
-    #print "X", times
-    #print "Y", slope_locations
+    #print "times", times
+    #print "slope_locations", slope_locations
     #print "slopes", slopes
+
+    # Can't seem to reshape this info once it is in the function
     CS = contourf(slope_locations, times, slopes, 10, # [-1, -0.1, 0, 0.1],
-                        #alpha=0.5,
-                        cmap=cm.bone,
-                        origin=origin)
+                  #alpha=0.5,
+                  cmap=cm.bone,
+                  origin=origin)
     
     #CS2 = contour(slope_locations, times, slopes, CS.levels[::2],
@@ -84 +85 @@
     xlabel('x location')
     ylabel('Time, seconds')
+    axis([5.0, 5.5, 30, 60])
 
+
+    if break_times is not None and break_xs is not None:
+        plot(break_xs, break_times, 'ro')
+    
     # Make a colorbar for the ContourSet returned by the contourf call.
     cbar = colorbar(CS)
-    cbar.ax.set_ylabel('verbosity coefficient')
+    cbar.ax.set_ylabel('slope')
     # Add the contour line levels to the colorbar
     #cbar.add_lines(CS2)
@@ -105 +111 @@
                                        outputdir_name=outputdir_name)
         end = id + ".csv"
-        slope_file = pro_instance.outputdir + "slope_depth_" + end
-        graph_slopes(slope_file) 
+        slope_file = pro_instance.outputdir + "d3slope_stage_" + end
+        graph_slopes(slope_file, run_data['break_xs'],
+                     run_data['break_times']) 
     
 def gauges_for_slope():
+    from scenarios import scenarios
     from scenarios import scenarios
     
     outputdir_tag = "_good_tri_area_0.01_A"
     scenarios = [scenarios[1]] # !!!!!!!!!!!!!!!!!!!!!!
-    dx = 0.001
+    dx = 0.005
     for run_data in scenarios:
         point_x = arange(run_data['start_slope_x'],
@@ -131 +139 @@
         interpolate_sww2csv(pro_instance.outputdir + basename +".sww",
                             points,
-                            pro_instance.outputdir + "slope_depth_" + end,
-                            pro_instance.outputdir + "slope_velocity_x_" + end,
-                            pro_instance.outputdir + "slope_velocity_y_" + end)
+                            pro_instance.outputdir + "eslope_depth_" + end,
+                            pro_instance.outputdir + "eslope_velocity_x_" + end,
+                            pro_instance.outputdir + "eslope_velocity_y_" + end,
+                            pro_instance.outputdir + "eslope_stage_" + end,
+                            time_thinning=1)
   
     
@@ -142 +152 @@
     """ 
     """
+    #gauges_for_slope()
     auto_graph_slopes()