Changeset 4748

Timestamp:

Oct 23, 2007, 2:49:17 PM (17 years ago)

Author:

duncan

Message:

changes to matts script

Location:

anuga_validation/UQ_runup_2006

Files:

• create_mesh.py (modified) (1 diff)
• project.py (modified) (3 diffs)
• run_dam.py (modified) (3 diffs)

anuga_validation/UQ_runup_2006/create_mesh.py

@@ -52 +52 @@
         m.generate_mesh(maximum_triangle_area=0.01)
     else:
-        m.generate_mesh(maximum_triangle_area=0.001)
+        m.generate_mesh(maximum_triangle_area=0.001) 
 
     m.export_mesh_file(mesh_filename)

anuga_validation/UQ_runup_2006/project.py

@@ -9 +9 @@
                 
 #Making assumptions about the location of scenario data
-scenario_dir_name = 'dam_2006'
+scenario_dir_name = 'data'+sep+'flumes'+sep+'dam_2007'
 
 #swollen/ all data output
@@ -28 +28 @@
 #Derive subdirectories and filenames
 time = strftime('%Y%m%d_%H%M%S',localtime()) #gets time for new dir
+# time = "boom"
 scenariodir =  home+sep+scenario_dir_name
 outputdir = scenariodir+sep+'output'+sep
@@ -59 +60 @@
 outputname = outputtimedir + basename  #Used by post processing
 
-mesh_filename = meshname+'.msh'
+mesh_filename = meshname+'.tsh'
 

anuga_validation/UQ_runup_2006/run_dam.py

@@ -31 +31 @@
      
     slopes = [0]
-    frictions = [0.005, 0.01, 0.03] #can enter multiple frictions eg [0.00, 0.01]
+    frictions = [0.01] #can enter multiple frictions eg [0.00, 0.01]
     inital_depths = [0.2] #can enter multiple initial depths eg [0.1, 0.2]
     gate_positions = [0.75]
     flume_lengths = [3] #can enter multiple flume lengths eg [3.0, 5.0]
+    # NOTE flume_lengths is not used.  It's hardcoded into create_mesh
     
     for slope in slopes:
@@ -61 +62 @@
           project.outputtimedir + 'create_mesh.py')
     print'output dir', project.outputtimedir
-
-    #FIXME this isn't working
-    #normal screen output is stored in 
-    screen_output_name = project.outputtimedir + "screen_output.txt"
-    screen_error_name = project.outputtimedir + "screen_error.txt"
 
     #-------------------------------------------------------------------------
@@ -126 +122 @@
         print 'That took %.2f seconds' %(time.time()-t0)
         print 'finished'
-
-    points = [[0.45, 0.2]]
-              
-
+        
+    points = [[gate_position - 0.65,0.2],
+              [gate_position - 0.55,0.2],
+              [gate_position - 0.45,0.2],
+              [gate_position - 0.35,0.2],
+              [0.45,0.2],
+              [gate_position - 0.25,0.2]
+              ]
     #-------------------------------------------------------------------------
     # Calculate gauge info
     #-------------------------------------------------------------------------
-    #interpolate_sww2csv(project.outputtimedir + project.basename \
-     #              + id+".sww",
-      #                  points,
-       #                 project.depth_filename + id + '.csv',
-        #                project.velocity_x_filename + id + '.csv',
-         #               project.velocity_y_filename + id + '.csv')
+    print "name", project.outputtimedir + project.basename \
+                   + id+".sww"
+    interpolate_sww2csv(project.outputtimedir + project.basename \
+                   + id+".sww",
+                        points,
+                        project.depth_filename + id + '.csv',
+                        project.velocity_x_filename + id + '.csv',
+                        project.velocity_y_filename + id + '.csv')
+
 
 #-------------------------------------------------------------