[cig-commits] commit: Just cleaning up the AssignFromXML function.

[Mercurial]

changeset:   314:622153e57368
branch:      pcu_rejig
user:        JericoRevote
date:        Wed Nov 18 12:20:16 2009 +1100
files:       MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/ParticleFeVariable.h MaterialPoints/src/SwarmVariableField.c
description:
Just cleaning up the AssignFromXML function.


diff -r de1e9fae44d9 -r 622153e57368 MaterialPoints/src/MaterialFeVariable.c
--- a/MaterialPoints/src/MaterialFeVariable.c	Tue Nov 17 17:24:43 2009 +1100
+++ b/MaterialPoints/src/MaterialFeVariable.c	Wed Nov 18 12:20:16 2009 +1100
@@ -175,15 +175,14 @@ void* _MaterialFeVariable_DefaultNew( Na
 }
 
 void _MaterialFeVariable_AssignFromXML( void* materialFeVariable, Stg_ComponentFactory* cf, void* data ){
-	MaterialFeVariable*   self              = (MaterialFeVariable*) materialFeVariable;
-	Material*             material;
+	MaterialFeVariable*	self = (MaterialFeVariable*) materialFeVariable;
+	Material*				material;
 	
 	material = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Material", Material, True, data );
 
 	/* Construct Parent */
 	_ParticleFeVariable_AssignFromXML( self, cf, data );
 
-	_FieldVariable_AssignFromXML( self, cf, data );
 	_MaterialFeVariable_Init( self, material );
 }
 
diff -r de1e9fae44d9 -r 622153e57368 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Tue Nov 17 17:24:43 2009 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.c	Wed Nov 18 12:20:16 2009 +1100
@@ -129,7 +129,7 @@ ParticleFeVariable* _ParticleFeVariable_
 	return self;
 }
 
