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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:22:49 -0800 (Fri, 05 Jan 2007)
New Revision: 5649

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialFeVariable.c
Log:
 r547 at earth (orig r399):  LukeHodkinson | 2007-01-03 22:50:21 -0800
 Found another construct/build timing issue.
 
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:396
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:399
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524

Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialFeVariable.c	2007-01-05 19:22:47 UTC (rev 5648)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/MaterialFeVariable.c	2007-01-05 19:22:49 UTC (rev 5649)
@@ -110,33 +110,11 @@
 
 void _MaterialFeVariable_Init( MaterialFeVariable* self, Material* material ) {
 	IntegrationPointsSwarm* swarm;
-	Name tmpName;
-	Variable_Register* variable_Register = NULL;
 
 	/* Assign Pointers */
 	swarm = Stg_CheckType( self->assemblyTerm->integrationSwarm, IntegrationPointsSwarm );
 	self->picIntegrationPoints = swarm;
 	self->material       = material;
-
-	/* Create Dof Layout */
-	if ( swarm->swarmVariable_Register )
-		variable_Register = swarm->swarmVariable_Register->variable_Register;
-
-	tmpName = Stg_Object_AppendSuffix( self, "DataVariable" );
-	self->dataVariable = Variable_NewScalar( 
-			tmpName,
-			Variable_DataType_Double, 
-			&self->feMesh->topo->domains[MT_VERTEX]->nDomains, 
-			(void**)&self->data, 
-			variable_Register );
-	Memory_Free( tmpName );
-	self->fieldComponentCount = 1;
-	
-	tmpName = Stg_Object_AppendSuffix( self, "DofLayout" );
-	self->dofLayout = DofLayout_New( tmpName, variable_Register, self->feMesh->topo->domains[MT_VERTEX]->nDomains, NULL );
-	DofLayout_AddAllFromVariableArray( self->dofLayout, 1, &self->dataVariable );
-	Memory_Free( tmpName );
-	self->eqNum->dofLayout = self->dofLayout;
 }
 
 /* --- Virtual Function Implementations --- */
@@ -211,7 +189,33 @@
 
 void _MaterialFeVariable_Build( void* materialFeVariable, void* data ) {
 	MaterialFeVariable* self = (MaterialFeVariable*) materialFeVariable;
+	IntegrationPointsSwarm* swarm;
+	Name tmpName;
+	Variable_Register* variable_Register = NULL;
+
+	Build( self->feMesh, data, False );
+
+	/* Create Dof Layout */
+	swarm = self->picIntegrationPoints;
+	if ( swarm->swarmVariable_Register )
+		variable_Register = swarm->swarmVariable_Register->variable_Register;
+
+	tmpName = Stg_Object_AppendSuffix( self, "DataVariable" );
+	self->dataVariable = Variable_NewScalar( 
+			tmpName,
+			Variable_DataType_Double, 
+			&self->feMesh->topo->domains[MT_VERTEX]->nDomains, 
+			(void**)&self->data, 
+			variable_Register );
+	Memory_Free( tmpName );
+	self->fieldComponentCount = 1;
 	
+	tmpName = Stg_Object_AppendSuffix( self, "DofLayout" );
+	self->dofLayout = DofLayout_New( tmpName, variable_Register, self->feMesh->topo->domains[MT_VERTEX]->nDomains, NULL );
+	DofLayout_AddAllFromVariableArray( self->dofLayout, 1, &self->dataVariable );
+	Memory_Free( tmpName );
+	self->eqNum->dofLayout = self->dofLayout;
+	
 	_ParticleFeVariable_Build( self, data );
 }
 void _MaterialFeVariable_Initialise( void* materialFeVariable, void* data ) {