Changeset 3600

Timestamp:

Sep 15, 2006, 12:28:31 PM (19 years ago)

Author:

duncan

Message:

comitting onslow work, before switching over to pt hedland

Location:

anuga_work/production/MOST_example

Files:

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

anuga_work/production/MOST_example/project.py

@@ -50 +50 @@
     user = getenv('LOGNAME')
     print 'USER:', user
-
+home = '.'
 #Derive subdirectories and filenames
 #time = strftime('%Y%m%d_%H%M%S',localtime()) #gets time for new dir

anuga_work/production/MOST_example/run_onslow.py

@@ -27 +27 @@
 from anuga.fit_interpolate.fit import fit_to_mesh_file
 
+from anuga.caching import cache
+
 # Application specific imports
 import project                 # Definition of file names and polygons
@@ -51 +53 @@
 offshore_points = project.offshore_dem_name
 
-meshname = project.meshname+'.msh'
+meshname = project.meshname+'.tsh'
 
 source_dir = project.boundarydir
@@ -62 +64 @@
 
 
-'''
-# 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(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)
-
-        '''
-print'create G1'
-G1 = Geospatial_data(file_name = project.offshore_dem_name + '.xya')
-
-print'create G2'
-G2 = Geospatial_data(file_name = project.onshore_dem_name + '.pts')
-
-print'add G1+G2'
-G = G1 + G2
-
-print'export G'
-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
-# resolutions (maximal area of per triangle) for each polygon
-#-------------------------------------------------------------------------------
-
-from anuga.pmesh.mesh_interface import create_mesh_from_regions
-
-# original
-interior_res = 1000000
-
-from caching import cache
-_ = cache(create_mesh_from_regions,
-          project.polyAll,
-          {'boundary_tags': {'top': [0], 'topleft': [1],
-                             'left': [2], 'bottom': [3],
-                             'bottomright': [4], 'topright': [5]},
-           'maximum_triangle_area': 10000000,
-           'filename': meshname},
-          verbose = True)
-
-mesh_elevname = meshname[:-4] + '_elv' + meshname[-4:]
-
-cache(fit_to_mesh_file,(meshname,
-                 project.combined_dem_name + '.pts',
-                 mesh_elevname),
-      {'verbose': True}
-      #,evaluate = True      
-      ,verbose = False
-      )
 
 #-------------------------------------------------------------------------------                                 
 # Setup computational domain
 #-------------------------------------------------------------------------------                                 
-
+mesh_elevname = 'mesh_source_elv.msh'
 domain = pmesh_to_domain_instance(mesh_elevname, Domain,
                                   use_cache = True,
@@ -148 +90 @@
 domain.set_quantity('stage', tide)
 domain.set_quantity('friction', 0.0) 
-print 'hi and file',project.combined_dem_name + '.pts'
-#domain.set_quantity('elevation', 
-#                    0.
-#                    filename = project.onshore_dem_name + '.pts',
-#                    filename = project.combined_dem_name + '.pts',
-#                    filename = project.offshore_dem_name + '.pts',
- #                   use_cache = False,
-  #                  verbose = True,
-   #                 alpha = 0.1
-    #                )
 print 'hi1'
 
@@ -172 +104 @@
 
 cache(ferret2sww,
-      (source_dir + project.boundary_basename,
-       source_dir + project.boundary_basename), 
+      (project.boundary_basename,
+       project.boundary_basename), 
       {'verbose': True,
        'minlat': south,
@@ -190 +122 @@
 print 'Available boundary tags', domain.get_boundary_tags()
 
-Bf = File_boundary(source_dir + project.boundary_basename + '.sww', 
+Bf = File_boundary(project.boundary_basename + '.sww', 
                     domain, verbose = True)
 Br = Reflective_boundary(domain)
@@ -202 +134 @@
 domain.set_boundary( {'top': Bf, 'topleft': Bf,
                              'left': Br, 'bottom': Br,
-                             'bottomright': Br, 'topright': Bf} )
+                             'bottomright': Br, 'topright': Bf,
+                      'exterior':Bf} )
 
 
@@ -211 +144 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 50, finaltime = 100): 
+for t in domain.evolve(yieldstep = 50, finaltime = 1000): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')