[cig-commits] r4054 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/src

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:06:37 -0700 (Thu, 20 Jul 2006)
New Revision: 4054

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
Log:
 r2537 at earth:  boo | 2006-07-20 20:01:43 -0700
  r2513 at earth (orig r3682):  RaquibulHassan | 2006-07-16 19:16:23 -0700
  Fixing a memory leak.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2534
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3678
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2537
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3682

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c	2006-07-21 03:06:36 UTC (rev 4053)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c	2006-07-21 03:06:37 UTC (rev 4054)
@@ -324,6 +324,7 @@
 	int *alloced = NULL;
 	int offset;
 	ParallelDelaunay *self = (ParallelDelaunay*)pd;
+	DelaunayAttributes attr;
 
 	assert( self );
 	
@@ -536,7 +537,10 @@
 	}
 	
 	Stg_Class_Delete( self->localTriangulation );
-	self->localTriangulation = Delaunay_New( "delaunay", self->dictionary, self->localPoints, self->numTotalLocalSites, offset, self->attributes );
+	
+	memcpy( &attr, self->attributes, sizeof( DelaunayAttributes ) );
+	attr.BuildTriangleIndices = 0;
+	self->localTriangulation = Delaunay_New( "delaunay", self->dictionary, self->localPoints, self->numTotalLocalSites, offset, &attr );
 	Stg_Component_Build( self->localTriangulation, NULL, True );
 	
 	if( self->attributes->BuildTriangleIndices ){
@@ -787,6 +791,8 @@
 		triCount = delaunay->numTriangles;
 
 		MPI_Allreduce( &triCount, &globalNumTriangles, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD );
+	
+		pd->numTriangles = globalNumTriangles;
 		
 		triCountArray = Memory_Alloc_Array_Unnamed( int, sizeof(int)*pd->numProcs );
 		rank = pd->rank;