Changeset 3946

Timestamp:

Nov 8, 2006, 5:54:03 PM (18 years ago)

Author:

ole

Message:

Quick fix to get parallel anuga to work with changes from changeset:3945

Location:

anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/domain.py (modified) (2 diffs)
• anuga/shallow_water/data_manager.py (modified) (3 diffs)
• anuga_parallel/build_submesh.py (modified) (2 diffs)
• anuga_parallel/pmesh_divide.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -8 +8 @@
 """
 
+from Numeric import allclose
 from anuga.config import epsilon
 
@@ -164 +165 @@
                 self.tri_full_flag[id] = 0
 
+        # Test the assumption that all full triangles are store before
+        # the ghost triangles.
+        assert allclose(self.tri_full_flag[:self.number_of_full_nodes],1)
+                        
 
         #Defaults

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -298 +298 @@
 
             if domain.smooth is True:
-                fid.createDimension('number_of_points', len(domain.vertexlist))
-                #fid.createDimension('number_of_points', self.number_of_nodes)
+                #fid.createDimension('number_of_points', len(domain.vertexlist))
+                fid.createDimension('number_of_points', self.domain.number_of_full_nodes)
 
                 # FIXME(Ole): This will cause sww files for paralle domains to
@@ -374 +374 @@
 
 
+
         x[:] = X.astype(self.precision)
+        
         y[:] = Y.astype(self.precision)
-        z[:] = Z.astype(self.precision)
+
+        # FIXME (HACK)
+        truncation = self.domain.number_of_full_nodes        
+        print len(z), len(Z), truncation
+        
+        z[:] = Z[:truncation].astype(self.precision)
 
         #FIXME: Backwards compatibility
         z = fid.variables['z']
-        z[:] = Z.astype(self.precision)
+        z[:] = Z[:truncation].astype(self.precision)
         ################################
 
@@ -491 +498 @@
                 A,V = Q.get_vertex_values(xy = False,
                                           precision = self.precision)
+
+                # HACK
+                truncation = self.domain.number_of_full_nodes
+                A = A[:truncation]
 
                 #FIXME: Make this general (see below)

anuga_core/source/anuga_parallel/build_submesh.py

@@ -129 +129 @@
 def ghost_layer(submesh, mesh, p, tupper, tlower):
 
-    ncoord = len(mesh.coordinates)
-    ntriangles = len(mesh.triangles)
+    ncoord = mesh.number_of_nodes
+    ntriangles = mesh.number_of_triangles
 
     # Find the first layer of boundary triangles
@@ -191 +191 @@
 
     nodelist = reshape(arrayrange(ncoord),(ncoord,1))
-    tsubnodes = concatenate((nodelist, mesh.coordinates), 1)
+    tsubnodes = concatenate((nodelist, mesh.get_nodes()), 1)
     subnodes = take(tsubnodes, nonzero(nodemap))
 

anuga_core/source/anuga_parallel/pmesh_divide.py

@@ -111 +111 @@
     n_tri = len(domain.triangles)
     if n_procs != 1: #Because metis chokes on it...
-        n_vert = len(domain.coordinates)
+        n_vert = domain.number_of_nodes
         t_list = domain.triangles.copy()
         t_list = reshape(t_list, (-1,))
@@ -182 +182 @@
     # Extract the node list
     
-    nodes = domain.coordinates.copy()
+    nodes = domain.get_nodes().copy()
     
     # Convert the triangle datastructure to be an array type,