Changeset 2645

Timestamp:

Mar 31, 2006, 4:20:53 PM (17 years ago)

Author:

nick

Message:

update to onslow

Location:

production/onslow_2006

Files:

• project.py (modified) (3 diffs)
• run_onslow.py (modified) (9 diffs)

production/onslow_2006/project.py

@@ -27 +27 @@
 offshore_name = 'onslow_offshore_points'
 
-boundary_basename = 'SU-AU'
+boundary_basename = 'SU-AU_clip'
 
 #swollen/ all data output
@@ -50 +50 @@
 
 # boundary source data
-MOST_dir = 'f:'+sep+'3'+sep+'ehn'+sep+'users'+sep+'davidb'+sep+'tsunami'+sep+'WA_project'+sep+'SU-AU_90'+sep+'most_2'+sep+'detailed'+sep
+#MOST_dir = 'f:'+sep+'3'+sep+'ehn'+sep+'users'+sep+'davidb'+sep+'tsunami'+sep+'WA_project'+sep+'SU-AU_90'+sep+'most_2'+sep+'detailed'+sep
 
 codedir = getcwd()+sep
@@ -100 +100 @@
 d4 = [310000, 7580000]
 d5 = [330000, 7610000]
+d6 = [330000, 7620000]
 
-polyAll = [d0, d1, d2, d3, d4, d5]
+polyAll = [d0, d1, d2, d3, d4, d5, d6]
 
 #Interior region - Onslow town

production/onslow_2006/run_onslow.py

@@ -61 +61 @@
 copy (project.codedir + 'run_onslow.py', project.outputdir + 'run_onslow.py')
 print'hello'
-print' most file', project.MOST_dir + project.boundary_basename+'_ha.nc'
-if access(project.MOST_dir + project.boundary_basename+'_ha.nc',F_OK) == 1 :
-    print' most file', project.MOST_dir + project.boundary_basename
+#print' most file', project.MOST_dir + project.boundary_basename+'_ha.nc'
+#if access(project.MOST_dir + project.boundary_basename+'_ha.nc',F_OK) == 1 :
+#    print' most file', project.MOST_dir + project.boundary_basename
 
 '''
@@ -80 +80 @@
         use_cache=True, 
         verbose=True)
-
-        '''
-'''
+'''
+
 print'create G1'
 G1 = Geospatial_data(file_name = project.offshore_dem_name + '.xya')
@@ -95 +94 @@
 G.new_export_points_file(project.combined_dem_name + '.pts')
 
-'''
+
 #-------------------------------------------------------------------------------                                 
 # Create the triangular mesh based on overall clipping polygon with a tagged
@@ -117 +116 @@
           {'boundary_tags': {'top': [0], 'topleft': [1],
                              'left': [2], 'bottom': [3],
-                             'bottomright': [4], 'topright': [5]},
+                             'bottomright': [4], 'right': [5],
+                             'topright':[6]},
            'maximum_triangle_area': 1000000,
            'filename': meshname,           
@@ -162 +162 @@
 
 tide = 0.
-'''
+
 domain.set_quantity('stage', tide)
 domain.set_quantity('friction', 0.0) 
@@ -174 +174 @@
                     use_cache = False,
                     verbose = True,
-                    alpha = 0.1
+                    alpha = 0.05
                     )
-'''
+
 print 'hi1'
 
@@ -191 +191 @@
 
 cache(ferret2sww,
-#      (source_dir + project.boundary_basename,
+      (source_dir + project.boundary_basename,
+       source_dir + project.boundary_basename), 
+#      (project.MOST_dir + project.boundary_basename,
 #       source_dir + project.boundary_basename), 
-      (project.MOST_dir + project.boundary_basename,
-       source_dir + project.boundary_basename), 
       {'verbose': True,
 # note didn't work with the below
@@ -229 +229 @@
 domain.set_boundary( {'top': Bf, 'topleft': Bf,
                              'left': Br, 'bottom': Br,
-                             'bottomright': Br, 'topright': Bf} )
+                             'bottomright': Br, 'right': Br, 'topright': Br} )
 
 
@@ -238 +238 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 1000, finaltime = 10000): 
+for t in domain.evolve(yieldstep = 1000, finaltime = 3000): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
 
-for t in domain.evolve(yieldstep = 50, finaltime = 10100,
+for t in domain.evolve(yieldstep = 100, finaltime = 20000,
                        skip_initial_step = True): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
-    
+  
 print 'That took %.2f seconds' %(time.time()-t0)