-void _ParticleFeVariable_Init( ParticleFeVariable* self, IntegrationPointsSwarm* swarm, FiniteElementContext* context ) {
+void _ParticleFeVariable_Init( ParticleFeVariable* self, IntegrationPointsSwarm* swarm ) {
 	/* Create Vector */
 	self->assemblyVectorName = Stg_Object_AppendSuffix( self, "assemblyVector" );
 	self->assemblyVector = ForceVector_New( 
@@ -137,7 +137,7 @@ void _ParticleFeVariable_Init( ParticleF
 		(FiniteElementContext*) self->context,
 		(FeVariable*) self, 
 		self->dim, 
-		context->entryPoint_Register, 
+		self->context->entryPoint_Register, 
 		self->communicator );
 	self->assemblyTerm = ForceTerm_New( "assemblyTerm", (FiniteElementContext*) self->context, self->assemblyVector, (Swarm*)swarm, (Stg_Component*) self );
 
@@ -147,14 +147,14 @@ void _ParticleFeVariable_Init( ParticleF
 		(FiniteElementContext*) self->context,
 		(FeVariable*) self, 
 		self->dim, 
-		context->entryPoint_Register, 
+		self->context->entryPoint_Register, 
 		self->communicator );
 	self->massMatrixForceTerm = ForceTerm_New( "massMatrixForceTerm", (FiniteElementContext*) self->context, self->massMatrix, (Swarm*)swarm, (Stg_Component*) self );
 	ForceTerm_SetAssembleElementFunction( self->massMatrixForceTerm, ParticleFeVariable_AssembleElementShapeFunc );
    
    /* Changed by PatrickSunter, 8/7/2009 - used to append onto stokesEqn-execute. However
     * this component should work for other FE systems other than the Stokes solver */
-	EP_InsertClassHookBefore( Context_GetEntryPoint( context, AbstractContext_EP_UpdateClass ), "TimeIntegrator_UpdateClass", _ParticleFeVariable_Execute, self );
+	EP_InsertClassHookBefore( Context_GetEntryPoint( self->context, AbstractContext_EP_UpdateClass ), "TimeIntegrator_UpdateClass", _ParticleFeVariable_Execute, self );
 	ParticleFeVariable_names[ParticleFeVariable_nNames++] = self->name;
 
 	self->useDeriv = False;
@@ -187,21 +187,19 @@ void* _ParticleFeVariable_Copy( void* fe
 }
 
 void _ParticleFeVariable_AssignFromXML( void* materialFeVariable, Stg_ComponentFactory* cf, void* data ){
-	ParticleFeVariable*     self            = (ParticleFeVariable*) materialFeVariable;
-	IntegrationPointsSwarm* swarm;
-	FiniteElementContext*   context;
-	FeMesh*     mesh;
+	ParticleFeVariable*		self = (ParticleFeVariable*) materialFeVariable;
+	IntegrationPointsSwarm*	swarm;
+	FiniteElementContext*	context;
+	FeMesh*						mesh;
+
+	_FieldVariable_AssignFromXML( self, cf, data );
 
 	swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", IntegrationPointsSwarm, True, data );
 	context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", FiniteElementContext, False, data );
-	if( !context )
-		context = Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
 	mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Mesh", FeMesh, True, data );
 
-	/* Construct Parent */
-	_FieldVariable_AssignFromXML( self, cf, data );
 	_FeVariable_Init( (FeVariable*)self, mesh, NULL, NULL, NULL, NULL, NULL, NULL, False, False );
-	_ParticleFeVariable_Init( self, swarm, context );
+	_ParticleFeVariable_Init( self, swarm );
 }
 
 void _ParticleFeVariable_Build( void* materialFeVariable, void* data ) {
diff -r de1e9fae44d9 -r 622153e57368 MaterialPoints/src/ParticleFeVariable.h
--- a/MaterialPoints/src/ParticleFeVariable.h	Tue Nov 17 17:24:43 2009 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.h	Wed Nov 18 12:20:16 2009 +1100
@@ -99,7 +99,7 @@
 		ParticleFeVariable_ValueAtParticleFunction*       _valueAtParticle,
 		Name                                              name );
 	
-	void _ParticleFeVariable_Init( ParticleFeVariable* self, IntegrationPointsSwarm* swarm, FiniteElementContext* context );
+	void _ParticleFeVariable_Init( ParticleFeVariable* self, IntegrationPointsSwarm* swarm );
 	
 	void _ParticleFeVariable_Delete( void* variable );
 
diff -r de1e9fae44d9 -r 622153e57368 MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c	Tue Nov 17 17:24:43 2009 +1100
+++ b/MaterialPoints/src/SwarmVariableField.c	Wed Nov 18 12:20:16 2009 +1100
@@ -162,27 +162,25 @@ void* _SwarmVariableField_DefaultNew( Na
 }
 
 void _SwarmVariableField_AssignFromXML( void* swarmVariableField, Stg_ComponentFactory* cf, void* data ) {
-	SwarmVariableField*     	self		= (SwarmVariableField*)swarmVariableField;
-	SwarmVariable*			swarmVar;
-	IntegrationPointsSwarm* 	integrationSwarm;
+	SwarmVariableField*		self = (SwarmVariableField*)swarmVariableField;
+	SwarmVariable*				swarmVar;
+	IntegrationPointsSwarm*	integrationSwarm;
 	Variable_Register*		variable_Register;
 
+	_ParticleFeVariable_AssignFromXML( self, cf, data );
+
 	variable_Register = self->context->variable_Register; 
-
-	/* Construct Parent */
-	_ParticleFeVariable_AssignFromXML( self, cf, data );
 
 	// TODO: just get the textual name here - see gLucifer's SwarmPlotter DrawignObject 
 	self->swarmVarName = Stg_ComponentFactory_GetString( cf, self->name, "swarmVariable", "" );
 	assert( swarmVar );
 
 	self->materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "MaterialSwarm", MaterialPointsSwarm, True, data );
-
 	integrationSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", IntegrationPointsSwarm, True, NULL );
 	assert( integrationSwarm );
 
 	_SwarmVariableField_Init( self, swarmVar, variable_Register );
-	_ParticleFeVariable_Init( self, integrationSwarm, self->context );
+	_ParticleFeVariable_Init( self, integrationSwarm );
 }
 
 void _SwarmVariableField_Build( void* swarmVariableField, void* data ) {