Changeset 3423

Timestamp:

Jul 25, 2006, 4:57:26 PM (19 years ago)

Author:

duncan

Message:

sync scenarios

Location:

development/dam_2006

Files:

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

development/dam_2006/project.py

@@ -38 +38 @@
 #community_scenario = gaugedir + 'community_onslow.csv'
 #gaugetimeseries = gaugedir + 'onslow'
-depth_filename = 
+depth_filename = outputtimedir + "depth.csv"
+velocity_filename = outputtimedir + "velocity.csv"
 
 

development/dam_2006/run_dam.py

@@ -27 +27 @@
 from pyvolution.util import Screen_Catcher
 from pyvolution.region import Set_region 
+from fit_interpolate.interpolate import interpolate_sww2csv
+import create_mesh
 
 # Application specific imports
 import project                 # Definition of file names and polygons
-import create_mesh
 
 def main():
@@ -43 +44 @@
     print'output dir', project.outputtimedir
 
+    #FIXME this isn't working
     #normal screen output is stored in 
     screen_output_name = project.outputtimedir + "screen_output.txt"
@@ -53 +55 @@
     create_mesh.generate(project.mesh_filename,
                          0.75,
-                         is_course=True) # this creates the mesh
-                         #is_course=False) # this creates the mesh
+                         #is_course=True) # this creates the mesh
+                         is_course=False) # this creates the mesh
 
     head,tail = path.split(project.mesh_filename)
@@ -106 +108 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = 0.1, finaltime = 15):
+    for t in domain.evolve(yieldstep = 0.1, finaltime = 25):
         domain.write_time()
     
@@ -122 +124 @@
     # Calc gauge info
     #-------------------------------------------------------------------------
-    #interpolate_sww2csv(project.basename +".sww",
-    #                    points,
-    #                    "depth.csv",
-    #                    "velocity.csv")
+    interpolate_sww2csv(project.outputtimedir + project.basename +".sww",
+                        points,
+                        project.depth_filename,
+                        project.velocity_filename)
 
 #-------------------------------------------------------------