[cig-commits] commit: Ensuring all swarmVars are "build" and "initialised". Previously 3 of the 5 swarmVars were not flagged as being build & initialised (don't know if that had an impact on anything)

[Mercurial]

changeset:   93:4ce7dfadfb59
user:        JulianGiordani
date:        Fri May 02 02:51:29 2008 +0000
files:       MaterialPoints/src/MaterialPointsSwarm.c
description:
Ensuring all swarmVars are "build" and "initialised". Previously 3 of the 5 swarmVars were not flagged as being build & initialised (don't know if that had an impact on anything)


diff -r 3a4d3d86aca2 -r 4ce7dfadfb59 MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Wed Apr 23 04:32:31 2008 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Fri May 02 02:51:29 2008 +0000
@@ -303,6 +303,7 @@ void _MaterialPointsSwarm_Build( void* s
 	int			commHandler_I;
 	Bool                    movementCommHandlerFound = False;
 	Stream*                 errorStream = Journal_Register( Error_Type, self->type );
+	int var_I;
 
 	_Swarm_Build( self, data );
 
@@ -323,17 +324,20 @@ void _MaterialPointsSwarm_Build( void* s
 		errorStream, "Error: for MaterialPointsSwarm Swarms, at least one ParticleMovementHandler"
 			" commHandler must be registered. Please rectify this in your XML / code.\n" );
 
-	Stg_Component_Build( self->particleCoordVariable, data, False );
-	Stg_Component_Build( self->materialIndexVariable, data, False );
+	for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
+		Stg_Component_Build( self->swarmVars[var_I], data , False );
+	}
 
 }
 void _MaterialPointsSwarm_Initialise( void* swarm, void* data ) {
 	MaterialPointsSwarm*	self = (MaterialPointsSwarm*) swarm;
 	AbstractContext* context = (AbstractContext*)data;
+	int var_I;
 	
 	_Swarm_Initialise( self, data );
-	Stg_Component_Initialise( self->particleCoordVariable, data, False );
-	Stg_Component_Initialise( self->materialIndexVariable, data, False );
+	for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
+		Stg_Component_Initialise( self->swarmVars[var_I], data , False );
+	}
 
 	/* if loading from checkpoint, particle materials etc have already been loaded in Swarm_Build() - 
 	 * thus nothing to do here */