Changeset 2539

Timestamp:

Mar 13, 2006, 4:47:16 PM (19 years ago)

Author:

nick

Message:

 

Location:

production/onslow_2006

Files:

• project.py (modified) (1 diff)
• run_onslow.py (modified) (9 diffs)

production/onslow_2006/project.py

@@ -38 +38 @@
 
 #swollen/ all data output
-basename = 'source'
+basename = 'source_fine_clipped'
 
 if sys.platform == 'win32':

production/onslow_2006/run_onslow.py

@@ -21 +21 @@
 # Related major packages
 from pyvolution.shallow_water import Domain, Reflective_boundary, \
-                            Dirichlet_boundary, Time_boundary
+                            Dirichlet_boundary, Time_boundary, File_boundary
 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
 from pyvolution.combine_pts import combine_rectangular_points_files 
@@ -55 +55 @@
 convert_dem_from_ascii2netcdf(onshore_dem_name, use_cache=True, verbose=True)
 dem2pts(onshore_dem_name,
-#        easting_min=project.eastingmin,
-#        easting_max=project.eastingmax,
-#        northing_min=project.northingmin,
-#        northing_max= project.northingmax,
+        easting_min=project.eastingmin,
+        easting_max=project.eastingmax,
+        northing_min=project.northingmin,
+        northing_max= project.northingmax,
         use_cache=True, 
         verbose=True)
@@ -64 +64 @@
 
 # combining the coarse and fine data
-combine_rectangular_points_files(project.onshore_dem_name + '.pts',
+combine_rectangular_points_files(
                                  project.coarsedemname + '.pts',
+                                 project.onshore_dem_name + '.pts',
                                  project.combineddemname + '.pts')
 
@@ -140 +141 @@
 domain.set_quantity('elevation', 
 #                    0.
+#                    filename = project.onshore_dem_name + '.pts',
                     filename = project.combineddemname + '.pts',
 #                    filename = project.coarsedemname + '.pts',
@@ -150 +152 @@
 # Setup boundary conditions (all reflective)
 #-------------------------------------------------------------------------------
-'''
+
 from pyvolution.data_manager import ferret2sww
 
@@ -159 +161 @@
 
 cache(ferret2sww,
-      (source_dir+project.boundary_basename,
-       project.boundary_basename), 
+      (source_dir + project.boundary_basename,
+       source_dir + project.boundary_basename), 
       {'verbose': True,
-       'minlat': south-1,
-       'maxlat': north+1,
-       'minlon': west-1,
-       'maxlon': east+1,
+#       'minlat': south - 1,
+#       'maxlat': north + 1,
+#       'minlon': west - 1,
+#       'maxlon': east + 1,
+       'minlat': south,
+       'maxlat': north,
+       'minlon': west,
+       'maxlon': east,
 #       'origin': project.mesh_origin,
        'origin': domain.geo_reference.get_origin(),
@@ -175 +181 @@
        verbose = True)
 
-'''
+
 print 'Available boundary tags', domain.get_boundary_tags()
 
+Bf = File_boundary(source_dir + project.boundary_basename + '.sww', 
+                    domain, verbose = True)
 Br = Reflective_boundary(domain)
 Bd = Dirichlet_boundary([tide,0,0])
@@ -186 +194 @@
                    f=lambda t: [(60<t<480)*6, 0, 0])
 
-domain.set_boundary( {'top': Bw, 'topleft': Br,
+domain.set_boundary( {'top': Bf, 'topleft': Bf,
                              'left': Br, 'bottom': Br,
                              'bottomright': Br, 'topright': Br} )
@@ -198 +206 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 100, finaltime = 100): 
+for t in domain.evolve(yieldstep = 50, finaltime = 50): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')