[cig-commits] commit: merge of 1.4.x changes

[Mercurial]

changeset:   394:aa90af8b3cb3
parent:      393:934af6c07681
parent:      390:652b314deeb1
user:        JulianGiordani
date:        Tue Jan 19 15:49:00 2010 +1100
files:       MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/SwarmVariableField.c PopulationControl/tests/EscapedRoutineSuite.c Utils/src/DiffusionSMT.c
description:
merge of 1.4.x changes


diff -r 934af6c07681 -r aa90af8b3cb3 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Tue Jan 19 12:13:52 2010 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.c	Tue Jan 19 15:49:00 2010 +1100
@@ -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  );
 
diff -r 934af6c07681 -r aa90af8b3cb3 MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c	Tue Jan 19 12:13:52 2010 +1100
+++ b/MaterialPoints/src/SwarmVariableField.c	Tue Jan 19 15:49:00 2010 +1100
@@ -135,9 +135,9 @@ void _SwarmVariableField_AssignFromXML( 
 	variable_Register = self->context->variable_Register; 
 
 	// TODO: just get the textual name here - see gLucifer's SwarmPlotter DrawignObject 
-	swarmVarName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"swarmVariable", ""  );
+	swarmVarName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"swarmVariable", "" );
 
-	materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"MaterialSwarm", MaterialPointsSwarm, True, data  );
+	materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"MaterialSwarm", MaterialPointsSwarm, True, data );
 	integrationSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", IntegrationPointsSwarm, True, NULL );
 	assert( integrationSwarm  );
 
@@ -157,7 +157,7 @@ void _SwarmVariableField_Build( void* sw
 	assert( Class_IsSuper( self->feMesh->topo, IGraph ) );
 	tmpName = Stg_Object_AppendSuffix( self, (Name)"DataVariable"  );
 	self->dataVariable = Variable_NewScalar( tmpName, (AbstractContext*)self->context, Variable_DataType_Double, (Index*)&nDomainVerts, NULL, (void**)&self->data, self->variable_Register );
-	Memory_Free( tmpName  );
+	Memory_Free( tmpName );
 	self->fieldComponentCount = 1;
 
 	tmpName = Stg_Object_AppendSuffix( self, (Name)"DofLayout"  );