Changeset 3871

Timestamp:

Oct 26, 2006, 10:38:48 AM (18 years ago)

Author:

nick

Message:

dampier updates

Location:

anuga_work/production/dampier_2006

Files:

• build_dampier.py (modified) (2 diffs)
• project.py (modified) (1 diff)
• run_dampier.py (modified) (2 diffs)

anuga_work/production/dampier_2006/build_dampier.py

@@ -52 +52 @@
 
 #normal screen output is stored in 
-screen_output_name = project.outputtimedir + "screen_output.txt"
-screen_error_name = project.outputtimedir + "screen_error.txt"
+screen_output_name = project.output_build_time_dir + "screen_output.txt"
+screen_error_name = project.output_build_time_dir + "screen_error.txt"
 
 #used to catch screen output to file
@@ -152 +152 @@
 if access(project.boundaries_time_dir,F_OK) == 0:
     mkdir (project.boundaries_time_dir)
-urs2sww(boundaries_in_dir_name,basename_out= project.boundaries_time_dir_name,
-        minlat=project.south_boundary, maxlat=project.north_boundary,
-        minlon= project.west_boundary, maxlon=project.east_boundary,
-        mint=0, maxt= 35000,
-        verbose='true')
+#urs2sww(boundaries_in_dir_name,basename_out= project.boundaries_time_dir_name,
+#        minlat=project.south_boundary, maxlat=project.north_boundary,
+#        minlon= project.west_boundary, maxlon=project.east_boundary,
+#        mint=0, maxt= 35000,
+#        verbose='true')
+        
+cache(urs2sww,
+      (boundaries_in_dir_name,
+       basename_out= project.boundaries_time_dir_name), 
+      {'verbose': True,
+       'minlat': project.south_boundary,
+       'maxlat': project.north_boundary,
+       'minlon': project.west_boundary,
+       'maxlon': project.east_boundary,
+       'mint': 0, 'maxt': 35000,
+       'origin': domain.geo_reference.get_origin(),
+       'mean_stage': project.tide,
+#       'zscale': 1,                 #Enhance tsunami
+       'fail_on_NaN': False,
+       'inverted_bathymetry': True},
+       verbose = True,
+       )
+#       dependencies = source_dir + project.boundary_basename + '.sww')
         
 

anuga_work/production/dampier_2006/project.py

@@ -37 +37 @@
 boundaries_name = 'dampier'
 boundaries_source = 'test'
+
+tide = 0.0
 
 # topography file names

anuga_work/production/dampier_2006/run_dampier.py

@@ -65 +65 @@
 
 #normal screen output is stored in 
-screen_output_name = project.outputtimedir + "screen_output.txt"
-screen_error_name = project.outputtimedir + "screen_error.txt"
+screen_output_name = project.output_run_time_dir + "screen_output.txt"
+screen_error_name = project.output_run_time_dir + "screen_error.txt"
 
 #used to catch screen output to file
@@ -138 +138 @@
 # Setup initial conditions
 #-------------------------------------------------------------------------
-tide = 2.4
+tide = project.tide
 domain.set_quantity('stage', tide)
 domain.set_quantity('friction', 0.0)