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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-09 14:36:31 -0700 (Sun, 09 Jul 2006)
New Revision: 3994

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.h
Log:
 r2498 at earth:  boo | 2006-07-09 14:30:57 -0700
  r2493 at earth (orig r3673):  RaquibulHassan | 2006-07-07 01:55:54 -0700
  Cleaning up sections of the code.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2497
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3672
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2498
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3673

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-09 21:36:28 UTC (rev 3993)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c	2006-07-09 21:36:31 UTC (rev 3994)
@@ -262,20 +262,63 @@
 #define DATA_TAG 1<<1
 void _ParallelDelaunay_Init( ParallelDelaunay* self )
 {
+	assert( self );
+
+	self->numHaloSites[0] = 0;
+	self->numHaloSites[1] = 0;
+}
+
+	/*--------------------------------------------------------------------------------------------------------------------------
+	** Virtual functions
+	*/
+
+/** Stg_Class_Delete() implementation */
+void _ParallelDelaunay_Delete( void* pd )
+{
+	ParallelDelaunay *self = (ParallelDelaunay*)pd;
+	
+	assert( self );
+
+	_Stg_Component_Delete( self );
+}
+
+/** Stg_Class_Print() implementation */
+void _ParallelDelaunay_Print( void* pd, Stream* stream )
+{
+	ParallelDelaunay *self = ( ParallelDelaunay* )pd;
+	
+	assert( self );
+	assert( stream );
+
+	_Delaunay_Print( (Delaunay*)self, stream );
+	Journal_Printf( stream, "ParallelDelaunay (ptr): (%p)\n", self );
+}
+
+void *_ParallelDelaunay_Copy( void* pd, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap )
+{
+	return NULL;
+}
+
+void _ParallelDelaunay_Construct( void* pd, Stg_ComponentFactory* cf )
+{
+	
+}
+
+void _ParallelDelaunay_Build( void* pd, void* data )
+{
 	float _minX, _maxX;
 	float _minY, _maxY;
 	int numProcs, numSites, i, j, count;
 	float stride, start;
 	int *alloced = NULL;
 	int offset;
+	ParallelDelaunay *self = (ParallelDelaunay*)pd;
+
+	assert( self );
 	
-	assert( self );
 	numProcs = self->numProcs;
 	numSites = self->numSites;
 
-	self->numHaloSites[0] = 0;
-	self->numHaloSites[1] = 0;
-
 	if( numProcs == 1 ){
 		self->leftProc = numProcs;
 		self->rightProc = numProcs;
@@ -427,6 +470,9 @@
 
 		self->numHaloSites[0] = self->haloSites[0]->nodeCount;
 		self->numTotalLocalSites += self->haloSites[0]->nodeCount;
+		
+		Stg_Class_Delete( self->haloSites[0] );
+		Stg_Class_Delete( iter );
 	}
 		
 	if( self->rightProc != self->numProcs ){
@@ -473,6 +519,9 @@
 
 		self->numHaloSites[1] = self->haloSites[1]->nodeCount;
 		self->numTotalLocalSites += self->haloSites[1]->nodeCount;
+
+		Stg_Class_Delete( self->haloSites[1] );
+		Stg_Class_Delete( iter );
 	}
 	
 	Stg_Class_Delete( self->localTriangulation );
@@ -497,65 +546,43 @@
 							 self->numHaloSites[0]))];
 			}
 		}
+		
+		for( count=0; count<self->localTriangulation->numNeighbours[i]; count++ ){
+			if( (self->localTriangulation->neighbours[i][count]) >= (self->localTriangulation->idOffset+self->numLocalSites) ){
+				if( self->localTriangulation->neighbours[i][count] < 
+						(self->localTriangulation->idOffset+self->numLocalSites + self->numHaloSites[0]) ){
+			
+					self->localTriangulation->neighbours[i][count] =
+						self->mappingTable[0][(self->localTriangulation->sites[i].id -
+								(self->localTriangulation->idOffset+self->numLocalSites))];
+				}
+				else{
+					self->localTriangulation->neighbours[i][count] =
+						self->mappingTable[1][(self->localTriangulation->sites[i].id -
+								(self->localTriangulation->idOffset+
+								 self->numLocalSites+
+								 self->numHaloSites[0]))];
+				}
+			}
+		}
 	}
 }
 
-	/*--------------------------------------------------------------------------------------------------------------------------
-	** Virtual functions
-	*/
-
-/** Stg_Class_Delete() implementation */
-void _ParallelDelaunay_Delete( void* delaunay )
+void _ParallelDelaunay_Initialise( void* pd, void* data )
 {
-	ParallelDelaunay *self = (ParallelDelaunay*)delaunay;
 	
-	assert( self );
-
-	_Stg_Component_Delete( self );
 }
 
-/** Stg_Class_Print() implementation */
-void _ParallelDelaunay_Print( void* delaunay, Stream* stream )
+void _ParallelDelaunay_Execute( void* pd, void* data )
 {
-	ParallelDelaunay *self = ( ParallelDelaunay* )delaunay;
 	
-	assert( self );
-	assert( stream );
-
-	_Delaunay_Print( (Delaunay*)self, stream );
-	Journal_Printf( stream, "ParallelDelaunay (ptr): (%p)\n", self );
 }
 
-void *_ParallelDelaunay_Copy( void* delaunay, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap )
+void _ParallelDelaunay_Destroy( void* pd, void* data )
 {
-	return NULL;
-}
-
-void _ParallelDelaunay_Construct( void* delaunay, Stg_ComponentFactory* cf )
-{
 	
 }
 
-void _ParallelDelaunay_Build( void* delaunay, void* data )
-{
-
-}
-
-void _ParallelDelaunay_Initialise( void* delaunay, void* data )
-{
-	
-}
-
-void _ParallelDelaunay_Execute( void* delaunay, void* data )
-{
-	
-}
-
-void _ParallelDelaunay_Destroy( void* delaunay, void* data )
-{
-	
-}
-
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Private Member functions
 	*/

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.h	2006-07-09 21:36:28 UTC (rev 3993)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.h	2006-07-09 21:36:31 UTC (rev 3994)
@@ -127,22 +127,22 @@
 	*/
 	
 	/** Stg_Class_Delete() implementation */
-	void _ParallelDelaunay_Delete( void* delaunay );
+	void _ParallelDelaunay_Delete( void* pd );
 	
 	/** Stg_Class_Print() implementation */
-	void _ParallelDelaunay_Print( void* delaunay, Stream* stream );
+	void _ParallelDelaunay_Print( void* pd, Stream* stream );
 	
-	void *_ParallelDelaunay_Copy( void* delaunay, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+	void *_ParallelDelaunay_Copy( void* pd, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
 	
-	void _ParallelDelaunay_Construct( void* delaunay, Stg_ComponentFactory* cf );
+	void _ParallelDelaunay_Construct( void* pd, Stg_ComponentFactory* cf );
 	
-	void _ParallelDelaunay_Build( void* delaunay, void* data );
+	void _ParallelDelaunay_Build( void* pd, void* data );
 	
-	void _ParallelDelaunay_Initialise( void* delaunay, void* data );
+	void _ParallelDelaunay_Initialise( void* pd, void* data );
 	
-	void _ParallelDelaunay_Execute( void* delaunay, void* data );
+	void _ParallelDelaunay_Execute( void* pd, void* data );
 	
-	void _ParallelDelaunay_Destroy( void* delaunay, void* data );
+	void _ParallelDelaunay_Destroy( void* pd, void* data );
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Private Member functions