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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c
Log:
 r3316 at earth (orig r3977):  LukeHodkinson | 2007-01-17 18:22:39 -0800
 Small efficiency modification.
 



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:3975
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3977
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 16:49:44 UTC (rev 5826)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c	2007-01-18 22:28:10 UTC (rev 5827)
@@ -255,12 +255,15 @@
 	FreeArray( nShadows );
 
 	for( nbr_i = 0; nbr_i < nbrInfo->procNbrCnt; nbr_i++ ) {
+		if( !nRecvParticles[nbr_i] )
+			continue;
+
 		if( swarm->particleLocalCount + nRecvParticles[nbr_i] >= swarm->particlesArraySize ) {
 			unsigned	nDeltas;
 
-			nDeltas = nRecvParticles[nbr_i] % self->swarm->particlesArrayDelta;
+			nDeltas = nRecvParticles[nbr_i] % swarm->particlesArrayDelta;
 			nDeltas += nDeltas ? 0 : 1;
-			swarm->particlesArraySize += nDeltas;
+			swarm->particlesArraySize += nDeltas * swarm->particlesArrayDelta;
 			swarm->particles = Memory_Realloc_Array_Bytes( swarm->particles, 
 								       particleSize, 
 								       swarm->particlesArraySize );