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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:09:28 -0700 (Thu, 20 Jul 2006)
New Revision: 4071

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
Log:
 r2543 at earth:  boo | 2006-07-20 20:01:47 -0700
  r2519 at earth (orig r3688):  RaquibulHassan | 2006-07-18 23:24:43 -0700
  Fixing a bug in the translation of the global indices mapping table.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2542
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3687
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2543
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3688

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:09:21 UTC (rev 4070)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c	2006-07-21 03:09:28 UTC (rev 4071)
@@ -747,7 +747,7 @@
 				if( pd->attributes->FindNeighbours ){
 					memcpy( (pd->neighbours[pd->initialOrder[j]]), (pd->localTriangulation->neighbours[count]), sizeof(int)*pd->localTriangulation->numNeighbours[count] );
 					for( i=0; i<pd->numNeighbours[pd->initialOrder[j]]; i++ ){
-						pd->neighbours[pd->initialOrder[j]][i] = pd->initialOrder[pd->neighbours[pd->initialOrder[j]][i]];
+						pd->neighbours[pd->initialOrder[j]][i] = pd->initialOrder[ParallelDelaunay_TranslateLocalToGlobal(pd, pd->neighbours[pd->initialOrder[j]][i])];
 					}
 				}
 				count++;
@@ -789,9 +789,9 @@
 				
 				MPI_Send( translationArray, pd->localTriangulation->numNeighbours[i], MPI_INT, MASTER_PROC, NEIGHBOURS_TAG, *(pd->comm) );
 			}
-		}
+		}	
 	}
-
+	
 	if( pd->attributes->BuildTriangleIndices ){
 		int **triIndices = NULL;
 		int globalNumTriangles = 0;
@@ -867,10 +867,11 @@
 {
 	if( id >= (self->localTriangulation->idOffset+self->numLocalSites) ){
 	
-		if( id < (self->localTriangulation->idOffset+self->numLocalSites + self->numHaloSites[0]) ){
+		if( (self->leftProc != self->numProcs) && (id < (self->localTriangulation->idOffset+self->numLocalSites + self->numHaloSites[0])) ){
 			
 			id = self->mappingTable[0][(id -
-						(self->localTriangulation->idOffset+self->numLocalSites))];
+						(self->localTriangulation->idOffset+
+						 self->numLocalSites))];
 		}
 		else{