Changeset 5362

Timestamp:

May 26, 2008, 9:41:47 AM (16 years ago)

Author:

kristy

Message:

updated, anuga directory structure

File:

• anuga_work/production/onslow_2006/run_onslow.py (modified) (5 diffs)

anuga_work/production/onslow_2006/run_onslow.py

@@ -25 +25 @@
 from anuga.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from anuga.abstract_2d_finite_volumes.combine_pts import combine_rectangular_points_files 
+from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts, ferret2sww
+#from anuga.abstract_2d_finite_volumes.combine_pts import combine_rectangular_points_files 
 from anuga.geospatial_data.geospatial_data import *
-from anuga.abstract_2d_finite_volumes.util import Screen_Catcher
+#from anuga.abstract_2d_finite_volumes.util import Screen_Catcher
+#from anuga.shallow_water.data_manager import start_screen_catcher
 
 # Application specific imports
@@ -38 +39 @@
 #-------------------------------------------------------------------------------
 
-# creates copy of code in output dir if dir doesn't exist
+### creates copy of code in output dir if dir doesn't exist
 if access(project.outputtimedir,F_OK) == 0 :
     mkdir (project.outputtimedir)
@@ -45 +46 @@
 print'output dir', project.outputtimedir
 
-#normal screen output is stored in 
-screen_output_name = project.outputtimedir + "screen_output.txt"
-screen_error_name = project.outputtimedir + "screen_error.txt"
-
-#used to catch screen output to file
-sys.stdout = Screen_Catcher(screen_output_name)
-#sys.stderr = Screen_Catcher(screen_output_name)
-sys.stderr = Screen_Catcher(screen_error_name)
-
-print 'USER:    ', project.user
+###normal screen output is stored in 
+##screen_output_name = project.outputtimedir + "screen_output.txt"
+##screen_error_name = project.outputtimedir + "screen_error.txt"
+##
+###used to catch screen output to file
+##sys.stdout = Screen_Catcher(screen_output_name)
+###sys.stderr = Screen_Catcher(screen_output_name)
+##sys.stderr = Screen_Catcher(screen_error_name)
+##
+##print 'USER:    ', project.user
 
 #-------------------------------------------------------------------------------
@@ -96 +97 @@
 
 print'create G1'
-G1 = Geospatial_data(file_name = project.offshore_dem_name + '.xya')
+G1 = Geospatial_data(file_name = project.offshore_dem_name + '.txt')
 print'create G2'
 G2 = Geospatial_data(file_name = project.onshore_dem_name + '.pts')
 print'create G3'
-G3 = Geospatial_data(file_name = project.coast_dem_name + '.xya')
+G3 = Geospatial_data(file_name = project.coast_dem_name + '.txt')
 print'create G4'
 G4 = Geospatial_data(file_name = project.islands_dem_name + '.pts')
@@ -184 +185 @@
 #-------------------------------------------------------------------------------
 print 'start ferret2sww'
-from anuga.pyvolution.data_manager import ferret2sww
+
 
 south = project.south