Changeset 4750

Timestamp:

Oct 23, 2007, 4:00:41 PM (17 years ago)

Author:

duncan

Message:

simplify

Location:

anuga_validation/UQ_runup_2006

Files:

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

anuga_validation/UQ_runup_2006/create_mesh.py

@@ -7 +7 @@
 
 
-def generate(mesh_filename, gate_position, flume_length, is_course = False):
+def generate(mesh_filename, gate_position, is_course = False):
     #Basic geometry
     

anuga_validation/UQ_runup_2006/project.py

@@ -2 +2 @@
 Also includes origin for slump scenario.
 """
-
-from os import sep, environ, getenv, getcwd
-import sys
-from time import localtime, strftime
-from os import mkdir, access, F_OK
-                
-#Making assumptions about the location of scenario data
-scenario_dir_name = 'data'+sep+'flumes'+sep+'dam_2007'
-
-#swollen/ all data output
-basename = 'source'
-
-if sys.platform == 'win32':
-    try:
-        home = environ['INUNDATIONHOME']     #Sandpit's parent dir
-    except:
-        home = '.'
-else:    
-    home = getenv('INUNDATIONHOME', sep+'d'+sep+'cit'+sep+'1'+sep+'cit'+sep+'risk_assessment_methods_project'+sep+'inundation')     
+basename = "uq"
+depth_filename = "depth.csv"
+velocity_x_filename =  "velocity_x.csv"
+velocity_y_filename =  "velocity_y.csv"
 
 
-if not access(home, F_OK):
-    home = '.'
-    
-#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
-outputtimedir = outputdir+time+sep
-meshdir = scenariodir+sep+'meshes'+sep
+mesh_filename = 'uq-mesh.tsh'
 
-depth_filename = outputtimedir + "depth.csv"
-velocity_x_filename = outputtimedir + "velocity_x.csv"
-velocity_y_filename = outputtimedir + "velocity_y.csv"
-
-
-# creates copy of output dir structure, if it doesn't exist
-if not access(scenariodir,F_OK):
-    mkdir (scenariodir)
-
-if not access(meshdir,F_OK):
-    mkdir (meshdir)
-
-if not access(outputdir,F_OK):
-    mkdir (outputdir)
-        
-if not access(outputtimedir,F_OK):
-    mkdir (outputtimedir)
-
-codedir = getcwd()+sep
-                                
-codedirname = codedir + 'project.py'
-
-meshname = meshdir + basename
-
-outputname = outputtimedir + basename  #Used by post processing
-
-mesh_filename = meshname+'.tsh'
-

anuga_validation/UQ_runup_2006/run_dam.py

@@ -25 +25 @@
 import create_mesh
 
+import project
+
+
 # Application specific imports
 
@@ -34 +37 @@
     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:
-        for friction in frictions:
-            for inital_depth in inital_depths:
-                for flume_length in flume_lengths:
-                    for gate_position in gate_positions:
-                        scenario(slope, friction, inital_depth, gate_position, flume_length)
+   
+    scenario(0, 0.01, 0.02, 0.75)
             
 
-def scenario(slope, friction, inital_depth, gate_position, flume_length):
-    
-    import project                 # Definition of file names and polygons
-
-    #-------------------------------------------------------------------------
-    # Setup archiving of simulations
-    #-------------------------------------------------------------------------
-
-    id = 'd'+ str(inital_depth) + '_s'+str(slope)+'_g'+ str(gate_position)+ '_n'+ str(friction)
-    copy (project.codedirname, project.outputtimedir + 'project.py')
-    run_name = 'run_dam.py'
-    run_name_out = 'run_dam'+id+'.py'
-
-    copy (project.codedir + run_name, project.outputtimedir + run_name_out)
-    copy (project.codedir + 'create_mesh.py',
-          project.outputtimedir + 'create_mesh.py')
-    print'output dir', project.outputtimedir
+def scenario(slope, friction, inital_depth, gate_position):
 
     #-------------------------------------------------------------------------
@@ -68 +48 @@
 
     create_mesh.generate(project.mesh_filename,
-                         gate_position, flume_length,
-                         #is_course=True) # this creates the mesh
-                         is_course=False) # this creates the mesh
+                         gate_position,
+                         is_course=True) # this creates the mesh
+                         #is_course=False) # this creates the mesh
 
     head,tail = path.split(project.mesh_filename)
-    copy (project.mesh_filename,
-          project.outputtimedir + tail )
     #-------------------------------------------------------------------------
     # Setup computational domain
@@ -86 +64 @@
 
     
-    domain.set_name(project.basename + id)
-    domain.set_datadir(project.outputtimedir)
+    domain.set_name(project.basename)
+    domain.set_datadir('.')
     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
     domain.set_minimum_storable_height(0.001)
@@ -123 +101 @@
         print 'finished'
         
-    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]
-              ]
+    points = [[0.4,0.2]]
     #-------------------------------------------------------------------------
     # Calculate gauge info
     #-------------------------------------------------------------------------
-    print "name", project.outputtimedir + project.basename \
-                   + id+".sww"
-    interpolate_sww2csv(project.outputtimedir + project.basename \
-                   + id+".sww",
+    print "name",project.basename +".sww"
+    interpolate_sww2csv( project.basename +".sww",
                         points,
-                        project.depth_filename + id + '.csv',
-                        project.velocity_x_filename + id + '.csv',
-                        project.velocity_y_filename + id + '.csv')
+                        project.depth_filename + '.csv',
+                        project.velocity_x_filename + '.csv',
+                        project.velocity_y_filename + '.csv')