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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-18 14:28:20 -0800 (Thu, 18 Jan 2007)
New Revision: 5830

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c
Log:
 r3319 at earth (orig r3980):  LukeHodkinson | 2007-01-18 00:14:08 -0800
 Uncommenting a line or two.
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3979
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3980
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c	2007-01-18 22:28:17 UTC (rev 5829)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c	2007-01-18 22:28:20 UTC (rev 5830)
@@ -141,7 +141,7 @@
 		return;
 
 	ParticleCommHandler_BuildShadowParticles( self, &nShadows, &particles );
-	/*ParticleCommHandler_ExchangeShadowParticles( self, nShadows, particles );*/
+	ParticleCommHandler_ExchangeShadowParticles( self, nShadows, particles );
 
 /*
 	ParticleCommHandler_BuildExternalParticles( self, &nExternals, &externals );
@@ -203,7 +203,7 @@
 		for( cell_i = 0; cell_i < shadowInfo->procShadowCnt[nbr_i]; cell_i++ ) {
 			for( p_i = 0; p_i < swarm->cellParticleCountTbl[shadowInfo->procShadowTbl[nbr_i][cell_i]]; p_i++ ) {
 				shds[nShds[nbr_i]] = swarm->cellParticleTbl[shadowInfo->procShadowTbl[nbr_i][cell_i]][p_i];
-				/*Swarm_CopyParticleOffSwarm( swarm, parts[nbr_i], nShds[nbr_i], shds[nShds[nbr_i]] );*/
+				Swarm_CopyParticleOffSwarm( swarm, parts[nbr_i], nShds[nbr_i], shds[nShds[nbr_i]] );
 				nShds[nbr_i]++;
 			}
 		}
@@ -254,7 +254,6 @@
 	FreeArray( particles );
 	FreeArray( nShadows );
 
-#if 0
 	for( nbr_i = 0; nbr_i < nbrInfo->procNbrCnt; nbr_i++ ) {
 		if( !nRecvParticles[nbr_i] )
 			continue;
@@ -279,7 +278,6 @@
 		}
 		swarm->particleLocalCount += nRecvParticles[nbr_i];
 	}
-#endif
 
 	FreeArray( nRecvParticles );
 	for( nbr_i = 0; nbr_i < nbrInfo->procNbrCnt; nbr_i++ )