Changeset 4003

Timestamp:

Nov 17, 2006, 10:24:43 AM (18 years ago)

Author:

sexton

Message:

including data and supporting files for Cairns demo + updating scripts

Location:

anuga_core/documentation/user_manual/demos/cairns

Files:

• cairns.asc (added)
• cairns.csv (added)
• cairns.prj (added)
• extent.csv (added)
• islands.csv (added)
• islands1.csv (added)
• islands2.csv (added)
• islands3.csv (added)
• project.py (modified) (3 diffs)
• runcairns.py (modified) (5 diffs)
• shallow.csv (added)

anuga_core/documentation/user_manual/demos/cairns/project.py

@@ -10 +10 @@
                                     polygon_area, is_inside_polygon
 
-if sys.platform == 'win32':
-    home = getenv('INUNDATIONHOME')
-    user = getenv('USERPROFILE')
-
-else:    
-    home = getenv('INUNDATIONHOME', sep+'d'+sep+'xrd'+sep+'gem'+sep+\
-                  '2'+sep+'ramp'+sep+'risk_assessment_methods_project'+\
-                  sep+'inundation')     
-    user = getenv('LOGNAME')
-    print 'USER:', user
-
-# INUNDATIONHOME is the inundation directory, not the data directory.
-home += sep +'data'
-
-#Making assumptions about the location of scenario data
-state = 'queensland'
-scenario_dir_name = 'cairns_tsunami_scenario_demo'
-
-# onshore data provided by WA DLI
-demname = 'cairns'
-
-#swollen/ all data output
-basename = 'source'
-codename = 'project.py'
-
-#Derive subdirectories and filenames
-local_time = strftime('%Y%m%d_%H%M%S',gmtime()) 
-meshdir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'meshes'+sep
-datadir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'topographies'+sep
-gaugedir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'gauges'+sep
-polygondir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'polygons'+sep
-boundarydir = home+sep+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'boundaries'+sep
-outputdir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'outputs'+sep
-outputtimedir = outputdir + local_time + sep
-polygondir = home+sep+state+sep+scenario_dir_name+sep+'anuga'+sep+'polygons'+sep
-
-gauge_filename = gaugedir + 'gauges.csv'
-codedir = getcwd()+sep                            
-codedirname = codedir + 'project.py'
-#meshname = outputtimedir + 'mesh_' + basename
-
-# Necessary if using point datasets, rather than grid
-dem_name = datadir + demname
-
 ###############################
 # Domain definitions
@@ -59 +15 @@
 
 # bounding polygon for study area
-polyAll = read_polygon(polygondir+'extent_v2.csv')
+polyAll = read_polygon('extent.csv')
 
 print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
+
+###############################
+# Interior region definitions
+###############################
+
+# interior polygons
+poly_cairns = read_polygon('cairns.csv')
+poly_island0 = read_polygon('islands.csv')
+poly_island1 = read_polygon('islands1.csv')
+poly_island2 = read_polygon('islands2.csv')
+poly_island3 = read_polygon('islands3.csv')
+poly_shallow = read_polygon('shallow.csv')
+
+plot_polygons([polyAll,poly_cairns,poly_island0,poly_island1,\
+               poly_island2,poly_island3,poly_shallow],\
+              'boundingpoly',verbose=False)
 
 ###################################################################
@@ -73 +45 @@
 northingmax = 8148700
 
-###############################
-# Interior region definitions
-###############################
 
-# broome digitized polygons
-poly_cairns = read_polygon(polygondir+'cairns.csv')
-poly_island0 = read_polygon(polygondir+'islands.csv')
-poly_island1 = read_polygon(polygondir+'islands1.csv')
-poly_island2 = read_polygon(polygondir+'islands2.csv')
-poly_island3 = read_polygon(polygondir+'islands3.csv')
-poly_shallow = read_polygon(polygondir+'shallow.csv')
-
-plot_polygons([polyAll,poly_cairns,poly_island0,poly_island1,\
-               poly_island2,poly_island3,poly_shallow],\
-              'boundingpoly',verbose=False)
-
-#slump_origin = [633361, 8129700]
-#slump_depth = 986
 slump_origin = [451871, 8128376] # move onto the continental shelf, depth = 500
 slump_depth = 500.
+
+gauge_filename = 'gauges.csv'

anuga_core/documentation/user_manual/demos/cairns/runcairns.py

@@ -28 +28 @@
 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
 
 # Application specific imports
@@ -36 +35 @@
 # Define scenario as either slump or fixed_wave.
 #-------------------------------------------------------------------------------
-scenario = 'slump' # 'fixedwave'
-mkdir (scenario)
-basename = scenario + project.basename
-
-#-------------------------------------------------------------------------------
-# Copy scripts to time stamped output directory and capture screen
-# output to file
-#-------------------------------------------------------------------------------
-
-# creates copy of code in output dir if dir doesn't exist
-if access(project.outputtimedir,F_OK) == 0 :
-    mkdir (project.outputtimedir)
-copy (project.codedirname, project.outputtimedir + project.codename)
-copy (project.codedir + 'runcairns.py', project.outputtimedir + 'runcairns2.py')
-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_error_name)
-
-print 'USER:    ', project.user
+scenario = 'slump' # OR 'fixed_wave'
+if access(scenario,F_OK) == 0:
+    mkdir (scenario)
+basename = scenario + 'source'
 
 #-------------------------------------------------------------------------------
@@ -69 +47 @@
 
 # filenames
-dem_name = project.dem_name
-meshname = project.meshname+'.msh'
+dem_name = 'cairns' 
+meshname = 'cairns.msh'
 
 # creates DEM from asc data
@@ -116 +94 @@
 print domain.statistics()
 
-domain.set_name(basename) #domain.set_name(project.basename)
-domain.set_datadir(scenario) #domain.set_datadir(project.outputtimedir)
+domain.set_name(basename) 
+domain.set_datadir(scenario)
 domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
 domain.set_minimum_storable_height(0.01)
@@ -129 +107 @@
 domain.set_quantity('friction', 0.0) 
 domain.set_quantity('elevation', 
-                    filename = project.dem_name + '.pts',
+                    filename = dem_name + '.pts',
                     use_cache = True,
                     verbose = True,