Changeset 7449

Timestamp:

Aug 28, 2009, 6:19:35 PM (15 years ago)

Author:

steve

Message:

Testing unit tests

Location:

anuga_core/source/anuga_parallel

Files:

• __init__.py (modified) (1 diff)
• parallel_advection.py (modified) (3 diffs)
• parallel_api.py (modified) (8 diffs)
• parallel_shallow_water.py (modified) (4 diffs)
• run_parallel_sw_rectangle.py (modified) (2 diffs)
• test_distribute_domain.py (moved) (moved from anuga_core/source/anuga_parallel/test_parallel_sw.py) (8 diffs)
• test_distribute_mesh.py (modified) (2 diffs)
• test_parallel_sw_flow.py (added)

anuga_core/source/anuga_parallel/__init__.py

@@ +1 @@
+
 #Make parallel available as a Python package
 pass

anuga_core/source/anuga_parallel/parallel_advection.py

@@ -2 +2 @@
 
 
-"""Class Parallel_Domain -
+"""Class Parallel_domain -
 2D triangular domains for finite-volume computations of
 the advection equation, with extra structures to allow
-communication between other Parallel_Domains and itself
+communication between other Parallel_domains and itself
 
 This module contains a specialisation of class Domain from module advection.py
@@ -13 +13 @@
 """
 
-import logging, logging.config
-logger = logging.getLogger('parallel')
-logger.setLevel(logging.WARNING)
-
-try:
-    logging.config.fileConfig('log.ini')
-except:
-    pass
-
 from anuga.advection import *
 
 
-#from Numeric import zeros, Float, Int, ones, allclose, array
 import numpy as num
 
@@ -31 +21 @@
 
 
-class Parallel_Domain(Domain):
+class Parallel_domain(Domain):
 
     def __init__(self,

anuga_core/source/anuga_parallel/parallel_api.py

@@ -22 +22 @@
     from anuga_parallel.distribute_mesh import pmesh_divide_metis
 
-    from anuga_parallel.parallel_shallow_water import Parallel_Domain
+    from anuga_parallel.parallel_shallow_water import Parallel_domain
 
 #------------------------------------------------------------------------------
@@ -31 +31 @@
 myid = rank()
 processor_name = get_processor_name()
-print 'I am processor %d of %d on node %s' %(myid, numprocs, processor_name)
+#print 'I am processor %d of %d on node %s' %(myid, numprocs, processor_name)
 
 
@@ -98 +98 @@
                 ghost_recv_dict, full_send_dict,\
                 number_of_full_nodes, number_of_full_triangles =\
-                distribute_mesh(domain)
+                distribute_mesh(domain, verbose=verbose)
 
 
@@ -110 +110 @@
                 ghost_recv_dict, full_send_dict,\
                 number_of_full_nodes, number_of_full_triangles =\
-                rec_submesh(0)
+                rec_submesh(0, verbose)
 
 
@@ -117 +117 @@
     #------------------------------------------------------------------------
 
-    if verbose: print 'myid ',myid, number_of_full_nodes, number_of_full_triangles
-
-    
-    domain = Parallel_Domain(points, vertices, boundary,
+    if verbose: print 'myid = %g, no_full_nodes = %g, no_full_triangles = %g' % (myid, number_of_full_nodes, number_of_full_triangles)
+
+    
+    domain = Parallel_domain(points, vertices, boundary,
                              full_send_dict=full_send_dict,
                              ghost_recv_dict=ghost_recv_dict,
@@ -157 +157 @@
 
 
-def distribute_mesh(domain):
+def distribute_mesh(domain, verbose=False):
 
     numprocs = size()
@@ -163 +163 @@
     
     # Subdivide the mesh
-    print 'Subdivide mesh'
+    if verbose: print 'Subdivide mesh'
     nodes, triangles, boundary, triangles_per_proc, quantities = \
            pmesh_divide_metis(domain, numprocs)
@@ -172 +172 @@
     # Build the mesh that should be assigned to each processor,
     # this includes ghost nodes and the communication pattern
-    print 'Build submeshes'    
+    if verbose: print 'Build submeshes'    
     submesh = build_submesh(nodes, triangles, boundary,\
                             quantities, triangles_per_proc)
 
-    for p in range(numprocs):
-        N = len(submesh['ghost_nodes'][p])                
-        M = len(submesh['ghost_triangles'][p])
-        print 'There are %d ghost nodes and %d ghost triangles on proc %d'\
-              %(N, M, p)
+    if verbose:
+        for p in range(numprocs):
+            N = len(submesh['ghost_nodes'][p])                
+            M = len(submesh['ghost_triangles'][p])
+            print 'There are %d ghost nodes and %d ghost triangles on proc %d'\
+                  %(N, M, p)
 
 
     # Send the mesh partition to the appropriate processor
-    print 'Distribute submeshes'        
+    if verbose: print 'Distribute submeshes'        
     for p in range(1, numprocs):
-      send_submesh(submesh, triangles_per_proc, p)
+      send_submesh(submesh, triangles_per_proc, p, verbose)
 
     # Build the local mesh for processor 0

anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -1 @@
-"""Class Parallel_Shallow_Water_Domain -
+"""Class Parallel_shallow_water_domain -
 2D triangular domains for finite-volume computations of
 the shallow water equation, with extra structures to allow
-communication between other Parallel_Domains and itself
+communication between other Parallel_domains and itself
 
 This module contains a specialisation of class Domain
@@ -12 +12 @@
 """
 
