Changeset 4509

Timestamp:

May 29, 2007, 10:31:20 AM (17 years ago)

Author:

nick

Message:

updates to exmouth

Location:

anuga_work/production/exmouth_2006

Files:

• build_exmouth.py (modified) (1 diff)
• project.py (modified) (4 diffs)
• run_exmouth.py (modified) (3 diffs)
• run_store.py (added)

anuga_work/production/exmouth_2006/build_exmouth.py

@@ -27 +27 @@
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
 from anuga.geospatial_data.geospatial_data import *
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, copy_code_files
+from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
 from anuga_parallel.parallel_abstraction import get_processor_name
 

anuga_work/production/exmouth_2006/project.py

@@ -11 +11 @@
 from anuga.utilities.system_tools import get_user_name, get_host_name
 
-codename = 'project.py'
+#codename = 'project.py'
 
 home = getenv('INUNDATIONHOME') + sep +'data'+sep #Sandpit's parent dir   
@@ -17 +17 @@
 host = get_host_name()
 #needed when running using mpirun, mpirun doesn't inherit umask from .bashrc
-umask(002)
+#umask(002)
 
 #Making assumptions about the location of scenario data
@@ -38 +38 @@
 starttime=3600
 finaltime=25000
-setup='trial'
+setup='store'
 
 if setup =='trial':
@@ -55 +55 @@
     time_thinning=1
     yieldstep=60
+if setup =='store':
+    print'store'
+    res_factor=10
+    time_thinning=48
+    yieldstep=240    
+
 
 dir_comment='_'+setup+'_'+str(tide)+'_'+str(user)

anuga_work/production/exmouth_2006/run_exmouth.py

@@ -33 +33 @@
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, copy_code_files,store_parameters
+from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files,store_parameters
 from anuga_parallel.parallel_api import distribute, numprocs, myid, barrier
 from anuga_parallel.parallel_abstraction import get_processor_name
@@ -65 +65 @@
     kwargs['output_dir']=project.output_run_time_dir
     kwargs['bathy_file']=project.combined_dir_name+'.txt'
-#    kwargs['bathy_file']=project.combined_small_dir_name + '.pts'
+#    kwargs['bathy_file']=project.combined_small_dir_name + '.txt'
     kwargs['boundary_file']=project.boundaries_in_dir_name + '.sww'
 
@@ -246 +246 @@
     swwfile = kwargs['output_dir']+kwargs['aa_scenario_name']+'.sww'
     buildings_filename = project.buildings_filename
-    buildings_filename_out = file_loc + project.buildings_filename_out
+    buildings_filename_out = project.buildings_filename_out
                 
     inundation_damage(swwfile, buildings_filename, buildings_filename_out)