Changeset 7658 for anuga_work/production

Timestamp:

Mar 9, 2010, 7:28:28 PM (15 years ago)

Author:

Leharne Fountain

Message:

updates to bunbury storm surge model

Location:

anuga_work/production/bunbury_storm_surge_2009

Files:

• build_elevation.py (modified) (3 diffs)
• project.py (modified) (4 diffs)
• run_model.py (modified) (1 diff)

anuga_work/production/bunbury_storm_surge_2009/build_elevation.py

@@ -94 +94 @@
 G9 = geospatial_data[keylist[8]]
 G10 = geospatial_data[keylist[9]]
-G11 = geospatial_data[keylist[10]]
+#G11 = geospatial_data[keylist[10]]
 
 
@@ -120 +120 @@
 #~ print 'G10', G10.attributes
 
-G = G1 + G2 + G3 + G4 + G5 + G6 + G7 + G8 + G9 + G10 + G11
+G = G1 + G2 + G3 + G4 + G5 + G6 + G7 + G8 + G9 + G10 #+ G11
 
 # G = None
@@ -144 +144 @@
 
 print 'Export individual text files'
-for i in xrange(len(keylist)):
-    G[i+1].export_points_file(join(project.topographies_folder, keylist[i] +'_export.txt'))
+#for i in xrange(len(keylist)):
+#    G[i+1].export_points_file(join(project.topographies_folder, keylist[i] +'_export.txt'))
  
-# G1.export_points_file(join(project.topographies_folder, keylist[0] +'_export.txt'))
-# G2.export_points_file(join(project.topographies_folder, keylist[1] +'_export.txt'))
-# G3.export_points_file(join(project.topographies_folder, keylist[2] +'_export.txt'))
-# G4.export_points_file(join(project.topographies_folder, keylist[3] +'_export.txt'))
-# G5.export_points_file(join(project.topographies_folder, keylist[4] +'_export.txt'))
-# G6.export_points_file(join(project.topographies_folder, keylist[5] +'_export.txt'))
-# G7.export_points_file(join(project.topographies_folder, keylist[6] +'_export.txt'))
-# G8.export_points_file(join(project.topographies_folder, keylist[7] +'_export.txt'))
-# G9.export_points_file(join(project.topographies_folder, keylist[8] +'_export.txt'))
-# G10.export_points_file(join(project.topographies_folder, keylist[9] +'_export.txt'))
-# G11.export_points_file(join(project.topographies_folder, keylist[10] +'_export.txt'))
+G1.export_points_file(join(project.topographies_folder, keylist[0] +'_export.txt'))
+G2.export_points_file(join(project.topographies_folder, keylist[1] +'_export.txt'))
+G3.export_points_file(join(project.topographies_folder, keylist[2] +'_export.txt'))
+G4.export_points_file(join(project.topographies_folder, keylist[3] +'_export.txt'))
+G5.export_points_file(join(project.topographies_folder, keylist[4] +'_export.txt'))
+G6.export_points_file(join(project.topographies_folder, keylist[5] +'_export.txt'))
+G7.export_points_file(join(project.topographies_folder, keylist[6] +'_export.txt'))
+G8.export_points_file(join(project.topographies_folder, keylist[7] +'_export.txt'))
+G9.export_points_file(join(project.topographies_folder, keylist[8] +'_export.txt'))
+G10.export_points_file(join(project.topographies_folder, keylist[9] +'_export.txt'))
+#G11.export_points_file(join(project.topographies_folder, keylist[10] +'_export.txt'))

anuga_work/production/bunbury_storm_surge_2009/project.py

@@ -8 +8 @@
 from time import localtime, strftime, gmtime
 from os.path import join, exists
-import anuga.utilities.log as log
+#import anuga.utilities.log as log
 
 
@@ -38 +38 @@
 friction = 0.01           # manning's friction coefficient
 starttime = 86400          # start time for simulation - -equivalent to 0000h 4 April 1978
-finaltime = 87840 #172800         # final time for simulation - 24 hours for TC Alby
+finaltime = 172800         # final time for simulation - 24 hours for TC Alby
 
 setup = 'storm_surge_final'      # This can be one of four values
@@ -85 +85 @@
                    'Busselton_Chart_Clip_ss.txt',               # Clipped from Busselton_Chart  - see Busselton Tsunami Scenario 2009
                    'Busselton_NavyFinal_Clip_ss.txt',   # Clipped from Busselton_NavyFinal - see Busselton Tsunami Scenario 2009
-                   'DPI5U1A02_01a_edited.txt',          # Bathymetric LiDAR from DPI - split into manageable pieces and edited so 
-                   'DPI5U1A02_01b_edited.txt',          # depths below 0 m are negative, and all soundings on land (ie positive) 
-                   'DPI5U1A02_01c_edited.txt',          # are removed as these are not corrected to "bare earth".
-                   'DPI5U1A02_01d_edited.txt',
-                   'DPI5U1A02_01e_edited.txt',
-                   'Leschenault_TIN.txt']               # TIN created over the Leschenault Estuary and Inlet]                                   
+                   'DPI5U1A02_01a_edited_v2.txt',          # Bathymetric LiDAR from DPI - split into manageable pieces and edited so 
+                   'DPI5U1A02_01b_edited_v2.txt',               # depths below 0 m are negative, and all soundings on land (ie positive) 
+                   'DPI5U1A02_01c_edited_v2.txt',          # are removed as these are not corrected to "bare earth".
+                   'DPI5U1A02_01d_edited_v2.txt',
+                   'DPI5U1A02_01e_edited_v2.txt']
+#                   'Leschenault_TIN.txt']               # TIN created over the Leschenault Estuary and Inlet]                                  
 
 # BOUNDING POLYGON - for data clipping and estimate of triangles in mesh
@@ -233 +233 @@
 
 # Log file name
-log.log_filename = join(output_run, scenario_name) + '.log'
+#log.log_filename = join(output_run, scenario_name) + '.log'
 
 # The absolute pathname for the storm gate file

anuga_work/production/bunbury_storm_surge_2009/run_model.py

@@ -49 +49 @@
 from setup_model import project
 ##import build_urs_boundary as bub
-
-# Imports for floodgates
-from project import floodgate_boundary, floodgate_resolution