Changeset 3928 for anuga_core/source/anuga_parallel

Timestamp:

Nov 7, 2006, 1:13:03 PM (18 years ago)

Author:

ole

Message:

Parallel domains now store only full triangles in sww files.
Still need to remove ghost nodes.

Location:

anuga_core/source/anuga_parallel

Files:

• parallel_api.py (modified) (1 diff)
• parallel_shallow_water.py (modified) (2 diffs)
• test_parallel_sw_runup.py (modified) (2 diffs)

anuga_core/source/anuga_parallel/parallel_api.py

@@ -171 +171 @@
 
     for p in range(numprocs):
+        N = len(submesh['ghost_nodes'][p])                
         M = len(submesh['ghost_triangles'][p])
-        print 'There are %d ghost triangles on proc %d' %(M, p)
-        N = len(submesh['ghost_nodes'][p])
-        print 'There are %d ghost nodes on proc %d' %(N, p)
+        print 'There are %d ghost nodes and %d ghost triangles on proc %d'\
+              %(N, M, p)
 
 

anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -34 +34 @@
                  full_send_dict=None,
                  ghost_recv_dict=None,
-                 number_of_full_nodes=0,
-                 number_of_full_triangles=0):
+                 number_of_full_nodes=None,
+                 number_of_full_triangles=None):
 
         Domain.__init__(self,
@@ -48 +48 @@
                         number_of_full_triangles=number_of_full_triangles)
 
-        N = self.number_of_elements
+        N = len(self) # number_of_triangles
 
 #        self.processor = pypar.rank()

anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

@@ -96 +96 @@
         local_interpolation_points.append(i)
 
-# Hack
+# Hack before we excluded ghosts.
 if numprocs == 2:
     if myid == 0:
         del local_interpolation_points[0]                
         #local_interpolation_points = [1,2,3]
-
 if numprocs == 3:
     if myid == 1:
         del local_interpolation_points[0]
-
-
 if numprocs == 4:
     if myid == 0:
@@ -122 +119 @@
 
 for t in domain.evolve(yieldstep = 0.1, finaltime = 5.0):
-    #domain.write_time()
-
+    domain.write_time()
     
     # Record time series at known points