[cig-commits] commit: Merge with 1.4.x

[Mercurial]

changeset:   391:57cd3eabc3b6
tag:         tip
parent:      387:62ce1a314b2f
parent:      390:652b314deeb1
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Feb 04 15:10:40 2010 -0800
files:       MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/SwarmVariableField.c PopulationControl/tests/EscapedRoutineSuite.c Utils/src/DiffusionSMT.c
description:
Merge with 1.4.x


diff -r 62ce1a314b2f -r 57cd3eabc3b6 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Mon Feb 01 02:19:14 2010 -0800
+++ b/MaterialPoints/src/ParticleFeVariable.c	Thu Feb 04 15:10:40 2010 -0800
@@ -70,6 +70,8 @@ ParticleFeVariable* _ParticleFeVariable_
 	   and so should be set to ZERO in any children of this class. */
 	nameAllocationType = NON_GLOBAL;
 	_syncShadowValues  = _FeVariable_SyncShadowValues;
+	_getMinGlobalFieldMagnitude = _FeVariable_GetMinGlobalFieldMagnitude;
+	_getMaxGlobalFieldMagnitude = _FeVariable_GetMaxGlobalFieldMagnitude;
 
 	self = (ParticleFeVariable*) _FeVariable_New(  FEVARIABLE_PASSARGS  );