Changeset 4212 for anuga_work/production

Timestamp:

Feb 5, 2007, 11:28:49 AM (18 years ago)

Author:

nick

Message:

update to dampier

Location:

anuga_work/production/dampier_2006

Files:

• build_dampier.py (modified) (6 diffs)
• project.py (modified) (3 diffs)
• run_dampier.py (modified) (4 diffs)

anuga_work/production/dampier_2006/build_dampier.py

@@ -61 +61 @@
 coast_in_dir_name = project.coast_in_dir_name
 offshore_in_dir_name = project.offshore_in_dir_name
-#offshore1_in_dir_name = project.offshore1_in_dir_name
-#offshore2_in_dir_name = project.offshore2_in_dir_name
+offshore1_in_dir_name = project.offshore1_in_dir_name
+offshore2_in_dir_name = project.offshore2_in_dir_name
 
 onshore_dir_name = project.onshore_dir_name
 coast_dir_name = project.coast_dir_name
 offshore_dir_name = project.offshore_dir_name
-#offshore1_dir_name = project.offshore1_dir_name
-#offshore2_dir_name = project.offshore2_dir_name
-
+offshore1_dir_name = project.offshore1_dir_name
+offshore2_dir_name = project.offshore2_dir_name
+'''
 # creates DEM from asc data
 print "creates DEMs from asc data"
@@ -75 +75 @@
                               basename_out=onshore_dir_name,
                               use_cache=True, verbose=True)
-'''
+
 convert_dem_from_ascii2netcdf(offshore1_in_dir_name,
                               basename_out=offshore1_dir_name,
@@ -82 +82 @@
                               basename_out=offshore2_dir_name,
                               use_cache=True, verbose=True)
-'''
+
 #creates pts file for onshore DEM
 print "creates pts file for onshore DEM"
 dem2pts(onshore_dir_name, use_cache=True, verbose=True)
-'''
+
 #creates pts file for clipped DEMs
 dem2pts(offshore1_dir_name,
@@ -94 +94 @@
         basename_out=offshore2_dir_name,
         use_cache=True, verbose=True)
-'''
+
 print'create Geospatial onshore objects from topographies'
 #print'create Geospatial coastal objects from topographies'
@@ -101 +101 @@
 #print'create Geospatial offshore objects from topographies'
 G = Geospatial_data(file_name = onshore_dir_name + '.pts') +\
-     Geospatial_data(file_name = coast_in_dir_name + '.txt') +\
-     Geospatial_data(file_name = offshore_in_dir_name + '.txt')
+    Geospatial_data(file_name = coast_in_dir_name + '.txt') +\
+    Geospatial_data(file_name = offshore_in_dir_name + '.txt') +\
+    Geospatial_data(file_name = offshore1_dir_name + '.pts') +\
+    Geospatial_data(file_name = offshore2_dir_name + '.pts')
+     
 
 print'add all geospatial objects'
@@ -124 +127 @@
 G_small.export_points_file(project.combined_dir_name + '_small' + '.pts')
 G_other.export_points_file(project.combined_dir_name + '_other' + '.pts')
+'''
+print 'start reading:',project.combined_dir_name + '.pts'
+G = Geospatial_data(file_name = project.combined_dir_name + '.pts')
+print 'start export',project.combined_dir_name + '.txt'
+G.export_points_file(project.combined_dir_name + '.txt')
 
 
+
+
+

anuga_work/production/dampier_2006/project.py

@@ -27 +27 @@
 print 'gtime: ', gtime
 
-tide = 0.6
+tide = 2.4
 
 #Making assumptions about the location of scenario data
@@ -40 +40 @@
 coast_name = 'coastline_edited_w_DEM'
 offshore_name = 'clipped_bathy'
-#offshore1_name = 'elev_501'
-#offshore2_name = 'inferrec_e'
+offshore1_name = 'elev_501'
+offshore2_name = 'inferrec_e'
 
 #final topo name
@@ -55 +55 @@
 coast_in_dir_name = topographies_in_dir + coast_name
 offshore_in_dir_name = topographies_in_dir + offshore_name
-#offshore1_in_dir_name = topographies_in_dir + offshore1_name
-#offshore2_in_dir_name = topographies_in_dir + offshore2_name
+offshore1_in_dir_name = topographies_in_dir + offshore1_name
+offshore2_in_dir_name = topographies_in_dir + offshore2_name
 
 onshore_dir_name = topographies_dir + onshore_name
 coast_dir_name = topographies_dir + coast_name
 offshore_dir_name = topographies_dir + offshore_name
-#offshore1_dir_name = topographies_dir + offshore1_name
-#offshore2_dir_name = topographies_dir + offshore2_name
+offshore1_dir_name = topographies_dir + offshore1_name
+offshore2_dir_name = topographies_dir + offshore2_name
 
 #final topo files

anuga_work/production/dampier_2006/run_dampier.py

@@ -145 +145 @@
 
     domain.set_quantity('elevation', 
-                    filename = project.combined_dir_name + '.pts',
+#                    filename = project.combined_dir_name + '.pts',
+# MUST USE TXT FILES FOR CACHING TO WORK!
+                    filename = project.combined_dir_name + '.txt',
                     use_cache = True,
                     verbose = True,
@@ -179 +181 @@
 print 'Reading Boundary file'
 Bf = File_boundary(boundaries_dir_name + '.sww',
-                  domain, time_thinning=10, use_cache=True, verbose=True)
+                  domain, time_thinning=1, use_cache=True, verbose=True)
 
 print 'finished reading boundary file'
@@ -201 +203 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 120, finaltime = 34000):
+for t in domain.evolve(yieldstep = 120, finaltime = 9000):
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')
@@ -209 +211 @@
 #    domain.write_boundary_statistics(tags = 'ocean')
      
-#for t in domain.evolve(yieldstep = 60, finaltime = 28800
-#                       ,skip_initial_step = True):
-#    domain.write_time()
-#    domain.write_boundary_statistics(tags = 'ocean')    
-
-#for t in domain.evolve(yieldstep = 120, finaltime = 34800
-#                       ,skip_initial_step = True): 
-#    domain.write_time()
-#    domain.write_boundary_statistics(tags = 'ocean')    
+for t in domain.evolve(yieldstep = 60, finaltime = 28800
+                       ,skip_initial_step = True):
+    domain.write_time()
+    domain.write_boundary_statistics(tags = 'ocean')    
+
+for t in domain.evolve(yieldstep = 120, finaltime = 34800
+                       ,skip_initial_step = True): 
+    domain.write_time()
+    domain.write_boundary_statistics(tags = 'ocean')    
 
 x, y = domain.get_maximum_inundation_location()