Changeset 2519

Timestamp:

Mar 9, 2006, 5:32:48 PM (19 years ago)

Author:

nick

Message:

update to Onslow

Location:

production/onslow_2006

Files:

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

production/onslow_2006/project.py

@@ -9 +9 @@
 
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
+
+from coordinate_transforms.redfearn import degminsec2decimal_degrees
                 
 #Making assumptions about the location of scenario data
@@ -16 +18 @@
 # 250m data to be provided
 coarsename = 'onsl_bathydem250' # get from Neil/Ingo (DEM or topo data)
-"""
+
 # 30m data to be provided
-finename = 'onshore_30' # get from Neil/Ingo (DEM or topo data) 
-"""
+onshore_name = 'onslow_onshore_30m_dted' # get from Neil/Ingo (DEM or topo data) 
+
+
+boundary_basename = 'SU-AU'
 
 # clipping region for fine elevation data
-west = 240000
-east = 340000
-south = 7570000
-north = 7645000
+eastingmin = 250000
+eastingmax = 330000
+northingmin = 7580000
+northingmax = 7635000
+
+south = degminsec2decimal_degrees(-22,00,0)
+north = degminsec2decimal_degrees(-21,10,0)
+west = degminsec2decimal_degrees(114,30,0)
+east = degminsec2decimal_degrees(115,30,0)
+
 
 #swollen/ all data output
@@ -45 +55 @@
 
 coarsedemname = datadir + coarsename
-"""
-finedemname = datadir + finename
+
+onshore_dem_name = datadir + onshore_name
+
 combineddemname = datadir + 'onslow_combined_elevation'
-"""
 
 outputname = outputdir + basename  #Used by post processing

production/onslow_2006/run_onslow.py

@@ -41 +41 @@
 # filenames
 coarsedemname = project.coarsedemname
-'''
-#finedemname = project.finedemname
-'''
+
+onshore_dem_name = project.onshore_dem_name
+
 meshname = project.meshname+'.msh'
+
+source_dir = project.boundarydir
 
 # coarse data
 convert_dem_from_ascii2netcdf(coarsedemname, use_cache=True, verbose=True)
 dem2pts(coarsedemname, use_cache=True, verbose=True)
-'''
+
 # fine data (clipping the points file to smaller area)
-convert_dem_from_ascii2netcdf(finedemname, use_cache=True, verbose=True)
-dem2pts(finedemname,
-        easting_min=project.eastingmin,
-        easting_max=project.eastingmax,
-        northing_min=project.northingmin,
-        northing_max= project.northingmax,
+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,
         use_cache=True, 
         verbose=True)
@@ -62 +64 @@
 
 # combining the coarse and fine data
-combine_rectangular_points_files(project.finedemname + '.pts',
+combine_rectangular_points_files(project.onshore_dem_name + '.pts',
                                  project.coarsedemname + '.pts',
                                  project.combineddemname + '.pts')
-'''
+
 
 #-------------------------------------------------------------------------------                                 
@@ -109 +111 @@
 domain.set_name(project.basename)
 domain.set_datadir(project.outputdir)
-domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
+domain.set_quantities_to_be_stored(['stage'])
 
 
@@ -136 +138 @@
 domain.set_quantity('stage', tide)
 domain.set_quantity('friction', 0.0) 
+
 domain.set_quantity('elevation', 
-#                    filename = project.combineddemname + '.pts',
-                    filename = project.coarsedemname + '.pts',
+#                    0.
+                    filename = project.combineddemname + '.pts',
+#                    filename = project.coarsedemname + '.pts',
                     use_cache = True,
                     verbose = True
@@ -147 +151 @@
 # Setup boundary conditions (all reflective)
 #-------------------------------------------------------------------------------
-
+'''
 from pyvolution.data_manager import ferret2sww
 
@@ -163 +167 @@
        'minlon': west-1,
        'maxlon': east+1,
-       'origin': project.mesh_origin,
+#       'origin': project.mesh_origin,
+       'origin': domain.geo_reference.get_origin(),
        'mean_stage': tide,
        'zscale': 1,                 #Enhance tsunami
@@ -171 +176 @@
        verbose = True)
 
-
+'''
 print 'Available boundary tags', domain.get_boundary_tags()
 
@@ -194 +199 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 50, finaltime = 100): 
+for t in domain.evolve(yieldstep = 100, finaltime = 100): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')