-import logging, logging.config
-logger = logging.getLogger('parallel')
-logger.setLevel(logging.WARNING)
-
-try:
-    logging.config.fileConfig('log.ini')
-except:
-    pass
-
-
 from anuga.interface import Domain
 
@@ -30 +20 @@
 
 
-class Parallel_Domain(Domain):
+class Parallel_domain(Domain):
 
     def __init__(self, coordinates, vertices,
@@ -248 +238 @@
         self.communication_time += time.time()-t0
 
-
-## This was removed due to not beening required to be redefined in parallel_shallow_water
-## the original "write_time" is good... however might need some small edits to work properly 
-## with parallel- Nick and Ole April 2007
-##     def write_time(self):
-##         if self.min_timestep == self.max_timestep:
-##             print 'Processor %d/%d, Time = %.4f, delta t = %.8f, steps=%d (%d)'\
-##                   %(self.processor, self.numproc,
-##                     self.time, self.min_timestep, self.number_of_steps,
-##                     self.number_of_first_order_steps)
-##         elif self.min_timestep > self.max_timestep:
-##             print 'Processor %d/%d, Time = %.4f, steps=%d (%d)'\
-##                   %(self.processor, self.numproc,
-##                     self.time, self.number_of_steps,
-##                     self.number_of_first_order_steps)
-##         else:
-##             print 'Processor %d/%d, Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
-##                   %(self.processor, self.numproc,
-##                     self.time, self.min_timestep,
-##                     self.max_timestep, self.number_of_steps,
-##                     self.number_of_first_order_steps)
-
-
-# commented out on the 7/11/06
-#    def evolve(self, yieldstep=None, finaltime=None,
-#               skip_initial_step=False):
-#        """Specialisation of basic evolve method from parent class
-#        """
-
-        #Initialise real time viz if requested
-#        if self.time == 0.0:
-#            pass
-
-        #Call basic machinery from parent class
-#        for t in Domain.evolve(self, yieldstep, finaltime, skip_initial_step):
-
-            #Pass control on to outer loop for more specific actions
-#            yield(t)

anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

@@ -14 +14 @@
 #########################################################
 
-import pypar    # The Python-MPI interface
 import time
 
-#from Numeric import array
-# pmesh
 import numpy as num
 
 from print_stats import print_test_stats, build_full_flag
 
-from anuga.shallow_water import Domain
-from parallel_shallow_water import Parallel_Domain
+#----------------------------
+# Sequential interface
+#---------------------------
+from anuga.interface import Domain
+from anuga.interface import Transmissive_boundary, Reflective_boundary
 
-
-# mesh partition routines
-from parallel_meshes import parallel_rectangle
+#----------------------------
+# Parallel interface
+#---------------------------
+from anuga_parallel.interface import Parallel_shallow_water_domain
+from anuga_parallel.interface import parallel_rectangle
+from anuga_parallel.interface import myid, numprocs, get_processor_name
 
 ###############################
 # Read in processor information
 ###############################
-numprocs = pypar.size()
-myid = pypar.rank()
-processor_name = pypar.get_processor_name()
+numprocs = numprocs()
+myid     = myid()
+processor_name = get_processor_name()
 
 M = 50
@@ -54 +57 @@
 ###########################################
 
-domain = Parallel_Domain(points, vertices, boundary,
-                         full_send_dict  = full_send_dict,
-                         ghost_recv_dict = ghost_recv_dict)
+domain = Parallel_shallow_water_domain(points, vertices, boundary,
+                                       full_send_dict  = full_send_dict,
+                                       ghost_recv_dict = ghost_recv_dict)
 
 
 #Boundaries
-from parallel_shallow_water import Transmissive_boundary, Reflective_boundary
+
 
 T = Transmissive_boundary(domain)

anuga_core/source/anuga_parallel/test_distribute_domain.py

@@ -16 +16 @@
 import pypar
 
-#from Numeric import allclose, array, zeros, Float, take, nonzero
-
 import numpy as num
 
-from anuga.pmesh.mesh_interface import create_mesh_from_regions
-
-from anuga.interface import rectangular_cross
-from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
+
+
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -35 +31 @@
 from anuga.interface import Transmissive_boundary
 
-
-from anuga_parallel.parallel_api import distribute, myid, numprocs
+from anuga.interface import rectangular_cross
+from anuga.interface import create_domain_from_file
+
+
+from anuga_parallel.interface import distribute, myid, numprocs
 
 
@@ -71 +70 @@
 
 
-    domain = pmesh_to_domain_instance(mesh_filename, Domain)
+    domain = create_domain_from_file(mesh_filename)
     domain.set_quantity('stage', Set_Stage(756000.0, 756500.0, 2.0))
 
@@ -80 +79 @@
     if parallel:
         if myid == 0: print 'DISTRIBUTING PARALLEL DOMAIN'
-        domain = distribute(domain, verbose=False)
+        domain = distribute(domain)
 
     #------------------------------------------------------------------------------
@@ -126 +125 @@
             l2norm[2] = pow(l2norm[2], 2)
             if myid == 0:
-                domain.write_time()
+                #domain.write_time()
 
                 #print edges[:,1]            
@@ -151 +150 @@
                 pypar.send(linfnorm, 0)
         else:
-            domain.write_time()
+            #domain.write_time()
             l1list.append(l1norm)                
             l2list.append(l2norm)
@@ -159 +158 @@
     return (l1list, l2list, linflist)
 
-# Test an 8-way run of the shallow water equations
+# Test an nprocs-way run of the shallow water equations
 # against the sequential code.
 
-class Test_Parallel_Sw(unittest.TestCase):
-    def testParallelSw(self):
+class Test_distribute_domain(unittest.TestCase):
+    def test_distribute_domain(self):
         print "Expect this test to fail if not run from the parallel directory."
-        result = os.system("mpirun -np %d python test_parallel_sw.py" % nprocs)
+        result = os.system("mpirun -np %d python test_distribute_domain.py" % nprocs)
         assert_(result == 0)
 
@@ -178 +177 @@
     if numprocs == 1: 
         runner = unittest.TextTestRunner()
-        suite = unittest.makeSuite(Test_Parallel_Sw, 'test')
+        suite = unittest.makeSuite(Test_distribute_domain, 'test')
         runner.run(suite)
     else:

anuga_core/source/anuga_parallel/test_distribute_mesh.py

@@ -9 +9 @@
 from anuga.interface import rectangular_cross
 
-from parallel_shallow_water import Parallel_Domain
-
-from anuga_parallel.distribute_domain import pmesh_divide_metis
-from anuga_parallel.distribute_domain import build_submesh
-from anuga_parallel.distribute_domain import submesh_full, submesh_ghost, submesh_quantities
-from anuga_parallel.distribute_domain import extract_hostmesh, rec_submesh, send_submesh
+from anuga_parallel.distribute_mesh import pmesh_divide_metis
+from anuga_parallel.distribute_mesh import build_submesh
+from anuga_parallel.distribute_mesh import submesh_full, submesh_ghost, submesh_quantities
+from anuga_parallel.distribute_mesh import extract_hostmesh, rec_submesh, send_submesh
 
 import numpy as num
@@ -341 +339 @@
                 assert num.allclose(full_send_dict[0],true_full_send[0])
                 assert num.allclose(full_send_dict[1],true_full_send[1]) 
-
-                """
-        par_domain = Parallel_Domain(points, vertices, boundary,
-                                     full_send_dict  = full_send_dict,
-                                     ghost_recv_dict = ghost_recv_dict)
-                                     """
-
-
-
-