Changeset 4939

Timestamp:

Jan 15, 2008, 7:20:01 PM (15 years ago)

Author:

ole

Message:

Moved data_audit to utilities

Caching work on Joaquim Luis example

Files:

• anuga_core/source/anuga/utilities/data_audit.py (moved) (moved from data_audit.py)
• anuga_work/development/joaqium_luis/run.py (modified) (7 diffs)
• create_distribution.py (modified) (2 diffs)

anuga_work/development/joaqium_luis/run.py

@@ -28 +28 @@
 from anuga.abstract_2d_finite_volumes.util import file_function
 
+from anuga.caching import cache
+from anuga.utilities.polygon import read_polygon, plot_polygons, \
+                                    polygon_area, is_inside_polygon
 
 #------------------------------------------------------------------------------
@@ -37 +40 @@
     os.mkdir(scenario)
 basename = scenario + 'source'
+
+#------------------
+# Initial condition
+#------------------
+tide = 0.0
+
 
 #------------------------------------------------------------------------------
@@ -49 +58 @@
 meshname = 'bocarra.msh'
 
-# Create DEM from asc data
-#convert_dem_from_ascii2netcdf(dem_name, use_cache=True, verbose=True)
 
-# Create pts file for onshore DEM
-#dem2pts(dem_name, use_cache=True, verbose=True)
-
-from anuga.utilities.polygon import read_polygon, plot_polygons, \
-                                    polygon_area, is_inside_polygon
-
-###############################
-# Domain definitions
-###############################
+#---------
+# Polygons
+#---------
 
 # bounding polygon for study area
@@ -67 +68 @@
 print 'Area of bounding polygon in km?', polygon_area(bounding_polygon)/1000000.0
 
-###############################
-# Interior region definitions
-###############################
-
 # interior polygons
 #poly_midle = read_polygon('midle_rect.csv')
 poly_shallow = read_polygon('shallow.csv')
 
-#------------------------------------------------------------------------------
-# 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
-#------------------------------------------------------------------------------
 
+#------------
+# Resolutions
+#------------
 remainder_res = 2000
 midle_res = 3500
 shallow_res = 100
-interior_regions = [[bounding_polygon, remainder_res], [poly_shallow, shallow_res]]
-#interior_regions = [[bounding_polygon, remainder_res], [poly_midle, midle_res], [poly_shallow, shallow_res]]
 
-create_mesh_from_regions(bounding_polygon,
-                         boundary_tags={'west': [0],
-                                        'north': [1],
-                                        'east': [2],
-                                        'south': [3]},
-                         maximum_triangle_area=remainder_res,
-                         filename=meshname,
-                         interior_regions=interior_regions,
-                         use_cache=True, verbose=True)
+interior_regions = [[poly_shallow, shallow_res]]
 
-#------------------------------------------------------------------------------
-# Setup computational domain
-#------------------------------------------------------------------------------
+def setup_domain(tide,
+                 bounding_polygon,
+                 remainder_res,                 
+                 interior_regions,
+                 mesh_filename,
+                 points_filename):
+    """Set up domain except boundary conditions
+    This function is defined in order to cache it.
+    """
 
-domain = Domain(meshname, use_cache=True, verbose=True)
 
-print 'Number of triangles = ', len(domain)
-print 'The extent is ', domain.get_extent()
-print domain.statistics()
 
-domain.set_name(basename) 
-domain.set_datadir(scenario)
-domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
-#domain.set_quantities_to_be_stored('stage')
-domain.set_minimum_storable_height(0.05)
 
-#------------------------------------------------------------------------------
-# Setup initial conditions
-#------------------------------------------------------------------------------
 
-tide = 0.0
-domain.set_quantity('stage', tide)
-domain.set_quantity('friction', 0.025) 
-domain.set_quantity('elevation', filename=dem_name + '.pts',
-                    use_cache=True, verbose=True, alpha=0.1)
+    create_mesh_from_regions(bounding_polygon,
+                             boundary_tags={'west': [0],
+                                            'north': [1],
+                                            'east': [2],
+                                            'south': [3]},
+                             maximum_triangle_area=remainder_res,
+                             filename=mesh_filename,
+                             interior_regions=interior_regions,
+                             use_cache=False,
+                             verbose=True)
+
+    #--------------------------------------------------------------------------
+    # Setup computational domain
+    #--------------------------------------------------------------------------
+
+    domain = Domain(mesh_filename,
+                    use_cache=False,
+                    verbose=True)
+
+    print 'Number of triangles = ', len(domain)
+    print 'The extent is ', domain.get_extent()
+    print domain.statistics()
+
+    domain.set_name(basename) 
+    domain.set_datadir(scenario)
+    domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
+    domain.set_minimum_storable_height(0.05)
+
+    #--------------------------------------------------------------------------
+    # Setup initial conditions
+    #--------------------------------------------------------------------------
+
+    domain.set_quantity('stage', tide)
+    domain.set_quantity('friction', 0.025) 
+    domain.set_quantity('elevation',
+                        filename=points_filename,
+                        use_cache=False,
+                        verbose=True)
+
+    return domain
+    
+
+#--------------------------------    
+# Call (and cache) setup function
+#--------------------------------    
+
+# Run set_up domain without caching
+#domain = setup_domain(tide, bounding_polygon, poly_shallow, 
+#                      remainder_res, midle_res, shallow_res, 
+#                      meshname, 
+#                      dem_name + '.pts')
+
+# Run set_up domain with caching
+domain = cache(setup_domain,
+               (tide,
+                bounding_polygon,
+                remainder_res, 
+                interior_regions, 
+                meshname, 
+                dem_name + '.pts'),
+               #dependencies = 
+               verbose=True)            
+
+
 
 #------------------------------------------------------------------------------
@@ -127 +165 @@
 #------------------------------------------------------------------------------
 
-# Create boundary function from timeseries provided in file
-#function1 = file_function('mareg.tms', domain, verbose=True)
-
-# Create and assign boundary objects
-#Bts1 = Transmissive_Momentum_Set_Stage_boundary(domain, function1) 
-
 print 'Available boundary tags', domain.get_boundary_tags()
-#Bt = Transmissive_boundary(domain)    # Continue all values on boundary 
 Br = Reflective_boundary(domain)
 Bd = Dirichlet_boundary([tide,0,0])
@@ -140 +171 @@
                     use_cache=True, verbose=True)
    
-#Boundary condition for sww feed at the east boundary
+# Boundary condition for sww feed at the east boundary
 domain.set_boundary({'west': Bf,'south':Bf,'east': Br,'north': Br})
+
     
 #------------------------------------------------------------------------------
@@ -153 +185 @@
 from anuga.abstract_2d_finite_volumes.quantity import Quantity
 
-
-# save every 1 sec leading up to wave approaching land
+# Save every 1 sec leading up to wave approaching land
 for t in domain.evolve(yieldstep = 10, finaltime = 90):
     domain.write_time()

create_distribution.py

@@ -29 +29 @@
 from anuga.abstract_2d_finite_volumes.util import store_version_info
 from anuga.anuga_config import major_revision
+
+from anuga.utilities.data_audit import identify_data_files
 
 
@@ -118 +120 @@
 
 
-from data_audit import identify_data_files
 identify_data_files(distro_dir)