Changeset 3661 for anuga_work/production/hobart_2006/run_hobart.py

Timestamp:

Sep 25, 2006, 2:26:13 PM (18 years ago)

Author:

sexton

Message:

clean up

File:

• anuga_work/production/hobart_2006/run_hobart.py (modified) (5 diffs)

anuga_work/production/hobart_2006/run_hobart.py

@@ -88 +88 @@
                                  project.onshore_dem_name_25 + '.pts',
                                  project.all_onshore_dem_name + '.pts')
-#print 'local offshore data sets'
-#G1 = Geospatial_data(file_name = project.offshore_dem_name_local1 + '.xya')
-#G2 = Geospatial_data(file_name = project.offshore_dem_name_local2 + '.xya')
-#G3 = Geospatial_data(file_name = project.offshore_dem_name_local3 + '.xya')
-#G4 = Geospatial_data(file_name = project.offshore_dem_name_local4 + '.xya')
-#G11 = G1 + G2 + G3 + G4
-#print 'aho offshore data sets'
-#G5 = Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')
-#G6 = Geospatial_data(file_name = project.offshore_dem_name_aho2 + '.xya')
-#G7 = Geospatial_data(file_name = project.offshore_dem_name_aho3 + '.xya')
-#G8 = Geospatial_data(file_name = project.offshore_dem_name_aho4 + '.xya')
-#G9 = Geospatial_data(file_name = project.offshore_dem_name_aho5 + '.xya')
-#G10 = Geospatial_data(file_name = project.offshore_dem_name_aho6 + '.xya')
-#G11 = Geospatial_data(file_name = project.offshore_dem_name_aho7 + '.xya')
-#G12 = Geospatial_data(file_name = project.offshore_dem_name_aho8 + '.xya')
-#G13 = Geospatial_data(file_name = project.offshore_dem_name_aho9 + '.xya')
-#G14 = Geospatial_data(file_name = project.offshore_dem_name_aho10 + '.xya')
-#G15 = Geospatial_data(file_name = project.offshore_dem_name_aho11 + '.xya')
-#G16 = Geospatial_data(file_name = project.offshore_dem_name_aho12 + '.xya')
-#G17 = Geospatial_data(file_name = project.offshore_dem_name_aho13 + '.xya')
-#G18 = Geospatial_data(file_name = project.offshore_dem_name_aho14 + '.xya')
-#G19 = Geospatial_data(file_name = project.offshore_dem_name_aho15 + '.xya')
-#G20 = Geospatial_data(file_name = project.offshore_dem_name_aho16 + '.xya')
-#G12 = G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20
-#print 'local onshore dem'
-#G21 = Geospatial_data(file_name = project.onshore_dem_name + '.pts')
-print 'coast'
-#G22 = Geospatial_data(file_name = project.coast_dem_name + '.xya')
-#print 'adding data sets'
-#G = G11 + G12 + G21 + G22
-#G = G1+G2+G3+G4+G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20+G21+G22
-#G = G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20+G21+G22
-#G = G21+G22+G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20
-#G = G21+G22+G5
-#G = Geospatial_data(file_name = project.onshore_dem_name + '.pts') #+ \
-#    Geospatial_data(file_name = project.coast_dem_name + '.xya') #+ \
-#    Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')
+
+print 'adding data sets'
 G = Geospatial_data(file_name = project.offshore_dem_name_local1 + '.xya')+\
     Geospatial_data(file_name = project.offshore_dem_name_local2 + '.xya')+\
@@ -148 +113 @@
 G.export_points_file(project.combined_dem_name + '.pts')
 
-#-------------------------------------------------------------------------------                                 
+#----------------------------------------------------------------------------
 # Create the triangular mesh based on overall clipping polygon with a tagged
 # boundary and interior regions defined in project.py along with
@@ -171 +136 @@
           {'boundary_tags': {'bottom': [0], 'right': [1],
                              'top': [2], 'left': [3]},
-           'maximum_triangle_area': 250000,
-           'filename': meshname,           
-           'interior_regions': interior_regions},
+           'maximum_triangle_area': 100000,
+           'filename': meshname},           
+           #'interior_regions': interior_regions},
           verbose = True, evaluate=True)
 
@@ -211 +176 @@
 
 #-------------------------------------------------------------------------------                                 
-# Setup boundary conditions (all reflective)
+# Setup boundary conditions
 #-------------------------------------------------------------------------------
 print 'start ferret2sww'
@@ -274 +239 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 240, finaltime = 7200): 
+for t in domain.evolve(yieldstep = 60, finaltime = 120): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'bottom')     
 
-for t in domain.evolve(yieldstep = 120, finaltime = 12600
-                       ,skip_initial_step = True): 
-    domain.write_time()
-    domain.write_boundary_statistics(tags = 'bottom')     
+#for t in domain.evolve(yieldstep = 120, finaltime = 12600
+#                       ,skip_initial_step = True): 
+#    domain.write_time()
+#    domain.write_boundary_statistics(tags = 'bottom')     
     
 print 'That took %.2f seconds' %(time.time()-t0)