Changeset 3624

Timestamp:

Sep 19, 2006, 4:23:39 PM (17 years ago)

Author:

ole

Message:

Got flagstaff to work with parallel API

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py (modified) (1 diff)
• anuga_core/source/anuga/pmesh/mesh_interface.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/parallel_api.py (modified) (1 diff)
• anuga_work/production/wollongong_2006/project.py (modified) (1 diff)
• anuga_work/production/wollongong_2006/run_flagstaff_parallel_api.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -81 +81 @@
 
         #Input checks
-        msg = 'Triangles must an Nx3 Numeric array or a sequence of 3-tuples'
+        msg = 'Triangles must an Nx3 Numeric array or a sequence of 3-tuples. '
+        msg += 'The supplied array has the shape: %s'\
+               %str(self.triangles.shape)
         assert len(self.triangles.shape) == 2, msg
 
         msg = 'Coordinates must an Mx2 Numeric array or a sequence of 2-tuples'
+        msg += 'The supplied array has the shape: %s'\
+               %str(self.coordinates.shape)
         assert len(self.coordinates.shape) == 2, msg
 

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -158 +158 @@
         return m
     else:
+        if verbose: print 'Generating mesh to file "%s"' %filename
         m.generate_mesh(minimum_triangle_angle=minimum_triangle_angle,
                              verbose=verbose)

anuga_core/source/anuga_parallel/parallel_api.py

@@ -45 +45 @@
 
 
-    # Distribute boundary conditions    
+    # Distribute boundary conditions
+    # FIXME: This cannot handle e.g. Time_boundaries due to
+    # difficulties pickling functions
     if myid == 0:
         boundary_map = domain.boundary_map

anuga_work/production/wollongong_2006/project.py

@@ -7 +7 @@
 
 # Making assumptions about the location of scenario data
-scenario_dirname = 'wollongong_tsunami_scenario_2006'
+scenario_dirname = 'new_south_wales'+s+'wollongong_tsunami_scenario_2006'+s+'anuga'
 
 # Filenames

anuga_work/production/wollongong_2006/run_flagstaff_parallel_api.py

@@ -31 +31 @@
 from anuga.pmesh.mesh import importUngenerateFile, Segment
 
-from anuga.caching import cache
+# Parallelism
+import pypar   # The Python-MPI interface
+from anuga_parallel.pmesh_divide  import pmesh_divide_metis
+from anuga_parallel.build_submesh import build_submesh
+from anuga_parallel.build_local   import build_local_mesh
+from anuga_parallel.build_commun  import send_submesh, rec_submesh, extract_hostmesh
+from anuga_parallel.parallel_shallow_water import Parallel_Domain
 
-# Parallelism
-from parallel_api import *
+from anuga_parallel.parallel_api import *
 
 # Application specific imports
 import project
 
-# Sequential part
+
 if myid == 0:
     
@@ -48 +53 @@
     #--------------------------------------------------------------------------
 
+
     print 'Generate mesh'
     # Generate basic mesh
     max_area = project.base_resolution
-
-    
-    mesh = cache(create_mesh_from_regions,
-                 project.bounding_polygon,
-                 {'boundary_tags': project.boundary_tags,
-                  'maximum_triangle_area':max_area,
-                  'interior_regions': project.interior_regions},
-                 verbose=True)
+    mesh = create_mesh_from_regions(project.bounding_polygon,
+                                    boundary_tags=project.boundary_tags,
+                                    maximum_triangle_area=max_area,
+                                    interior_regions=project.interior_regions)
     
     # Add buildings that will bind to a Reflective boundary
@@ -80 +82 @@
     domain.set_datadir(project.outputdir)    
 
-
-    #------------------------------------------------------------------------------
-    # Setup initial conditions
-    #------------------------------------------------------------------------------
     domain.set_quantity('stage', project.initial_sealevel)
-    domain.set_quantity('friction', 0.03)    
+    domain.set_quantity('friction', 0.03)
     domain.set_quantity('elevation', 
                         filename=project.demname + '.pts',
@@ -91 +89 @@
                         verbose=True)
 
+    #------------------------------------------------------------------------------
+    # Setup boundary conditions
+    #------------------------------------------------------------------------------
+
+    
+    D = Dirichlet_boundary([project.initial_sealevel, 0, 0])
+    R = Reflective_boundary(domain)
+    domain.set_boundary({'exterior': D,
+                         'side': D,
+                         'wall': R,
+                         'ocean': None}) # This one to be bound later
+else:
+    domain = None
+
+    
+
+domain = distribute(domain)
 
 
 
-#---------------
-# Parallel stuff
-#---------------
-
-if myid == 0:
-    # Distribute the domain
-    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict,\
-            = distribute_mesh(domain)
-
-
-    domain_name = domain.get_name()
-    domain_dir = domain.get_datadir()
-
-    for p in range(pypar.size()):
-        pypar.send((domain_name, domain_dir), p) 
-    
-    print 'Communication done'        
-    
-else:
-    # Read in the mesh partition that belongs to this
-    # processor (note that the information is in the
-    # correct form for the GA data structure)
-
-    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict, \
-            = rec_submesh(0)
-
-    print 'P %d receiving names' %myid
-    X = pypar.receive(0)
-    print X
-    (domain_name, domain_dir) = X
-
-
-
-#------------------------------------------------------------------------------
-# Start the computations on each subpartion
-#------------------------------------------------------------------------------
-
-
-
-# Build the domain for this processor
-domain = Parallel_Domain(points, vertices, boundary,
-                         full_send_dict  = full_send_dict,
-                         ghost_recv_dict = ghost_recv_dict)
-
-# Name and dir, etc currently has to be set here as they are not transferred from the
-# original domain
-domain.set_name(domain_name)
-domain.set_datadir(domain_dir)
-
-
-#------------------------------------------------------------------------------
-# Setup initial conditions
-#------------------------------------------------------------------------------
-for q in quantities:
-    domain.set_quantity(q, quantities[q]) # Distribute elevation    
-
-
-#domain.set_quantity('elevation', quantities['elevation']) # Distribute elevation 
-#domain.set_quantity('stage', project.initial_sealevel)
-#domain.set_quantity('friction', 0.03)
-
-
-#------------------------------------------------------------------------------
-# Setup boundary conditions
-#------------------------------------------------------------------------------
-
-D = Dirichlet_boundary([project.initial_sealevel, 0, 0])
-R = Reflective_boundary(domain)
+# Set those boundaries that can't be pickled here using boundary_map.
 W = Time_boundary(domain = domain,
                   f=lambda t: [project.initial_sealevel + (60<t<480)*6, 0, 0])
 
-domain.set_boundary({'exterior': D,
-                     'side': D,
-                     'wall': R,
-                     'ocean': W,
-                     'ghost': None})
+boundary_map = domain.boundary_map
+boundary_map['ocean'] = W
+domain.set_boundary(boundary_map)