Changeset 5577

Timestamp:

Jul 25, 2008, 4:36:05 PM (15 years ago)

Author:

duncan

Message:

Current Hinwood scenario calculating RMSD's

Location:

anuga_work/development/Hinwood_2008

Files:

• calc_norm.py (added)
• create_mesh.py (modified) (2 diffs)
• plot.py (modified) (2 diffs)
• project.py (modified) (3 diffs)
• run_dam.py (modified) (8 diffs)
• slope.py (modified) (4 diffs)

anuga_work/development/Hinwood_2008/create_mesh.py

@@ -9 +9 @@
 
 
-def generate(mesh_filename, slope, maximum_triangle_area=0.01):
+def generate(mesh_filename, slope, width,
+             maximum_triangle_area=0.01):
     """
     Generate mesh for Monash University wave generation flume.
@@ -24 +25 @@
     xbeach = slope['xbeach'][0]
     xright = slope['xright'][0]
-    ybottom = 0
-    ytop    = 1.00
+    ytop    = width/2.0
+    ybottom = -ytop
     ###xslope = slope
 

anuga_work/development/Hinwood_2008/plot.py

@@ -83 +83 @@
     for gauge_x in run_data['gauge_x']:
         gauge_x = str(gauge_x)
-        location_sims.append(gauge_x + ':0.5')
+        location_sims.append(gauge_x + ':0.0')
         location_exps.append(gauge_x)
         save_as_list.append(pro_instance.plots_dir + sep + \
@@ -134 +134 @@
     """
     from scenarios import scenarios
-    outputdir_tag = "_good_tri_area_0.01_D"
+    outputdir_tag = "_good_tri_area_0.01_limiterE"
+    outputdir_tag = "_test_limiterE"
     #outputdir_tag = "_test_C"
     #scenarios = scenarios[1:]

anuga_work/development/Hinwood_2008/project.py

@@ -15 +15 @@
 class Project:    
     def __init__(self,
-                 trunk,
+                 trunk=['data','flumes','Hinwood_2008'],
                  outputdir_name = None,
                  home = None):
@@ -41 +41 @@
         self.raw_data_dir = join(scenariodir, 'raw_data')
         self.plots_dir = join(scenariodir, 'plots')
+        self.rmsd_dir = join(scenariodir, 'rmsd')
 
         # creates copy of output dir structure, if it doesn't exist
@@ -51 +52 @@
         if not access(self.plots_dir,F_OK):
             mkdir (self.plots_dir)
+        if not access(self.rmsd_dir,F_OK):
+            mkdir (self.rmsd_dir)
 
         self.codedir = getcwd()+sep

anuga_work/development/Hinwood_2008/run_dam.py

@@ -62 +62 @@
          outputdir_name=None,
          run_type=0,
+         width=1.0,
+         use_limits=True,
          end_tag = '_limiterD'):
 
@@ -68 +70 @@
     
     if run_type == 1:
-        outputdir_name += '_test' + end_tag
         yieldstep = 1.0
         finaltime = 15.
         maximum_triangle_area=0.1
+        outputdir_name += '_test'
         
     elif run_type == 2:
-        outputdir_name += '_test_long_time' + end_tag
         yieldstep = 0.5
         finaltime = None
         maximum_triangle_area=0.01
+        outputdir_name += '_test_long_time'
         
     elif run_type == 3:
-        outputdir_name += '_yieldstep_0.1_tri_area_0.01' + end_tag
         yieldstep = 0.1
         finaltime = None       
         maximum_triangle_area=0.01
+        #outputdir_name += '_yieldstep_0.1'
+        
     elif run_type == 4:
-        outputdir_name += '_good_tri_area_0.01' + end_tag
         # this is not a test
         # Output will go to a file
@@ -92 +94 @@
         finaltime = None        
         maximum_triangle_area=0.01
+        #outputdir_name += '_good'
+        
     elif run_type == 5:
-        outputdir_name += '_good_tri_area_0.001' + end_tag
         # this is not a test
         # Output will go to a file
@@ -100 +103 @@
         finaltime = None        
         maximum_triangle_area=0.001
-     
+        #outputdir_name += '_good'
+        
+    elif run_type == 6:
+        # this is not a test
+        # Output will go to a file
+        # The sww file will be interpolated
+        yieldstep = 0.01
+        finaltime = None        
+        maximum_triangle_area=0.0001
+        #outputdir_name += '_good'
+        
+    if use_limits is True:
+        outputdir_name += '_lmts'
+    else:
+        outputdir_name += '_nolmts'
+    outputdir_name += '_wdth_' + str(width)
+    outputdir_name += '_z_' + str(friction)
+    outputdir_name += '_ys_' + str(yieldstep)
+    outputdir_name += '_mta_' + str(maximum_triangle_area)
+    outputdir_name += end_tag
+    
     metadata_dic = set_z_origin_to_water_depth(metadata_dic)    
         
