[cig-commits] r4800 - in long/3D/Gale/trunk/src/PICellerator: . MaterialPoints/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:41:55 -0700 (Wed, 11 Oct 2006)
New Revision: 4800

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialPointsSwarm.c
Log:
 r489 at earth:  boo | 2006-10-11 13:40:22 -0700
  r482 at earth (orig r369):  LukeHodkinson | 2006-09-26 20:38:55 -0700
  Enable the defensive behaviour in 
  ParticleCommHandler when we have an
  EscapedRoutine class.
  
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:368
aee11096-cf10-0410-a191-eea5772ba81f:/cig:488
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:369
aee11096-cf10-0410-a191-eea5772ba81f:/cig:489

Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialPointsSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialPointsSwarm.c	2006-10-11 20:41:53 UTC (rev 4799)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialPointsSwarm.c	2006-10-11 20:41:55 UTC (rev 4800)
@@ -152,6 +152,9 @@
 			GetOffsetOfMember( particle , materialIndex ), 
 			Variable_DataType_Int ); /* Should be unsigned int */
 
+	/* If we have an escaped routine, clear the defensive flag. */
+	if( self->escapedRoutine )
+		self->particleCommunicationHandler->defensive = False;
 }
 
 /*------------------------------------------------------------------------------------------------------------------------