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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
Log:
 r2497 at earth:  boo | 2006-07-09 14:30:56 -0700
  r2492 at earth (orig r3672):  RaquibulHassan | 2006-07-07 00:47:36 -0700
  Forgot to remove references to a debug visualizer.
  
  
 



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

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:24 UTC (rev 3992)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c	2006-07-09 21:36:28 UTC (rev 3993)
@@ -58,7 +58,6 @@
 #include <assert.h>
 #include <string.h>
 #include <math.h>
-#include "visualizer.c"
 
 const Type ParallelDelaunay_Type="ParallelDelaunay";
 #define PI 3.1415926535897932384626
@@ -349,20 +348,6 @@
 		}
 
 		Memory_Free( alloced );
-
-		{/*TODO remove this block*/
-			
-			maxX = _maxX;
-			maxY = _maxY;
-			minX = _minX;
-			minY = _minY;
-			for( i=MASTER_PROC+1; i<numProcs; i++ ){
-				MPI_Send( &minX, 1, MPI_FLOAT, i, LOAD_TAG, *self->comm );
-				MPI_Send( &minY, 1, MPI_FLOAT, i, LOAD_TAG, *self->comm );
-				MPI_Send( &maxX, 1, MPI_FLOAT, i, LOAD_TAG, *self->comm );
-				MPI_Send( &maxY, 1, MPI_FLOAT, i, LOAD_TAG, *self->comm );
-			}
-		}
 	}
 	else{
 		MPI_Status status;
@@ -374,13 +359,6 @@
 		for( i=0; i<self->numLocalSites; i++ ){
 			MPI_Recv( &(self->localPoints[i]), sizeof(CoordF), MPI_BYTE, MASTER_PROC, DATA_TAG, *self->comm, &status );
 		}
-
-		{/*TODO remove this block*/
-			MPI_Recv( &minX, 1, MPI_FLOAT, MASTER_PROC, LOAD_TAG, *self->comm, &status );
-			MPI_Recv( &minY, 1, MPI_FLOAT, MASTER_PROC, LOAD_TAG, *self->comm, &status );
-			MPI_Recv( &maxX, 1, MPI_FLOAT, MASTER_PROC, LOAD_TAG, *self->comm, &status );
-			MPI_Recv( &maxY, 1, MPI_FLOAT, MASTER_PROC, LOAD_TAG, *self->comm, &status );
-		}
 	}
 
 	MPI_Bcast( self->processorLoad, numProcs, MPI_INT, MASTER_PROC, *self->comm );
@@ -449,7 +427,6 @@
 
 		self->numHaloSites[0] = self->haloSites[0]->nodeCount;
 		self->numTotalLocalSites += self->haloSites[0]->nodeCount;
-		b[0] = 0;
 	}
 		
 	if( self->rightProc != self->numProcs ){
@@ -496,7 +473,6 @@
 
 		self->numHaloSites[1] = self->haloSites[1]->nodeCount;
 		self->numTotalLocalSites += self->haloSites[1]->nodeCount;
-		b[1] = 0;
 	}
 	
 	Stg_Class_Delete( self->localTriangulation );
@@ -522,15 +498,6 @@
 			}
 		}
 	}
-
-	{/*TODO remove this block*/
-			
-		createWindow();
-		LoadGLTexture();
-		BuildFont();
-
-		windowEvents( self->localTriangulation, self->localPoints );
-	}
 }
 
 	/*--------------------------------------------------------------------------------------------------------------------------
@@ -803,7 +770,7 @@
 	}
 	
 	if( rank == pd->leftProc ){
-		b[0] = rcand = lowest;
+		rcand = lowest;
 		
 		ParallelDelaunaySendEdge( lowest, rank, comm, &(r[0]) );
 		lcand = ParallelDelaunayRecvEdge( d, rank, comm );
@@ -868,7 +835,7 @@
 		}
 	}
 	else if( rank == pd->rightProc ){
-		b[1] = lcand = lowest;
+		lcand = lowest;
 		
 		ParallelDelaunaySendEdge( lowest, rank, comm, &(r[0]) );
 		rcand = ParallelDelaunayRecvEdge( d, rank, comm );