Changeset 2706

Timestamp:

Apr 12, 2006, 1:50:07 PM (19 years ago)

Author:

nick

Message:

updates to onslow

Location:

production/onslow_2006

Files:

• export_results.py (modified) (2 diffs)
• project.py (modified) (3 diffs)
• run_onslow.py (modified) (8 diffs)

production/onslow_2006/export_results.py

@@ -22 +22 @@
 #which_var = int(raw_input('Stage = 0, Absolute Momentum = 1, Depth = 2, Speed = 3  '  ))
 which_var = 4
-
+sys.stderr.write(sys.stdout.data)
 if which_var == 0:  # Stage
     outname = name + '_stage'
@@ -46 +46 @@
 
 print 'start sww2dem'
+sys.stderr.write(sys.stdout.data)
 sww2dem(name, basename_out = outname,
             quantity = quantityname,

production/onslow_2006/project.py

@@ -109 +109 @@
 
 #Updated Main Domain of Onslow: first run NB 6/4/06
+'''
 d0 = [310000, 7690000]
 d1 = [280000, 7690000]
@@ -118 +119 @@
 
 polyAll = [d0, d1, d2, d3, d4, d5, d6]
+'''
+d0 = [310000, 7630000]
+d1 = [280000, 7630000]
+d2 = [280000, 7590000]
+d3 = [310000, 7590000]
 
+polyAll = [d0, d1, d2, d3]
+'''
 #Interior region - Onslow town
 
@@ -137 +145 @@
 
 poly_thevenard = [j0, j1, j2, j3]
-'''
+
 # Direction Is
 k0 = [309000, 7619000]

production/onslow_2006/run_onslow.py

@@ -35 +35 @@
 
 from geospatial_data import *
+import sys
+from pyvolution.util import Screen_Catcher
 
 #-------------------------------------------------------------------------------
@@ -61 +63 @@
 copy (project.codedir + 'run_onslow.py', project.outputtimedir + 'run_onslow.py')
 print'output dir', project.outputtimedir
+
+#normal screen output is stored in 
+screen_output_name = project.outputtimedir + "screen_output.txt"
+
+#used to catch screen output to file
+sys.stdout = Screen_Catcher(screen_output_name)
+sys.stderr = Screen_Catcher(screen_output_name)
+
 '''
 copied_files = False
@@ -75 +85 @@
 #if access(project.MOST_dir + project.boundary_basename+'_ha.nc',F_OK) == 1 :
 #    print' most file', project.MOST_dir + project.boundary_basename
-'''
+
 
 # fine data (clipping the points file to smaller area)
@@ -101 +111 @@
 print'export G'
 G.new_export_points_file(project.combined_dem_name + '.pts')
-'''
+
 
 #-------------------------------------------------------------------------------                                 
@@ -112 +122 @@
 
 # original
-interior_res = 1000
-interior_regions = [[project.poly_onslow, interior_res],
-                    [project.poly_thevenard, interior_res]]
-
-print 'number of interior regions', len(interior_regions)
+#interior_res = 1000
+#interior_regions = [[project.poly_onslow, interior_res],
+#                    [project.poly_thevenard, interior_res]]
+
+print 'number of interior regions'#, len(interior_regions)
 
 from caching import cache
@@ -125 +135 @@
                              'bottom': [4], 'bottomright': [5],
                              'topright':[6]},
-           'maximum_triangle_area': 50000,
-           'filename': meshname,           
-           'interior_regions': interior_regions},
-          verbose = True)
+           'maximum_triangle_area': 500,
+           'filename': meshname},           
+#           'interior_regions': interior_regions},
+           verbose = True)
 
 
@@ -181 +191 @@
                     use_cache = True,
                     verbose = True,
-                    alpha = 0.05
+                    alpha = 0.0
                     )
 
@@ -245 +255 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 500, finaltime = 3000): 
+for t in domain.evolve(yieldstep = 10, finaltime = 10): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
-
+'''
 for t in domain.evolve(yieldstep = 120, finaltime = 31000):
-#                       ,skip_initial_step = True): 
+                       ,skip_initial_step = True): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
-  
+'''  
 print 'That took %.2f seconds' %(time.time()-t0)