[cig-commits] commit: Merging.
Mercurial
hg at geodynamics.org
Mon Feb 1 15:30:44 PST 2010
changeset: 320:452496845feb
branch: pcu_rejig
parent: 319:e5230235aafc
parent: 318:3327aba8af68
user: JericoRevote
date: Thu Nov 19 16:57:02 2009 +1100
description:
Merging.
diff -r e5230235aafc -r 452496845feb MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Thu Nov 19 16:53:20 2009 +1100
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Thu Nov 19 16:57:02 2009 +1100
@@ -361,6 +361,10 @@ void _MaterialPointsSwarm_Initialise( vo
_Swarm_Initialise( self, data );
+ for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
+ Stg_Component_Initialise( self->swarmVars[var_I], data , False );
+ }
+
/* Now setup the material properties */
if( False == context->loadFromCheckPoint ) {
@@ -380,10 +384,6 @@ void _MaterialPointsSwarm_Initialise( vo
self,
self->swarmVariable_Register->variable_Register );
}
- }
-
- 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() - */
More information about the CIG-COMMITS
mailing list