@@ -150 +173 @@
     # this creates the mesh
     #gate_position = 12.0
-    create_mesh.generate(mesh_filename, metadata_dic,
+    create_mesh.generate(mesh_filename, metadata_dic, width=width,
                          maximum_triangle_area=maximum_triangle_area)
 
@@ -172 +195 @@
     domain.set_minimum_storable_height(0.0001)
 
-    domain.set_default_order(2) # Use second order spatial scheme
-    domain.set_timestepping_method('rk2')
-    domain.use_edge_limiter = True
-    domain.tight_slope_limiters = True
-    
-    domain.beta_w      = 0.6
-    domain.beta_uh     = 0.6
-    domain.beta_vh     = 0.6
+    if use_limits is True:
+        domain.set_default_order(2) # Use second order spatial scheme
+        domain.set_timestepping_method('rk2')
+        domain.use_edge_limiter = True
+        domain.tight_slope_limiters = True
+        
+        domain.beta_w      = 0.6
+        domain.beta_uh     = 0.6
+        domain.beta_vh     = 0.6
     
 
@@ -223 +247 @@
     print 'finished'
 
-    flume_y_middle = 0.5
+    flume_y_middle = 0.0
     points = []
     for gauge_x in metadata_dic['gauge_x']:
@@ -259 +283 @@
     #from plot import plot
 
-
+    # 1 is fast and dirty
     # 4 is 0.01
     # 5 is 0.001
+    # 6 is 0.0001
+    
+    #run_type = 1
     run_type = 5
     #for run_data in [scenarios[5]]:
     #scenarios = scenarios[2:]
     #scenarios = [scenarios[0]]
+    width = 1.0
+    width = 0.1
     for run_data in scenarios:
         pro_instance = main( run_data['scenario_id'] + '_boundary.tsm'  ,
                              run_data,
-                             run_type = run_type,
+                             width=width,
+                             run_type=run_type,
                              outputdir_name=run_data['scenario_id'],
-                             end_tag='_limiterD')
+                             use_limits=False,
+                             friction=0.012, 
+                             end_tag='_G')
         #gauges_for_slope(pro_instance.outputdir,[run_data])

anuga_work/development/Hinwood_2008/slope.py

@@ -43 +43 @@
     quantity_locations = title.split(',') #(',')
     quantity_locations.pop(0) # remove 'time'
-    
+
+    # Doing j.split(':')[0] drops the y location
     locations = [float(j.split(':')[0]) for j in quantity_locations]
     
@@ -459 +460 @@
     It also create's a frounde file.
     """
-    dx = 0.05
+    dx = 0.005
     for run_data in scenarios:
         point_x = arange(run_data['start_slope_x'],
                         run_data['finish_slope_x'],
                         dx).tolist()
-        flume_y_middle = 0.5
+        flume_y_middle = 0.0
         points = []
         for gauge_x in point_x:
@@ -673 +674 @@
     #scenarios = [scenarios[0]]
     outputdir_tag = "_good_tri_area_0.01_limiterD"
-    outputdir_tag = "_good_tri_area_0.001_limiterD"
+    outputdir_tag = "_good_lmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_F"
     slope_tag = ""
     #outputdir_tag = "_test_limiterC"
@@ -679 +680 @@
     #scenarios = scenarios[4:] # !!!!!!!!!!!!!!!!!!!!!!
     
-    #gauges_for_slope(slope_tag, outputdir_tag, scenarios)
+    gauges_for_slope(slope_tag, outputdir_tag, scenarios)
     #auto_graph_slopes(outputdir_tag, scenarios) #, is_interactive=True) 
-    #auto_find_min_slopes(slope_tag, outputdir_tag, scenarios)
+    auto_find_min_slopes(slope_tag, outputdir_tag, scenarios)
     #auto_graph_froudes(outputdir_tag, scenarios) 
-    auto_plot_froude_slopes(slope_tag, outputdir_tag, scenarios)
+    #auto_plot_froude_slopes(slope_tag, outputdir_tag, scenarios)
     #g = Get_file_name(scenarios[0], outputdir_tag, slope_tag)
     #for wave_file, save_as, wave_number in Get_file_name(