Changeset 6263

Timestamp:

Feb 3, 2009, 2:49:34 PM (16 years ago)

Author:

ole

Message:

Fiddling

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_busselton.py (modified) (5 diffs)
• run_busselton.py (modified) (4 diffs)

anuga_work/production/busselton/standardised_version/build_busselton.py

@@ -1 @@
-"""
-Script for building the elevation data to run a tsunami inundation scenario
-for busselton, WA, Australia.
+"""Build the elevation data to run a tsunami inundation scenario 
+for Busselton, WA, Australia.
 
 Input: elevation data from project.py
@@ -17 +16 @@
 
 # Related major packages
-from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf
+from anuga.shallow_water.data_manager import dem2pts
+from anuga.shallow_water.data_manager import start_screen_catcher
+from anuga.shallow_water.data_manager import copy_code_files
 from anuga.geospatial_data.geospatial_data import Geospatial_data
-from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
 
 # Application specific imports
 import project   # Definition of file names and polygons
+
 
 #------------------------------------------------------------------------------
@@ -28 +30 @@
 # output to file
 #------------------------------------------------------------------------------
-
 copy_code_files(project.output_build_time_dir,__file__, 
-                os.path.dirname(project.__file__)+os.sep+ project.__name__+'.py' )
+                os.path.dirname(project.__file__)+os.sep+\
+                project.__name__+'.py' )
 start_screen_catcher(project.output_build_time_dir)
 
 
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Preparation of topographic data
 #
@@ -40 +42 @@
 # Do for coarse and fine data
 # Fine pts file to be clipped to area of interest
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 print 'project.poly_all', project.poly_all
@@ -83 +85 @@
 G_clipped.export_points_file(project.combined_dir_name + '.pts')
 print 'Do txt version too'
-G_clipped.export_points_file(project.combined_dir_name + '.txt') # Use for comparision in ARC
+# Use for comparision in ARC
+G_clipped.export_points_file(project.combined_dir_name + '.txt')
 

anuga_work/production/busselton/standardised_version/run_busselton.py

@@ -1 @@
-"""Script for running a tsunami inundation scenario for busselton, WA, Australia.
+"""Run a tsunami inundation scenario for Busselton, WA, Australia.
 
-The scenario is defined by a triangular mesh created from project.polygon,
-the elevation data is compiled into a pts file through build_busselton.py
-and a simulated tsunami is generated through an sts file from build_boundary.py.
+The scenario is defined by a triangular mesh created from project.polygon, the
+elevation data is compiled into a pts file through build_busselton.py and a
+simulated tsunami is generated through an sts file from build_boundary.py.
 
 Input: sts file (build_boundary.py for respective event)
@@ -42 +42 @@
 #-----------------------------------------------------------------------
 # Copy scripts to time stamped output directory and capture screen
-# output to file
+# output to file. Copy script must be before screen_catcher
 #-----------------------------------------------------------------------
-
-copy script must be before screen_catcher
 copy_code_files(project.output_run_time_dir, __file__, 
-                os.path.dirname(project.__file__)+os.sep+ project.__name__+'.py' )
-start_screen_catcher(project.output_run_time_dir, myid, numprocs)
+                os.path.dirname(project.__file__)+os.sep+\
+                project.__name__+'.py' )
+start_screen_catcher(project.output_run_time_dir, 0, 1)
 
 
@@ -89 +88 @@
 domain.set_datadir(project.output_run_time_dir) 
 domain.set_minimum_storable_height(0.01)    # Don't store depth less than 1cm
+
 
 #-------------------------------------------------------------------------
@@ -140 +140 @@
 
 print 'Simulation took %.2f seconds' %(time.time()-t0)
-
-    
-    
-
-      
-