[cig-commits] commit: Cleaned-up a lot of compile-warnings.
Mercurial
hg at geodynamics.org
Mon Feb 1 15:31:54 PST 2010
changeset: 380:41661372a1fc
user: JericoRevote
date: Wed Jan 13 21:01:30 2010 +1100
files: Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c MaterialPoints/src/CoincidentMapper.c MaterialPoints/src/Finalise.c MaterialPoints/src/GaussCoincidentMapper.c MaterialPoints/src/Init.c MaterialPoints/src/IntegrationPointMapper.c MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/ManyToOneMapper.c MaterialPoints/src/Material.c MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/MaterialPointsSwarm.c MaterialPoints/src/Materials_Register.c MaterialPoints/src/OneToManyMapper.c MaterialPoints/src/OneToOneMapper.c MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/PeriodicBoundariesManager.c MaterialPoints/src/SwarmAdvectionInAPlane.c MaterialPoints/src/SwarmAdvector.c MaterialPoints/src/SwarmVariableField.c MaterialPoints/tests/AdvectionSuite.c MaterialPoints/tests/MaterialComponentsSuite.c MaterialPoints/tests/MaterialFeVariableSuite.c MaterialPoints/tests/PeriodicBoundariesManagerSuite.c PopulationControl/src/EscapedRoutine.c PopulationControl/src/Finalise.c PopulationControl/src/Init.c PopulationControl/tests/EscapedRoutineSuite.c SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Utils/src/BuoyancyForceTerm.c Utils/src/BuoyancyForceTermThermoChem.c Utils/src/DiffusionSMT.c Utils/src/Finalise.c Utils/src/Init.c Utils/src/PCDVC.c Utils/tests/PCDVCSuite.c Weights/src/DVCWeights.c Weights/src/Finalise.c Weights/src/Init.c Weights/src/IterativeWeights.c Weights/src/MomentBalanceWeights.c Weights/src/VolumeWeights.c Weights/src/WeightsCalculator.c Weights/tests/ConstantWeightsSuite.c Weights/tests/DVCWeightsSuite.c Weights/tests/IterativeWeightsSuite.c Weights/tests/MomentBalanceWeightsSuite.c libPICellerator/Toolbox/Toolbox.c libPICellerator/src/Finalise.c libPICellerator/src/Init.c libPICellerator/tests/LibPICelleratorSuite.c plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c plugins/Output/MaterialCentroid/MaterialCentroid.c
description:
Cleaned-up a lot of compile-warnings.
diff -r 3a2d89521cec -r 41661372a1fc Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c
--- a/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Wed Jan 13 21:01:30 2010 +1100
@@ -1727,12 +1727,12 @@ void _AnalyticBlock_AssignFromXML( void*
_AnalyticSolution_AssignFromXML( self, cf, data );
/* Create Analytic Fields */
- self->velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
- self->pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
+ self->velocityField = Stg_ComponentFactory_ConstructByName( cf, (Name)"VelocityField", FeVariable, True, data );
+ self->pressureField = Stg_ComponentFactory_ConstructByName( cf, (Name)"PressureField", FeVariable, True, data );
- self->startBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, "startBlockX", 0.0 );
- self->endBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, "endBlockX", 0.0 );
- self->startBlockY = Stg_ComponentFactory_GetRootDictDouble( cf, "startBlockY", 0.0 );
+ self->startBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"startBlockX", 0.0 );
+ self->endBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"endBlockX", 0.0 );
+ self->startBlockY = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"startBlockY", 0.0 );
}
void _AnalyticBlock_Build( void* analyticSolution, void* data ) {
@@ -1769,7 +1769,7 @@ void* _AnalyticBlock_DefaultNew( Name na
}
Index _PICellerator_AnalyticBlock_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, AnalyticBlock_Type, "0", _AnalyticBlock_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, AnalyticBlock_Type, (Name)"0", _AnalyticBlock_DefaultNew );
}
diff -r 3a2d89521cec -r 41661372a1fc Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c
--- a/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Wed Jan 13 21:01:30 2010 +1100
@@ -301,16 +301,16 @@ void _AnalyticColumn_AssignFromXML( void
_AnalyticSolution_AssignFromXML( self, cf, data );
/* Create Analytic Fields */
- self->velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
- self->pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
+ self->velocityField = Stg_ComponentFactory_ConstructByName( cf, (Name)"VelocityField", FeVariable, True, data );
+ self->pressureField = Stg_ComponentFactory_ConstructByName( cf, (Name)"PressureField", FeVariable, True, data );
- self->dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 0 );
- self->startColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, "startColumnX", 0.0 );
- self->endColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, "endColumnX", 0.0 );
- self->startColumnZ = Stg_ComponentFactory_GetRootDictDouble( cf, "startColumnZ", 0.0 );
- self->endColumnZ = Stg_ComponentFactory_GetRootDictDouble( cf, "endColumnZ", 0.0 );
- self->viscosity = Stg_ComponentFactory_GetRootDictDouble( cf, "viscosity", 1.0 );
- self->sigma = Stg_ComponentFactory_GetRootDictDouble( cf, "sigma", 1.0 );
+ self->dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dim", 0 );
+ self->startColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"startColumnX", 0.0 );
+ self->endColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"endColumnX", 0.0 );
+ self->startColumnZ = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"startColumnZ", 0.0 );
+ self->endColumnZ = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"endColumnZ", 0.0 );
+ self->viscosity = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"viscosity", 1.0 );
+ self->sigma = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"sigma", 1.0 );
}
void _AnalyticColumn_Build( void* analyticSolution, void* data ) {
@@ -347,7 +347,7 @@ void* _AnalyticColumn_DefaultNew( Name n
}
Index _PICellerator_AnalyticColumn_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, AnalyticColumn_Type, "0", _AnalyticColumn_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, AnalyticColumn_Type, (Name)"0", _AnalyticColumn_DefaultNew );
}
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/CoincidentMapper.c
--- a/MaterialPoints/src/CoincidentMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/CoincidentMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -168,7 +168,7 @@ void _CoincidentMapper_Map( void* mapper
#ifdef CAUTIOUS
Index dim_I;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
#endif
Stream* debugStream = Swarm_Debug;
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/Finalise.c
--- a/MaterialPoints/src/Finalise.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/Finalise.c Wed Jan 13 21:01:30 2010 +1100
@@ -53,7 +53,7 @@
#include <stdio.h>
Bool PICellerator_MaterialPoints_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/GaussCoincidentMapper.c
--- a/MaterialPoints/src/GaussCoincidentMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/GaussCoincidentMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -174,7 +174,7 @@ void _GaussCoincidentMapper_Map( void* m
#ifdef CAUTIOUS
Index dim_I;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
#endif
Stream* debugStream = Swarm_Debug;
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/Init.c
--- a/MaterialPoints/src/Init.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/Init.c Wed Jan 13 21:01:30 2010 +1100
@@ -56,29 +56,29 @@ Bool PICellerator_MaterialPoints_Init( i
Bool PICellerator_MaterialPoints_Init( int* argc, char** argv[] ) {
Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, PICelleratorContext_Type, "0", _PICelleratorContext_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PICelleratorContext_Type, (Name)"0", _PICelleratorContext_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, BackgroundParticleLayout_Type, "0", _BackgroundParticleLayout_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, BackgroundParticleLayout_Type, (Name)"0", _BackgroundParticleLayout_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, MappedParticleLayout_Type, "0", _MappedParticleLayout_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, IntegrationPointsSwarm_Type, "0", _IntegrationPointsSwarm_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, MaterialPointsSwarm_Type, "0", _MaterialPointsSwarm_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, MappedParticleLayout_Type, (Name)"0", _MappedParticleLayout_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, IntegrationPointsSwarm_Type, (Name)"0", _IntegrationPointsSwarm_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, MaterialPointsSwarm_Type, (Name)"0", _MaterialPointsSwarm_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, MaterialFeVariable_Type, "0", _MaterialFeVariable_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, Material_Type, "0", _Material_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, MaterialFeVariable_Type, (Name)"0", _MaterialFeVariable_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, Material_Type, (Name)"0", _Material_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, CoincidentMapper_Type, "0", _CoincidentMapper_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, GaussCoincidentMapper_Type, "0", _GaussCoincidentMapper_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, GaussMapper_Type, "0", _GaussMapper_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, CoincidentMapper_Type, (Name)"0", _CoincidentMapper_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, GaussCoincidentMapper_Type, (Name)"0", _GaussCoincidentMapper_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, GaussMapper_Type, (Name)"0", _GaussMapper_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, SwarmAdvector_Type, "0", _SwarmAdvector_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, SwarmAdvectionInAPlane_Type, "0", _SwarmAdvectionInAPlane_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmAdvector_Type, (Name)"0", _SwarmAdvector_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmAdvectionInAPlane_Type, (Name)"0", _SwarmAdvectionInAPlane_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, PeriodicBoundariesManager_Type,"0", _PeriodicBoundariesManager_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PeriodicBoundariesManager_Type, (Name)"0", _PeriodicBoundariesManager_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, SwarmVariableField_Type,"0", _SwarmVariableField_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmVariableField_Type, (Name)"0", _SwarmVariableField_DefaultNew );
/* Doing this in alphabetical order to match ls output */
RegisterParent( BackgroundParticleLayout_Type, ParticleLayout_Type );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/IntegrationPointMapper.c
--- a/MaterialPoints/src/IntegrationPointMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/IntegrationPointMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -113,17 +113,11 @@ void _IntegrationPointMapper_AssignFromX
IntegrationPointsSwarm* integrationSwarm;
PICelleratorContext* context;
- context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", PICelleratorContext, False, data );
- if( !context )
- context = Stg_ComponentFactory_ConstructByName( cf, "context", PICelleratorContext, True, data );
+ context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", PICelleratorContext, False, data );
+ if( !context )
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", PICelleratorContext, True, data );
- integrationSwarm = Stg_ComponentFactory_ConstructByKey(
- cf,
- self->name,
- IntegrationPointsSwarm_Type,
- IntegrationPointsSwarm,
- True,
- data );
+ integrationSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)IntegrationPointsSwarm_Type, IntegrationPointsSwarm, True, data );
_IntegrationPointMapper_Init( self, context, integrationSwarm );
}
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c Wed Jan 13 21:01:30 2010 +1100
@@ -179,11 +179,11 @@ void _IntegrationPointsSwarm_AssignFromX
/* This will also call _Swarm_Init */
_Swarm_AssignFromXML( self, cf, data );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FeMesh", FeMesh, True, data );
- timeIntegrator = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TimeIntegrator", TimeIntegrator, True, data );
- weights = Stg_ComponentFactory_ConstructByKey( cf, self->name, "WeightsCalculator", WeightsCalculator, False, data );
- mapper = Stg_ComponentFactory_ConstructByKey( cf, self->name, "IntegrationPointMapper", IntegrationPointMapper, True, data );
- recalculateWeights = Stg_ComponentFactory_GetBool( cf, self->name, "recalculateWeights", True );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"FeMesh", FeMesh, True, data );
+ timeIntegrator = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"TimeIntegrator", TimeIntegrator, True, data );
+ weights = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"WeightsCalculator", WeightsCalculator, False, data );
+ mapper = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"IntegrationPointMapper", IntegrationPointMapper, True, data );
+ recalculateWeights = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"recalculateWeights", True );
Journal_Firewall (
weights != NULL ||
@@ -234,19 +234,13 @@ void _IntegrationPointsSwarm_Init(
-- PatrickSunter 12 June 2006 */
self->isSwarmTypeToCheckPointAndReload = False;
- self->weightVariable = Swarm_NewScalarVariable(
- self,
- "Weight",
- GetOffsetOfMember( particle , weight ),
+ self->weightVariable = Swarm_NewScalarVariable( self, (Name)"Weight", GetOffsetOfMember( particle , weight ),
Variable_DataType_Double );
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->weightVariable );
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->weightVariable->variable );
- self->localCoordVariable = Swarm_NewVectorVariable(
- self,
- "LocalElCoord",
- GetOffsetOfMember( localParticle , xi ),
+ self->localCoordVariable = Swarm_NewVectorVariable( self, (Name)"LocalElCoord", GetOffsetOfMember( localParticle , xi ),
Variable_DataType_Double,
self->dim,
"Xi",
@@ -433,7 +427,7 @@ void IntegrationPointsSwarm_RemapIntegra
Journal_DPrintf( self->debug, "...weights updating finished - took %g secs.\n", weightsUpdateTime );
}
else {
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
Journal_Firewall( Stg_Class_IsInstance( self->mapper, GaussMapper_Type ) ||
Stg_Class_IsInstance( self->mapper, GaussCoincidentMapper_Type ) ||
!strcmp(self->mapper->type, "PCDVCGaussMapper"), errorStream,
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/ManyToOneMapper.c
--- a/MaterialPoints/src/ManyToOneMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/ManyToOneMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -76,7 +76,7 @@ void _ManyToOneMapper_Init( void* mapper
/* Each integration point will have a reference to a material particle (one for each swarm) */
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, False );
for ( i = 0; i < self->materialSwarmCount; ++i ) {
- ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, materialSwarms[i]->name, sizeof(MaterialPointRef) );
+ ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, (Name)materialSwarms[i]->name, sizeof(MaterialPointRef) );
}
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -129,18 +129,11 @@ void _ManyToOneMapper_AssignFromXML( voi
_IntegrationPointMapper_AssignFromXML( self, cf, data );
- materialSwarms = (MaterialPointsSwarm**)Stg_ComponentFactory_ConstructByList(
- cf,
- self->name,
- IntegrationPointsSwarm_Type,
- Stg_ComponentFactory_Unlimited,
- IntegrationPointsSwarm,
- True,
- &(self->materialSwarmCount), data );
+ materialSwarms = (MaterialPointsSwarm**)Stg_ComponentFactory_ConstructByList( cf, self->name, (Dictionary_Entry_Key)IntegrationPointsSwarm_Type, Stg_ComponentFactory_Unlimited, IntegrationPointsSwarm, True, &(self->materialSwarmCount), data );
Journal_Firewall(
self->materialSwarmCount < 1,
- Journal_Register( Error_Type, self->type ),
+ Journal_Register( Error_Type, (Name)self->type ),
"In func %s, there must be at least one swarm in the material swarm list!\n", __func__ );
_ManyToOneMapper_Init( self, materialSwarms, self->materialSwarmCount );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/Material.c Wed Jan 13 21:01:30 2010 +1100
@@ -176,12 +176,12 @@ void _Material_AssignFromXML( void* mate
Materials_Register* materials_Register;
PICelleratorContext* context;
- context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", PICelleratorContext, False, data );
- if( !context )
- context = Stg_ComponentFactory_ConstructByName( cf, "context", PICelleratorContext, True, data );
+ context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", PICelleratorContext, False, data );
+ if( !context )
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", PICelleratorContext, True, data );
materialDictionary = Dictionary_GetDictionary( cf->componentDict, self->name );
- shape = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Shape", Stg_Shape, True, data ) ;
+ shape = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Shape", Stg_Shape, True, data ) ;
materials_Register = context->materials_Register;
_Material_Init( self, context, shape, materialDictionary, materials_Register );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/MaterialFeVariable.c
--- a/MaterialPoints/src/MaterialFeVariable.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/MaterialFeVariable.c Wed Jan 13 21:01:30 2010 +1100
@@ -140,7 +140,7 @@ void _MaterialFeVariable_AssignFromXML(
MaterialFeVariable* self = (MaterialFeVariable*) materialFeVariable;
Material* material;
- material = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Material", Material, True, data );
+ material = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Material", Material, True, data );
/* Construct Parent */
_ParticleFeVariable_AssignFromXML( self, cf, data );
@@ -161,20 +161,13 @@ void _MaterialFeVariable_Build( void* ma
if ( swarm->swarmVariable_Register )
variable_Register = swarm->swarmVariable_Register->variable_Register;
- tmpName = Stg_Object_AppendSuffix( self, "DataVariable" );
+ tmpName = Stg_Object_AppendSuffix( self, (Name)"DataVariable" );
assert( Class_IsSuper( self->feMesh->topo, IGraph ) );
- self->dataVariable = Variable_NewScalar(
- tmpName,
- (AbstractContext*)self->context,
- Variable_DataType_Double,
- &((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains,
- NULL,
- (void**)&self->data,
- variable_Register );
- Memory_Free( tmpName );
+ self->dataVariable = Variable_NewScalar( tmpName, (AbstractContext*)self->context, Variable_DataType_Double, (Index*)&((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains, NULL, (void**)&self->data, variable_Register );
+ Memory_Free( tmpName );
self->fieldComponentCount = 1;
- tmpName = Stg_Object_AppendSuffix( self, "DofLayout" );
+ tmpName = Stg_Object_AppendSuffix( self, (Name)"DofLayout" );
self->dofLayout = DofLayout_New( tmpName, self->context, variable_Register, ((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains, NULL );
DofLayout_AddAllFromVariableArray( self->dofLayout, 1, &self->dataVariable );
Memory_Free( tmpName );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Wed Jan 13 21:01:30 2010 +1100
@@ -157,10 +157,7 @@ void _MaterialPointsSwarm_Init(
self->material = material;
self->materials_Register = materials_Register;
- self->particleCoordVariable = Swarm_NewVectorVariable(
- self,
- "Position",
- GetOffsetOfMember( globalParticle, coord ),
+ self->particleCoordVariable = Swarm_NewVectorVariable( self, (Name)"Position", GetOffsetOfMember( globalParticle, coord ),
Variable_DataType_Double,
self->dim,
"PositionX",
@@ -169,7 +166,7 @@ void _MaterialPointsSwarm_Init(
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->particleCoordVariable->variable );
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->particleCoordVariable );
- self->materialIndexVariable = Swarm_NewScalarVariable( self, "MaterialIndex", GetOffsetOfMember( particle , materialIndex ), Variable_DataType_Int ); /* Should be unsigned int */
+ self->materialIndexVariable = Swarm_NewScalarVariable( self, (Name)"MaterialIndex", GetOffsetOfMember( particle , materialIndex ), Variable_DataType_Int ); /* Should be unsigned int */
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->materialIndexVariable->variable );
LiveComponentRegister_Add( LiveComponentRegister_GetLiveComponentRegister(), (Stg_Component*)self->materialIndexVariable );
@@ -246,11 +243,11 @@ void _MaterialPointsSwarm_AssignFromXML(
_Swarm_AssignFromXML( self, cf, data );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FeMesh", FeMesh, True, data );
- escapedRoutine = Stg_ComponentFactory_ConstructByKey( cf, self->name, "EscapedRoutine", EscapedRoutine, False, data );
- material = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Material", Material, False, data );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"FeMesh", FeMesh, True, data );
+ escapedRoutine = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"EscapedRoutine", EscapedRoutine, False, data );
+ material = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Material", Material, False, data );
- context = (PICelleratorContext*)self->context;
+ context = (PICelleratorContext* )self->context;
assert( Stg_CheckType( context, PICelleratorContext ) );
materials_Register = context->materials_Register;
assert( materials_Register );
@@ -262,14 +259,14 @@ void _MaterialPointsSwarm_AssignFromXML(
material,
materials_Register );
- self->geomodHack = Dictionary_GetBool_WithDefault( cf->rootDict, "geomodHacks", False );
+ self->geomodHack = Dictionary_GetBool_WithDefault( cf->rootDict, (Dictionary_Entry_Key)"geomodHacks", False );
}
void _MaterialPointsSwarm_Build( void* swarm, void* data ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*) swarm;
int commHandler_I;
Bool movementCommHandlerFound = False;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
int var_I;
_Swarm_Build( self, data );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/Materials_Register.c
--- a/MaterialPoints/src/Materials_Register.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/Materials_Register.c Wed Jan 13 21:01:30 2010 +1100
@@ -125,14 +125,14 @@ ExtensionInfo_Index Materials_Register_A
for ( material_I = 0 ; material_I < Materials_Register_GetCount( self ) ; material_I++) {
material = Materials_Register_GetByIndex( self, material_I );
- result = ExtensionManager_Add( material->extensionMgr, type, extensionSize );
+ result = ExtensionManager_Add( material->extensionMgr, (Name)type, extensionSize );
- if ( material_I == 0 )
+ if ( material_I == 0 )
firstResult = result;
else {
Journal_Firewall(
firstResult == result,
- Journal_Register( Error_Type, self->type ),
+ Journal_Register( Error_Type, (Name)self->type ),
"Material '%s' has a different number of extensions than eariler materials.\n",
material->name );
}
@@ -162,7 +162,7 @@ void Materials_Register_AssignParticlePr
Particle_Index lParticle_I;
Particle_Index particleLocalCount = swarm->particleLocalCount;
Particle_Index particleGlobalCount = 0;
- Stream* stream = Journal_Register( Info_Type, self->type );
+ Stream* stream = Journal_Register( Info_Type, (Name)self->type );
Processor_Index formerStreamPrintingRank;
double setupStartTime = 0;
double setupTime = 0, tmin, tmax;
@@ -267,7 +267,7 @@ void Variable_SetValueFromDictionary( vo
Variable_SetValueShort( variable, index, Dictionary_GetUnsignedInt( dictionary, variable->name ));
break;
case Variable_DataType_Int:
- Variable_SetValueInt( variable, index, Dictionary_GetInt( dictionary, variable->name ));
+ Variable_SetValueInt( variable, index, Dictionary_GetInt( dictionary, (Dictionary_Entry_Key)variable->name ) );
break;
case Variable_DataType_Float:
Variable_SetValueFloat( variable, index, Dictionary_GetDouble( dictionary, variable->name ));
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/OneToManyMapper.c
--- a/MaterialPoints/src/OneToManyMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/OneToManyMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -72,10 +72,7 @@ void _OneToManyMapper_Init( void* mapper
self->materialSwarm = materialSwarm;
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, False );
- self->refHandle = ExtensionManager_Add(
- self->integrationSwarm->particleExtensionMgr,
- materialSwarm->name,
- sizeof(OneToManyRef) );
+ self->refHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, (Name)materialSwarm->name, sizeof(OneToManyRef) );
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -108,13 +105,7 @@ void _OneToManyMapper_AssignFromXML( voi
_IntegrationPointMapper_AssignFromXML( self, cf, data );
- materialSwarm = Stg_ComponentFactory_ConstructByKey(
- cf,
- self->name,
- MaterialPointsSwarm_Type,
- MaterialPointsSwarm,
- True,
- data );
+ materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)MaterialPointsSwarm_Type, MaterialPointsSwarm, True, data );
_OneToManyMapper_Init( self, materialSwarm );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/OneToOneMapper.c
--- a/MaterialPoints/src/OneToOneMapper.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/OneToOneMapper.c Wed Jan 13 21:01:30 2010 +1100
@@ -73,7 +73,7 @@ void _OneToOneMapper_Init( void* mapper,
self->materialSwarm = materialSwarm;
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, False );
- self->materialRefHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, materialSwarm->name, sizeof(MaterialPointRef) );
+ self->materialRefHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, (Name)materialSwarm->name, sizeof(MaterialPointRef) );
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -108,7 +108,7 @@ void _OneToOneMapper_AssignFromXML( void
_IntegrationPointMapper_AssignFromXML( self, cf, data );
- materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, MaterialPointsSwarm_Type, MaterialPointsSwarm, True, data );
+ materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)MaterialPointsSwarm_Type, MaterialPointsSwarm, True, data );
_OneToOneMapper_Init( self, materialSwarm );
}
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/ParticleFeVariable.c Wed Jan 13 21:01:30 2010 +1100
@@ -80,7 +80,7 @@ ParticleFeVariable* _ParticleFeVariable_
void _ParticleFeVariable_Init( ParticleFeVariable* self, IntegrationPointsSwarm* swarm ) {
/* Create Vector */
- self->assemblyVectorName = Stg_Object_AppendSuffix( self, "assemblyVector" );
+ self->assemblyVectorName = Stg_Object_AppendSuffix( self, (Name)"assemblyVector" );
self->assemblyVector = ForceVector_New(
self->assemblyVectorName,
(FiniteElementContext*) self->context,
@@ -90,7 +90,7 @@ void _ParticleFeVariable_Init( ParticleF
self->communicator );
self->assemblyTerm = ForceTerm_New( "assemblyTerm", (FiniteElementContext*) self->context, self->assemblyVector, (Swarm*)swarm, (Stg_Component*) self );
- self->massMatrixName = Stg_Object_AppendSuffix( self, "massMatrix" );
+ self->massMatrixName = Stg_Object_AppendSuffix( self, (Name)"massMatrix" );
self->massMatrix = ForceVector_New(
self->massMatrixName,
(FiniteElementContext*) self->context,
@@ -143,11 +143,11 @@ void _ParticleFeVariable_AssignFromXML(
_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 );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Mesh", FeMesh, True, data );
+ swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", IntegrationPointsSwarm, True, data );
+ context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", FiniteElementContext, False, data );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Mesh", FeMesh, True, data );
- _FeVariable_Init( (FeVariable*)self, mesh, NULL, NULL, NULL, NULL, NULL, NULL, False, False );
+ _FeVariable_Init( (FeVariable* )self, mesh, NULL, NULL, NULL, NULL, NULL, NULL, False, False );
_ParticleFeVariable_Init( self, swarm );
}
@@ -207,7 +207,7 @@ void _ParticleFeVariable_Execute( void*
if( ParticleFeVariable_curName >= ParticleFeVariable_nNames )
ParticleFeVariable_curName = 0;
- ParticleFeVariable_Update( LiveComponentRegister_Get( ctx->CF->LCRegister, ParticleFeVariable_names[ParticleFeVariable_curName++] ) );
+ ParticleFeVariable_Update( LiveComponentRegister_Get( ctx->CF->LCRegister, (Name)ParticleFeVariable_names[ParticleFeVariable_curName++] ) );
}
void _ParticleFeVariable_Destroy( void* materialFeVariable, void* data ) {
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/PeriodicBoundariesManager.c
--- a/MaterialPoints/src/PeriodicBoundariesManager.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/PeriodicBoundariesManager.c Wed Jan 13 21:01:30 2010 +1100
@@ -126,7 +126,7 @@ void _PeriodicBoundariesManager_Init(
self->delta = 0;
self->size = 0;
self->boundaries = NULL;
- self->debug = Journal_Register( Debug_Type, self->type );
+ self->debug = Journal_Register( Debug_Type, (Name)self->type );
}
void _PeriodicBoundariesManager_AssignFromXML( void* periodicBCsManager, Stg_ComponentFactory* cf, void* data ) {
@@ -136,13 +136,13 @@ void _PeriodicBoundariesManager_AssignFr
Swarm* swarm = NULL;
PICelleratorContext* context;
- context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", PICelleratorContext, False, data );
- if( !context )
- context = Stg_ComponentFactory_ConstructByName( cf, "context", PICelleratorContext, True, data );
+ context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", PICelleratorContext, False, data );
+ if( !context )
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", PICelleratorContext, True, data );
dictionary = Dictionary_GetDictionary( cf->componentDict, self->name );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "mesh", Mesh, True, data );
- swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", Swarm, True, data );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"mesh", Mesh, True, data );
+ swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", Swarm, True, data );
_PeriodicBoundariesManager_Init( self, context, mesh, swarm, dictionary );
}
@@ -228,7 +228,7 @@ void _PeriodicBoundariesManager_Build( v
self->boundaries = Memory_Alloc_Array( PeriodicBoundary, self->size, "PeriodicBoundariesManager->boundaries" );
if ( self->dictionary ) {
- periodicBCsList = Dictionary_Get( self->dictionary, "PeriodicBoundaries" );
+ periodicBCsList = Dictionary_Get( self->dictionary, (Dictionary_Entry_Key)"PeriodicBoundaries" );
/* Dictionary entry is optional - users may prefer to enter in code */
if ( periodicBCsList ) {
@@ -239,7 +239,7 @@ void _PeriodicBoundariesManager_Build( v
numPeriodicBCs = Dictionary_Entry_Value_GetCount( periodicBCsList );
- for ( periodicBC_I = 0; periodicBC_I < numPeriodicBCs; periodicBC_I++ ) {
+ for ( periodicBC_I = 0; periodicBC_I < numPeriodicBCs; periodicBC_I++ ) {
periodicBC = Dictionary_Entry_Value_GetElement( periodicBCsList, periodicBC_I );
perBCAxis = Dictionary_Entry_Value_AsString( periodicBC );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/SwarmAdvectionInAPlane.c
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.c Wed Jan 13 21:01:30 2010 +1100
@@ -157,7 +157,7 @@ void _SwarmAdvectionInAPlane_AssignFromX
int whichaxis;
_SwarmAdvector_AssignFromXML( self, cf, data );
/* Everything except whichaxis constructed by parent already */
- whichaxis = Stg_ComponentFactory_GetInt( cf, self->name, "whichaxis", 1 );
+ whichaxis = Stg_ComponentFactory_GetInt( cf, self->name, (Dictionary_Entry_Key)"whichaxis", 1 );
_SwarmAdvectionInAPlane_Init( self, whichaxis );
}
@@ -182,7 +182,7 @@ Bool _SwarmAdvectionInAPlane_TimeDeriv(
( self->swarm->dim == 3 && isinf(timeDeriv[2]) ) )
{
#if 0
- Journal_Printf( Journal_Register( Error_Type, self->type ),
+ Journal_Printf( Journal_Register( Error_Type, (Name)self->type ),
"Error in func '%s' for particle with index %u.\n\tPosition (%g, %g, %g)\n\tVelocity here is (%g, %g, %g)."
"\n\tInteropolation result is %u.\n",
__func__, array_I, coord[0], coord[1], coord[2],
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/SwarmAdvector.c Wed Jan 13 21:01:30 2010 +1100
@@ -214,9 +214,9 @@ void _SwarmAdvector_AssignFromXML( void*
_TimeIntegrand_AssignFromXML( self, cf, data );
- velocityField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "VelocityField", FeVariable, True, data );
- swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", MaterialPointsSwarm, True, data );
- periodicBCsManager = Stg_ComponentFactory_ConstructByKey( cf, self->name, "PeriodicBCsManager", PeriodicBoundariesManager, False, data );
+ velocityField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"VelocityField", FeVariable, True, data );
+ swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", MaterialPointsSwarm, True, data );
+ periodicBCsManager = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"PeriodicBCsManager", PeriodicBoundariesManager, False, data );
_SwarmAdvector_Init( self, velocityField, swarm, periodicBCsManager );
}
@@ -273,7 +273,7 @@ Bool _SwarmAdvector_TimeDeriv( void* swa
( self->swarm->dim == 3 && isinf(timeDeriv[2]) ) )
{
#if 0
- Journal_Printf( Journal_Register( Error_Type, self->type ),
+ Journal_Printf( Journal_Register( Error_Type, (Name)self->type ),
"Error in func '%s' for particle with index %u.\n\tPosition (%g, %g, %g)\n\tVelocity here is (%g, %g, %g)."
"\n\tInterpolation result is %s.\n",
__func__, array_I, coord[0], coord[1], coord[2],
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/src/SwarmVariableField.c Wed Jan 13 21:01:30 2010 +1100
@@ -135,11 +135,11 @@ 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, "swarmVariable", "" );
+ swarmVarName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"swarmVariable", "" );
- materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "MaterialSwarm", MaterialPointsSwarm, True, data );
- integrationSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", IntegrationPointsSwarm, True, NULL );
- assert( integrationSwarm );
+ 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 );
_SwarmVariableField_Init( self, variable_Register, swarmVarName, materialSwarm );
}
@@ -148,25 +148,19 @@ void _SwarmVariableField_Build( void* sw
SwarmVariableField* self = (SwarmVariableField*)swarmVariableField;
unsigned nDomainVerts = Mesh_GetDomainSize( self->feMesh, MT_VERTEX );
SwarmVariable_Register* swarmVar_Register = self->materialSwarm->swarmVariable_Register;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
Name tmpName;
Stg_Component_Build( self->materialSwarm, data, False );
/* make this more flexible to handle vector values at each node - will have to get the num dofs from the XML
* as other components are not necessarily built yet... dave. 03.10.07 */
assert( Class_IsSuper( self->feMesh->topo, IGraph ) );
- tmpName = Stg_Object_AppendSuffix( self, "DataVariable" );
- self->dataVariable = Variable_NewScalar( tmpName,
- (AbstractContext*)self->context,
- Variable_DataType_Double,
- &nDomainVerts,
- NULL,
- (void**)&self->data,
- self->variable_Register );
- Memory_Free( tmpName );
+ 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 );
self->fieldComponentCount = 1;
- tmpName = Stg_Object_AppendSuffix( self, "DofLayout" );
+ tmpName = Stg_Object_AppendSuffix( self, (Name)"DofLayout" );
self->dofLayout = DofLayout_New( tmpName, self->context, self->variable_Register, 0, self->feMesh );
/* must build before adding the variable to the dof layout, dave. 04.10.07 */
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/tests/AdvectionSuite.c
--- a/MaterialPoints/tests/AdvectionSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/tests/AdvectionSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -56,10 +56,10 @@ void AdvectionSuite_Teardown( AdvectionS
}
double dt( void* class, PICelleratorContext* context ) {
- return Dictionary_GetDouble_WithDefault( context->dictionary, "dt", 0.01 );
+ return Dictionary_GetDouble_WithDefault( context->dictionary, (Dictionary_Entry_Key)"dt", 0.01 );
}
-void check( PICelleratorContext* context ) {
+void check( PICelleratorContext* context ) {
MaterialPointsSwarm* materialPointsSwarm;
GlobalParticle* particle;
double* originalCoord;
@@ -83,10 +83,10 @@ void check( PICelleratorContext* context
double theta;
/* Add original pos to particle */
- materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, "materialPointsSwarm" );
+ materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPointsSwarm" );
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
- particle = (GlobalParticle*)Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
+ particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
coord = particle->coord;
originalCoord = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle, handle );
@@ -132,8 +132,8 @@ void AdvectionSuite_TestEuler( Advection
context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( filename, MPI_COMM_WORLD, context );
- matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPointsSwarm" );
- handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, CURR_MODULE_NAME, sizeof(Coord) );
+ matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPointsSwarm" );
+ handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, (Name)CURR_MODULE_NAME, sizeof(Coord) );
Stg_ComponentFactory_BuildComponents( cf, NULL );
Stg_ComponentFactory_InitialiseComponents( cf, NULL );
@@ -165,8 +165,8 @@ void AdvectionSuite_TestRK2( AdvectionSu
context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( filename, MPI_COMM_WORLD, context );
- matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPointsSwarm" );
- handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, CURR_MODULE_NAME, sizeof(Coord) );
+ matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPointsSwarm" );
+ handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, (Name)CURR_MODULE_NAME, sizeof(Coord) );
Stg_ComponentFactory_BuildComponents( cf, NULL );
Stg_ComponentFactory_InitialiseComponents( cf, NULL );
@@ -198,8 +198,8 @@ void AdvectionSuite_TestRK4( AdvectionSu
context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( filename, MPI_COMM_WORLD, context );
- matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPointsSwarm" );
- handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, CURR_MODULE_NAME, sizeof(Coord) );
+ matSwarm = (MaterialPointsSwarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPointsSwarm" );
+ handle = ExtensionManager_Add( matSwarm->particleExtensionMgr, (Name)CURR_MODULE_NAME, sizeof(Coord) );
Stg_ComponentFactory_BuildComponents( cf, NULL );
Stg_ComponentFactory_InitialiseComponents( cf, NULL );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/tests/MaterialComponentsSuite.c
--- a/MaterialPoints/tests/MaterialComponentsSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/tests/MaterialComponentsSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -180,20 +180,20 @@ void MaterialComponentsSuite_Setup( Mate
/* Set up the dictionaries, and set some sample properties for testing */
data->matDict1 = Dictionary_New();
- Dictionary_Add( data->matDict1, "testSwarm-matProp1", Dictionary_Entry_Value_FromUnsignedInt( 1 ) );
- Dictionary_Add( data->matDict1, "testSwarm-matProp2", Dictionary_Entry_Value_FromDouble( 1.1 ) );
- Dictionary_Add( data->matDict1, "testSwarm-matProp3", Dictionary_Entry_Value_FromBool( False ) );
- data->matDict2 = Dictionary_New();
- Dictionary_Add( data->matDict2, "testSwarm-matProp1", Dictionary_Entry_Value_FromUnsignedInt( 2 ) );
- Dictionary_Add( data->matDict2, "testSwarm-matProp2", Dictionary_Entry_Value_FromDouble( 2.2 ) );
- Dictionary_Add( data->matDict2, "testSwarm-matProp3", Dictionary_Entry_Value_FromBool( True ) );
- Dictionary_Add( data->matDict2, "testSwarm-matProp4", Dictionary_Entry_Value_FromBool( True ) );
+ Dictionary_Add( data->matDict1, (Dictionary_Entry_Key)"testSwarm-matProp1", Dictionary_Entry_Value_FromUnsignedInt( 1 ) );
+ Dictionary_Add( data->matDict1, (Dictionary_Entry_Key)"testSwarm-matProp2", Dictionary_Entry_Value_FromDouble( 1.1 ) );
+ Dictionary_Add( data->matDict1, (Dictionary_Entry_Key)"testSwarm-matProp3", Dictionary_Entry_Value_FromBool( False ) );
+ data->matDict2 = Dictionary_New( );
+ Dictionary_Add( data->matDict2, (Dictionary_Entry_Key)"testSwarm-matProp1", Dictionary_Entry_Value_FromUnsignedInt( 2 ) );
+ Dictionary_Add( data->matDict2, (Dictionary_Entry_Key)"testSwarm-matProp2", Dictionary_Entry_Value_FromDouble( 2.2 ) );
+ Dictionary_Add( data->matDict2, (Dictionary_Entry_Key)"testSwarm-matProp3", Dictionary_Entry_Value_FromBool( True ) );
+ Dictionary_Add( data->matDict2, (Dictionary_Entry_Key)"testSwarm-matProp4", Dictionary_Entry_Value_FromBool( True ) );
/* Now update the svRegister to match the material properties */
- data->matPropVar1 = Swarm_NewScalarVariable( data->mpSwarm, "matProp1", GetOffsetOfMember( particle , matProp1 ), Variable_DataType_Int );
- data->matPropVar2 = Swarm_NewScalarVariable( data->mpSwarm, "matProp2", GetOffsetOfMember( particle , matProp2 ), Variable_DataType_Double );
- data->matPropVar3 = Swarm_NewScalarVariable( data->mpSwarm, "matProp3", GetOffsetOfMember( particle , matProp3 ), Variable_DataType_Int );
- data->matPropVar4 = Swarm_NewScalarVariable( data->mpSwarm, "matProp4", GetOffsetOfMember( particle , matProp4 ), Variable_DataType_Int );
+ data->matPropVar1 = Swarm_NewScalarVariable( data->mpSwarm, (Name)"matProp1", GetOffsetOfMember( particle , matProp1 ), Variable_DataType_Int );
+ data->matPropVar2 = Swarm_NewScalarVariable( data->mpSwarm, (Name)"matProp2", GetOffsetOfMember( particle , matProp2 ), Variable_DataType_Double );
+ data->matPropVar3 = Swarm_NewScalarVariable( data->mpSwarm, (Name)"matProp3", GetOffsetOfMember( particle , matProp3 ), Variable_DataType_Int );
+ data->matPropVar4 = Swarm_NewScalarVariable( data->mpSwarm, (Name)"matProp4", GetOffsetOfMember( particle , matProp4 ), Variable_DataType_Int );
data->mat1 = Material_New( "mat1", NULL, data->shape1, data->matDict1, data->mRegister );
data->mat2 = Material_New( "mat2", NULL, data->shape2, data->matDict2, data->mRegister );
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/tests/MaterialFeVariableSuite.c
--- a/MaterialPoints/tests/MaterialFeVariableSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/tests/MaterialFeVariableSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -50,7 +50,7 @@ void MaterialFeVariableSuite_Setup( Mate
pcu_filename_input( "testMaterialFeVariable.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
stgMainBuildAndInitialise( data->cf );
stgMainLoop( data->cf );
@@ -72,11 +72,11 @@ void MaterialFeVariableSuite_TestVolume(
double volumeFEM;
Coord centroid;
- materialFeVariable = (MaterialFeVariable*) LiveComponentRegister_Get( data->context->CF->LCRegister, "materialFeVariable" );
- gaussSwarm = (Swarm*) LiveComponentRegister_Get( data->context->CF->LCRegister, "gaussSwarm" );
+ materialFeVariable = (MaterialFeVariable* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"materialFeVariable" );
+ gaussSwarm = (Swarm* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"gaussSwarm" );
assert(materialFeVariable);
- assert(gaussSwarm);
+ assert(gaussSwarm );
material = materialFeVariable->material;
swarm = materialFeVariable->picIntegrationPoints;
diff -r 3a2d89521cec -r 41661372a1fc MaterialPoints/tests/PeriodicBoundariesManagerSuite.c
--- a/MaterialPoints/tests/PeriodicBoundariesManagerSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/MaterialPoints/tests/PeriodicBoundariesManagerSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -67,7 +67,7 @@ void PeriodicBoundariesManagerSuite_Setu
pcu_filename_input( "testPeriodicBoundariesManager.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
stgMainBuildAndInitialise( data->cf );
- data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
}
@@ -83,12 +83,12 @@ void PeriodicBoundariesManagerSuite_Test
GlobalParticle* currParticle;
Particle_Index lParticle_I;
- swarm = (Swarm*) LiveComponentRegister_Get( data->context->CF->LCRegister, "swarm" );
- perBCsManager = (PeriodicBoundariesManager*) LiveComponentRegister_Get( data->context->CF->LCRegister, "perBCsManager" );
+ swarm = (Swarm* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"swarm" );
+ perBCsManager = (PeriodicBoundariesManager* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"perBCsManager" );
for ( timeStep=1; timeStep <= 10; timeStep++ ) {
UpdateParticlePositionsToLeft( swarm );
- for ( lParticle_I = 0; lParticle_I < swarm->particleLocalCount ; lParticle_I++ ) {
+ for ( lParticle_I = 0; lParticle_I < swarm->particleLocalCount ; lParticle_I++ ) {
PeriodicBoundariesManager_UpdateParticle( perBCsManager, lParticle_I );
}
Swarm_UpdateAllParticleOwners( swarm );
@@ -117,10 +117,10 @@ void UpdateParticlePositionsToLeft( Swar
Particle_InCellIndex cParticle_I;
GlobalParticle* currParticle;
Index dim_I;
- Stream* debugStream = Journal_Register( Debug_Type, "UpdateParticlesLeft" );
+ Stream* debugStream = Journal_Register( Debug_Type, (Name)"UpdateParticlesLeft" );
Stream_Indent( debugStream );
- for ( lCell_I=0; lCell_I < swarm->cellLocalCount; lCell_I++ ) {
+ for ( lCell_I=0; lCell_I < swarm->cellLocalCount; lCell_I++ ) {
Journal_Printf( debugStream, "Updating Particles positions in local cell %d:\n", lCell_I );
for ( cParticle_I=0; cParticle_I < swarm->cellParticleCountTbl[lCell_I]; cParticle_I++ ) {
Coord movementVector = {0,0,0};
diff -r 3a2d89521cec -r 41661372a1fc PopulationControl/src/EscapedRoutine.c
--- a/PopulationControl/src/EscapedRoutine.c Tue Jan 12 14:39:57 2010 +1100
+++ b/PopulationControl/src/EscapedRoutine.c Wed Jan 13 21:01:30 2010 +1100
@@ -114,7 +114,7 @@ void _EscapedRoutine_Init(
self->dim = dim;
self->particlesToRemoveDelta = particlesToRemoveDelta;
- self->debug = Journal_Register( Debug_Type, EscapedRoutine_Type ); /* TODO Register Child */
+ self->debug = Journal_Register( Debug_Type, (Name)EscapedRoutine_Type ); /* TODO Register Child */
self->particlesToRemoveCount = 0;
self->particlesToRemoveAlloced = 0;
}
@@ -127,7 +127,7 @@ void _EscapedRoutine_Delete( void* escap
EscapedRoutine* self = (EscapedRoutine*)escapedRoutine;
/* Delete parent */
- _Stg_Component_Delete( self );
+ _Stg_Component_Delete( self );
}
void _EscapedRoutine_Print( void* escapedRoutine, Stream* stream ) {
@@ -152,12 +152,12 @@ void _EscapedRoutine_AssignFromXML( void
Particle_Index particlesToRemoveDelta;
DomainContext* context;
- context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", DomainContext, False, data );
- if( !context )
- context = Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
+ context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", DomainContext, False, data );
+ if( !context )
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", DomainContext, True, data );
- dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 0 );
- particlesToRemoveDelta = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "particlesToRemoveDelta", 20 );
+ dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dim", 0 );
+ particlesToRemoveDelta = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"particlesToRemoveDelta", 20 );
_EscapedRoutine_Init( self, context, dim, particlesToRemoveDelta );
}
diff -r 3a2d89521cec -r 41661372a1fc PopulationControl/src/Finalise.c
--- a/PopulationControl/src/Finalise.c Tue Jan 12 14:39:57 2010 +1100
+++ b/PopulationControl/src/Finalise.c Wed Jan 13 21:01:30 2010 +1100
@@ -53,7 +53,7 @@
#include <stdio.h>
Bool PICellerator_PopulationControl_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 3a2d89521cec -r 41661372a1fc PopulationControl/src/Init.c
--- a/PopulationControl/src/Init.c Tue Jan 12 14:39:57 2010 +1100
+++ b/PopulationControl/src/Init.c Wed Jan 13 21:01:30 2010 +1100
@@ -54,9 +54,9 @@ Bool PICellerator_PopulationControl_Init
Bool PICellerator_PopulationControl_Init( int* argc, char** argv[] ) {
Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, EscapedRoutine_Type, "0", _EscapedRoutine_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, EscapedRoutine_Type, (Name)"0", _EscapedRoutine_DefaultNew );
RegisterParent( EscapedRoutine_Type, Stg_Component_Type );
return True;
diff -r 3a2d89521cec -r 41661372a1fc PopulationControl/tests/EscapedRoutineSuite.c
--- a/PopulationControl/tests/EscapedRoutineSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/PopulationControl/tests/EscapedRoutineSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -57,14 +57,14 @@ void EscapedRoutineSuite_Setup( EscapedR
pcu_filename_input( "EscapedRoutineSuite.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = (FiniteElementContext*) LiveComponentRegister_Get( data->cf->LCRegister, "context" );
- data->swarm = (Swarm*) LiveComponentRegister_Get( data->context->CF->LCRegister, "swarm" );
- data->escRoutine = (EscapedRoutine*) LiveComponentRegister_Get( data->context->CF->LCRegister, "escapedRoutine" );
+ data->context = (FiniteElementContext*) LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
+ data->swarm = (Swarm* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"swarm" );
+ data->escRoutine = (EscapedRoutine* ) LiveComponentRegister_Get( data->context->CF->LCRegister, (Name)"escapedRoutine" );
stgMainBuildAndInitialise( data->cf );
/* Use our test param to mark all the particles as not to be removed by default*/
for ( lParticle_I=0; lParticle_I < data->swarm->particleLocalCount; lParticle_I++ ) {
- ((Particle*)Swarm_ParticleAt( data->swarm, lParticle_I ))->toRemove = False;
+ ((Particle* )Swarm_ParticleAt( data->swarm, lParticle_I ))->toRemove = False;
}
}
diff -r 3a2d89521cec -r 41661372a1fc SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c
--- a/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Tue Jan 12 14:39:57 2010 +1100
+++ b/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Wed Jan 13 21:01:30 2010 +1100
@@ -64,10 +64,10 @@ void _AnalyticPressure_AssignFromXML( vo
_FieldTest_AssignFromXML( self, cf, data );
/* Create Analytic Fields */
- self->density = Stg_ComponentFactory_GetDouble( cf, "layer", "density", 0.0 );
- self->gravity = Stg_ComponentFactory_GetRootDictDouble( cf, "gravity", 0 );
- self->maxY = Stg_ComponentFactory_GetRootDictDouble( cf, "maxY", 0 );
- self->minY = Stg_ComponentFactory_GetRootDictDouble( cf, "minY", 0 );
+ self->density = Stg_ComponentFactory_GetDouble( cf, "layer", (Dictionary_Entry_Key)"density", 0.0 );
+ self->gravity = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"gravity", 0 );
+ self->maxY = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"maxY", 0 );
+ self->minY = Stg_ComponentFactory_GetRootDictDouble( cf, (Dictionary_Entry_Key)"minY", 0 );
}
void _AnalyticPressure_Build( void* _self, void* data ) {
@@ -102,7 +102,7 @@ void* _AnalyticPressure_DefaultNew( Name
}
Index PICellerator_AnalyticPressure_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, AnalyticPressure_Type, "0", _AnalyticPressure_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, AnalyticPressure_Type, (Name)"0", _AnalyticPressure_DefaultNew );
}
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/BuoyancyForceTerm.c
--- a/Utils/src/BuoyancyForceTerm.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/BuoyancyForceTerm.c Wed Jan 13 21:01:30 2010 +1100
@@ -173,26 +173,26 @@ void _BuoyancyForceTerm_AssignFromXML( v
/* Construct Parent */
_ForceTerm_AssignFromXML( self, cf, data );
- dict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( cf->componentDict, self->name ) );
- temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, False, data ) ;
- gravity = Stg_ComponentFactory_GetDouble( cf, self->name, "gravity", 0.0 );
- adjust = Stg_ComponentFactory_GetBool( cf, self->name, "adjust", False );
+ dict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( cf->componentDict, (Dictionary_Entry_Key)self->name ) );
+ temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"TemperatureField", FeVariable, False, data ) ;
+ gravity = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"gravity", 0.0 );
+ adjust = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"adjust", False );
- direcList = Dictionary_Get( dict, "gravityDirection" );
+ direcList = Dictionary_Get( dict, (Dictionary_Entry_Key)"gravityDirection" );
if( direcList ) {
- nDims = Dictionary_Entry_Value_GetCount( direcList );
+ nDims = Dictionary_Entry_Value_GetCount( direcList );
direc = AllocArray( double, nDims );
for( d_i = 0; d_i < nDims; d_i++ ) {
tmp = Dictionary_Entry_Value_GetElement( direcList, d_i );
rootKey = Dictionary_Entry_Value_AsString( tmp );
- if( !Stg_StringIsNumeric( rootKey ) )
- tmp = Dictionary_Get( cf->rootDict, rootKey );
+ if( !Stg_StringIsNumeric( (char *)rootKey ) )
+ tmp = Dictionary_Get( cf->rootDict, (Dictionary_Entry_Key)rootKey );
direc[d_i] = Dictionary_Entry_Value_AsDouble( tmp );
}
- if( nDims == 2 )
+ if( nDims == 2 )
Vec_Norm2D( direc, direc );
else
Vec_Norm3D( direc, direc );
@@ -237,8 +237,8 @@ void _BuoyancyForceTerm_Build( void* for
material = Materials_Register_GetByIndex( materials_Register, material_I );
materialExt = ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
- materialExt->density = Stg_ComponentFactory_GetDouble( cf, material->name, "density", 0.0 );
- materialExt->alpha = Stg_ComponentFactory_GetDouble( cf, material->name, "alpha", 0.0 );
+ materialExt->density = Stg_ComponentFactory_GetDouble( cf, material->name, (Dictionary_Entry_Key)"density", 0.0 );
+ materialExt->alpha = Stg_ComponentFactory_GetDouble( cf, material->name, (Dictionary_Entry_Key)"alpha", 0.0 );
}
/* Create Swarm Variables of each material swarm this ip swarm is mapped against */
@@ -247,7 +247,7 @@ void _BuoyancyForceTerm_Build( void* for
self->alphaSwarmVariables = Memory_Alloc_Array( MaterialSwarmVariable*, self->materialSwarmCount, "AlphaVariables" );
for ( materialSwarm_I = 0; materialSwarm_I < self->materialSwarmCount; ++materialSwarm_I ) {
- name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Density" );
+ name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], (Name)"Density" );
self->densitySwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
name,
(AbstractContext*)self->context,
@@ -258,7 +258,7 @@ void _BuoyancyForceTerm_Build( void* for
GetOffsetOfMember( *materialExt, density ) );
Memory_Free( name );
- name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Alpha" );
+ name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], (Name)"Alpha" );
self->alphaSwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
name,
(AbstractContext*)self->context,
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/BuoyancyForceTermThermoChem.c
--- a/Utils/src/BuoyancyForceTermThermoChem.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/BuoyancyForceTermThermoChem.c Wed Jan 13 21:01:30 2010 +1100
@@ -171,12 +171,12 @@ void _BuoyancyForceTermThermoChem_Assign
/* Construct Parent */
_ForceTerm_AssignFromXML( self, cf, data );
- temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, False, data ) ;
- RaT = Stg_ComponentFactory_GetDouble( cf, self->name, "RaT", 0.0 );
- RaC = Stg_ComponentFactory_GetDouble( cf, self->name, "RaC", 0.0 );
- adjust = Stg_ComponentFactory_GetBool( cf, self->name, "adjust", False );
+ temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"TemperatureField", FeVariable, False, data ) ;
+ RaT = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"RaT", 0.0 );
+ RaC = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"RaC", 0.0 );
+ adjust = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"adjust", False );
- context = (PICelleratorContext*)self->context;
+ context = (PICelleratorContext* )self->context;
assert( Stg_CheckType( context, PICelleratorContext ) );
materials_Register = context->materials_Register;
assert( materials_Register );
@@ -209,7 +209,7 @@ void _BuoyancyForceTermThermoChem_Build(
material = Materials_Register_GetByIndex( materials_Register, material_I );
materialExt = ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
- materialExt->density = Dictionary_GetDouble_WithDefault( material->dictionary, "density", 0.0 );
+ materialExt->density = Dictionary_GetDouble_WithDefault( material->dictionary, (Dictionary_Entry_Key)"density", 0.0 );
}
/* Create Swarm Variables of each material swarm this ip swarm is mapped against */
@@ -217,7 +217,7 @@ void _BuoyancyForceTermThermoChem_Build(
self->densitySwarmVariables = Memory_Alloc_Array( MaterialSwarmVariable*, self->materialSwarmCount, "DensityVariables" );
for ( materialSwarm_I = 0; materialSwarm_I < self->materialSwarmCount; ++materialSwarm_I ) {
- name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Density" );
+ name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], (Name)"Density" );
self->densitySwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
name,
(AbstractContext*) self->context,
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/DiffusionSMT.c
--- a/Utils/src/DiffusionSMT.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/DiffusionSMT.c Wed Jan 13 21:01:30 2010 +1100
@@ -175,12 +175,10 @@ void _DiffusionSMT_Build( void* matrixTe
self->materialExtHandle );
if ( cf ) {
- materialExt->diffusion = Stg_ComponentFactory_GetDouble(
- cf, material->name, "diffusivity", 0.0 );
+ materialExt->diffusion = Stg_ComponentFactory_GetDouble( cf, material->name, (Dictionary_Entry_Key)"diffusivity", 0.0 );
}
else {
- materialExt->diffusion = Dictionary_GetDouble_WithDefault(
- material->dictionary, "diffusivity", 0.0 );
+ materialExt->diffusion = Dictionary_GetDouble_WithDefault( material->dictionary, (Dictionary_Entry_Key)"diffusivity", 0.0 );
}
}
@@ -191,7 +189,7 @@ void _DiffusionSMT_Build( void* matrixTe
MaterialSwarmVariable*, self->materialSwarmCount, "DiffusionVariables");
for ( ii = 0; ii < self->materialSwarmCount; ++ii ) {
- name = Stg_Object_AppendSuffix( materialSwarms[ii], "diffusivity" );
+ name = Stg_Object_AppendSuffix( materialSwarms[ii], (Name)"diffusivity" );
self->diffusionSwarmVariables[ii] = MaterialSwarmVariable_New(
name,
(AbstractContext*) self->context,
@@ -262,7 +260,7 @@ void _DiffusionSMT_AssembleElement(
nodesPerEl = elementType->nodeCount;
/* allocate */
- GNx = Memory_Alloc_2DArray( double, dim, nodesPerEl, "GNx" );
+ GNx = Memory_Alloc_2DArray( double, dim, nodesPerEl, (Name)"GNx" );
cell_I = CellLayout_MapElementIdToCellId( swarm->cellLayout, lElement_I );
cellParticleCount = swarm->cellParticleCountTbl[ cell_I ];
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/Finalise.c
--- a/Utils/src/Finalise.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/Finalise.c Wed Jan 13 21:01:30 2010 +1100
@@ -53,7 +53,7 @@
#include <stdio.h>
Bool PICellerator_Utils_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/Init.c
--- a/Utils/src/Init.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/Init.c Wed Jan 13 21:01:30 2010 +1100
@@ -56,12 +56,12 @@ Bool PICellerator_Utils_Init( int* argc,
Bool PICellerator_Utils_Init( int* argc, char** argv[] ) {
Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, PCDVC_Type, "0", _PCDVC_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, BuoyancyForceTerm_Type, "0", _BuoyancyForceTerm_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, BuoyancyForceTermThermoChem_Type, "0", _BuoyancyForceTermThermoChem_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, DiffusionSMT_Type, "0", _DiffusionSMT_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PCDVC_Type, (Name)"0", _PCDVC_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, BuoyancyForceTerm_Type, (Name)"0", _BuoyancyForceTerm_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, BuoyancyForceTermThermoChem_Type, (Name)"0", _BuoyancyForceTermThermoChem_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, DiffusionSMT_Type, (Name)"0", _DiffusionSMT_DefaultNew );
RegisterParent( BuoyancyForceTerm_Type, ForceTerm_Type );
RegisterParent( BuoyancyForceTermThermoChem_Type, ForceTerm_Type );
diff -r 3a2d89521cec -r 41661372a1fc Utils/src/PCDVC.c
--- a/Utils/src/PCDVC.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/src/PCDVC.c Wed Jan 13 21:01:30 2010 +1100
@@ -245,24 +245,24 @@ void _PCDVC_AssignFromXML( void* pcdvc,
_DVCWeights_AssignFromXML( self, cf, data );
- materialPointsSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "MaterialPointsSwarm", MaterialPointsSwarm, True, data );
- Stream* stream = Journal_Register( Info_Type, materialPointsSwarm->type );
+ materialPointsSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"MaterialPointsSwarm", MaterialPointsSwarm, True, data );
+ Stream* stream = Journal_Register( Info_Type, (Name)materialPointsSwarm->type );
- stream = Journal_Register( Info_Type, materialPointsSwarm->type );
- upT = Stg_ComponentFactory_GetDouble( cf, self->name, "upperT", 25 );
- lowT = Stg_ComponentFactory_GetDouble( cf, self->name, "lowerT", 0.6 );
- maxD = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "maxDeletions", 2);
- maxS = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "maxSplits", 3);
- splitInInterfaceCells = Stg_ComponentFactory_GetBool( cf, self->name, "splitInInterfaceCells", False);
- deleteInInterfaceCells = Stg_ComponentFactory_GetBool( cf, self->name, "deleteInInterfaceCells", False);
- Inflow = Stg_ComponentFactory_GetBool( cf, self->name, "Inflow", False);
- Thresh = Stg_ComponentFactory_GetDouble( cf, self->name, "Threshold", 0.8 );
+ stream = Journal_Register( Info_Type, (Name)materialPointsSwarm->type );
+ upT = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"upperT", 25 );
+ lowT = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lowerT", 0.6 );
+ maxD = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"maxDeletions", 2 );
+ maxS = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"maxSplits", 3 );
+ splitInInterfaceCells = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"splitInInterfaceCells", False );
+ deleteInInterfaceCells = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"deleteInInterfaceCells", False );
+ Inflow = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"Inflow", False );
+ Thresh = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"Threshold", 0.8 );
//CentPosRatio is ratio of allowable distance of a centroid from generating particle to distance across a FEM cell.
// I think the centroid distance idea is not ideal in the end...can create some weirdness...even thought the code "works"
// after a while one can get wiggly lines in the cells...the centriods are close to the particles but its all
// centred in the FEM cell.
- CentPosRatio = Stg_ComponentFactory_GetDouble( cf, self->name, "CentPosRatio", 0.01 );
+ CentPosRatio = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"CentPosRatio", 0.01 );
// just getting the initial PPC for now...maybe could make this a separate parameter yet if needed.
ParticlesPerCell = cf->getRootDictUnsignedInt( cf, "particlesPerCell", 25);
if(upT < lowT){
@@ -317,7 +317,7 @@ MaterialPointRef* getIntParticleMaterial
IntegrationPoint* intTestParticle;
MaterialPointRef* ref;
int i;
- Stream* stream = Journal_Register( Info_Type, intSwarm->type );
+ Stream* stream = Journal_Register( Info_Type, (Name)intSwarm->type );
Journal_Printf( stream,"\n\n\e[31m\nOn Proc %d: In func %s(): WARNING!! If this function is being called, then some other module/component, somewhere, has messed up the mapping between the integration Swarm and the material Swarm\n\n", intSwarm->myRank, __func__);
Journal_Printf( stream,"This function is potentially slow. Someone should fix the offending module so that it doesn not mess up the ordering\n\n");
Journal_Printf( stream,"\e[0;32m");
@@ -793,7 +793,7 @@ void _PCDVC_Calculate3D( void* pcdvc, vo
nump_orig = nump = cParticleCount = intSwarm->cellParticleCountTbl[lCell_I];
- Journal_Firewall( nump , Journal_Register(Error_Type, "PCDVC"), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
+ Journal_Firewall( nump , Journal_Register( Error_Type, (Name)"PCDVC" ), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
dx = (BBXMAX - BBXMIN)/numx;
dy = (BBYMAX - BBYMIN)/numy;
@@ -955,7 +955,7 @@ void _PCDVC_Calculate3D( void* pcdvc, vo
free(bchain);
free(pList);
if(nump < 3){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "PCDVC"), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"PCDVC" ), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
}
// init the data structures
_DVCWeights_InitialiseStructs( &bchain, &pList, nump);
@@ -1106,7 +1106,7 @@ void _PCDVC_Calculate3D( void* pcdvc, vo
free(bchain);
free(pList);
if(nump < 3){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "PCDVC"), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"PCDVC" ), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
}
// init the data structures
_DVCWeights_InitialiseStructs( &bchain, &pList, nump);
@@ -1228,7 +1228,7 @@ void _PCDVC_Calculate2D( void* pcdvc, vo
nump_orig = nump = cParticleCount = intSwarm->cellParticleCountTbl[lCell_I];
- Journal_Firewall( nump , Journal_Register(Error_Type, "PCDVC"), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
+ Journal_Firewall( nump , Journal_Register( Error_Type, (Name)"PCDVC" ), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
dx = (BBXMAX - BBXMIN)/numx;
dy = (BBYMAX - BBYMIN)/numy;
@@ -1366,7 +1366,7 @@ void _PCDVC_Calculate2D( void* pcdvc, vo
free(pList);
//printf("\e[33mnump is now %d splitCount = %d\n",nump,splitCount);printf("\e[0;37m");
if(nump < 3){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "PCDVC"), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"PCDVC" ), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
}
// init the data structures
_DVCWeights_InitialiseStructs2D( &bchain, &pList, nump);
@@ -1521,7 +1521,7 @@ void _PCDVC_Calculate2D( void* pcdvc, vo
free(bchain);
free(pList);
if(nump < 3){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "PCDVC"), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"PCDVC" ), "Something went horribly wrong in %s: Problem has an under resolved cell (Cell Id = %d), check or tune your population control parameters\n", __func__, lCell_I );
}
particle = (IntegrationPoint**)malloc((nump)*sizeof(IntegrationPoint*));
// init the data structures
@@ -1582,7 +1582,7 @@ void _PCDVC_Calculate( void* pcdvc, void
void _PCDVC_Calculate( void* pcdvc, void* _swarm, Cell_LocalIndex lCell_I ){
Swarm* swarm = (Swarm*) _swarm;
Dimension_Index dim = swarm->dim;
- /* Stream* stream = Journal_Register( Info_Type, swarm->type ); */
+ /* Stream* stream = Journal_Register( Info_Type, (Name)swarm->type ); */
PCDVC* self = (PCDVC*) pcdvc;
/* MaterialPointsSwarm* matSwarm = (MaterialPointsSwarm*) self->materialPointsSwarm; */
/* it might be nice to report the total deletions and splits as well as the final population here */
@@ -1590,7 +1590,7 @@ void _PCDVC_Calculate( void* pcdvc, void
are being created and destroyed while maintaining some population that it has converged on */
/*
- if(lCell_I == 0){
+ if(lCell_I == 0 ){
Journal_Printf( stream, "\nOn Proc %d: In func %s(): for swarm \"%s\" Population is %d\n", swarm->myRank, __func__, swarm->name, swarm->particleLocalCount );
Journal_Printf( stream, "On Proc %d: In func %s(): for swarm \"%s\" Population is %d\n\n", matSwarm->myRank,__func__, matSwarm->name, matSwarm->particleLocalCount );
}
diff -r 3a2d89521cec -r 41661372a1fc Utils/tests/PCDVCSuite.c
--- a/Utils/tests/PCDVCSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Utils/tests/PCDVCSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -121,10 +121,10 @@ void compareAgainstReferenceSolution(PIC
}
void testElementIntegral_CircleInterface( PICelleratorContext* context, double* mean, double* standardDeviation ) {
- Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "integrationSwarm" );
- Swarm* materialSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPoints" );
- FeMesh* mesh = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
- WeightsCalculator* weights = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
+ Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"integrationSwarm" );
+ Swarm* materialSwarm = (Swarm* )LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPoints" );
+ FeMesh* mesh = (FeMesh* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"linearMesh" );
+ WeightsCalculator* weights = (WeightsCalculator* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"weights" );
FeVariable* feVariable;
Element_LocalIndex lElement_I = 0;
double analyticValue = 0.0;
@@ -184,10 +184,10 @@ void testElementIntegral_CircleInterface
}
void testElementIntegral_PolynomialFunction( PICelleratorContext* context, double* mean, double* standardDeviation ) {
- Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "integrationSwarm" );
- Swarm* materialSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPoints" );
- FeMesh* mesh = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
- WeightsCalculator* weights = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
+ Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"integrationSwarm" );
+ Swarm* materialSwarm = (Swarm* )LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPoints" );
+ FeMesh* mesh = (FeMesh* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"linearMesh" );
+ WeightsCalculator* weights = (WeightsCalculator* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"weights" );
FeVariable* feVariable;
Element_LocalIndex lElement_I = 0;
double analyticValue = 0.0;
@@ -247,10 +247,10 @@ void testElementIntegral_PolynomialFunct
}
void testElementIntegral_ExponentialInterface( PICelleratorContext* context, double* mean, double* standardDeviation ) {
- Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "integrationSwarm" );
- Swarm* materialSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPoints" );
- FeMesh* mesh = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
- WeightsCalculator* weights = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
+ Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"integrationSwarm" );
+ Swarm* materialSwarm = (Swarm* )LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPoints" );
+ FeMesh* mesh = (FeMesh* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"linearMesh" );
+ WeightsCalculator* weights = (WeightsCalculator* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"weights" );
FeVariable* feVariable;
Element_LocalIndex lElement_I = 0;
double analyticValue = 0.0;
@@ -313,7 +313,7 @@ void PCDVCSuite_Test( PCDVCSuiteData* da
PICelleratorContext* context;
Stg_ComponentFactory* cf;
char inputFile[PCU_PATH_MAX];
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
double mean;
double standardDeviation;
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/DVCWeights.c
--- a/Weights/src/DVCWeights.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/DVCWeights.c Wed Jan 13 21:01:30 2010 +1100
@@ -168,10 +168,10 @@ void _DVCWeights_AssignFromXML( void* dv
_WeightsCalculator_AssignFromXML( self, cf, data );
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 10 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 10 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
_DVCWeights_Init( self, resolution );
}
@@ -612,7 +612,7 @@ void _DVCWeights_InitialiseStructs( stru
int i;
// init the data structures
if( (*bchain = (struct chain *)malloc( nump*sizeof(struct chain ) )) == 0){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVC_Weights"), "No memory for bchain in '%s'\nCannot continue.\n", __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVC_Weights" ), "No memory for bchain in '%s'\nCannot continue.\n", __func__);
}
// note that doing bchain[i]->new... doesn't work
for(i=0;i<nump;i++){
@@ -622,7 +622,7 @@ void _DVCWeights_InitialiseStructs( stru
(*bchain)[i].new_bound_cells_malloced = DVC_INC;
}
if( (*pList = (struct particle *)malloc( nump*sizeof(struct particle ) )) == 0){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVC_Weights"),"No memory for pList in '%s'\nCannot continue.\n", __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVC_Weights" ),"No memory for pList in '%s'\nCannot continue.\n", __func__);
}
/* Initialise all particle values to zero */
@@ -639,7 +639,7 @@ void _DVCWeights_InitialiseStructs2D( st
int i;
// init the data structures
if( (*bchain = (struct chain *)malloc( nump*sizeof(struct chain ) )) == 0){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVC_Weights"),"No memory for bchain in '%s'\nCannot continue.\n", __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVC_Weights" ),"No memory for bchain in '%s'\nCannot continue.\n", __func__);
}
//
for(i=0;i<nump;i++){
@@ -649,7 +649,7 @@ void _DVCWeights_InitialiseStructs2D( st
(*bchain)[i].new_bound_cells_malloced = DVC_INC;
}
if( (*pList = (struct particle2d *)malloc( nump*sizeof(struct particle2d ) )) == 0){
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVC_Weights"),"No memory for pList in '%s'\nCannot continue.\n", __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVC_Weights" ),"No memory for pList in '%s'\nCannot continue.\n", __func__);
}
/* Initialise all particle values to zero */
@@ -784,7 +784,7 @@ void _DVCWeights_Calculate3D( void* dvcW
nump = cParticleCount = swarm->cellParticleCountTbl[lCell_I];
- Journal_Firewall( nump , Journal_Register(Error_Type, "DVC_Weights"), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
+ Journal_Firewall( nump , Journal_Register( Error_Type, (Name)"DVC_Weights" ), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
dx = (BBXMAX - BBXMIN)/numx;
dy = (BBYMAX - BBYMIN)/numy;
@@ -868,7 +868,7 @@ void _DVCWeights_Calculate2D( void* dvcW
nump = cParticleCount = swarm->cellParticleCountTbl[lCell_I];
- Journal_Firewall( nump , Journal_Register(Error_Type, "DVC_Weights"), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
+ Journal_Firewall( nump , Journal_Register( Error_Type, (Name)"DVC_Weights" ), "Error in %s: Problem has an under resolved cell (Cell Id = %d), add more particles to your model\n", __func__, lCell_I );
dx = (BBXMAX - BBXMIN)/numx;
dy = (BBYMAX - BBYMIN)/numy;
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/Finalise.c
--- a/Weights/src/Finalise.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/Finalise.c Wed Jan 13 21:01:30 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool PICellerator_Weights_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/Init.c
--- a/Weights/src/Init.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/Init.c Wed Jan 13 21:01:30 2010 +1100
@@ -54,13 +54,13 @@ Bool PICellerator_Weights_Init( int* arg
Bool PICellerator_Weights_Init( int* argc, char** argv[] ) {
Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, ConstantWeights_Type, "0", _ConstantWeights_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, VolumeWeights_Type, "0", _VolumeWeights_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, IterativeWeights_Type, "0", _IterativeWeights_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, MomentBalanceWeights_Type, "0", _MomentBalanceWeights_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, DVCWeights_Type, "0", _DVCWeights_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, ConstantWeights_Type, (Name)"0", _ConstantWeights_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, VolumeWeights_Type, (Name)"0", _VolumeWeights_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, IterativeWeights_Type, (Name)"0", _IterativeWeights_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, MomentBalanceWeights_Type, (Name)"0", _MomentBalanceWeights_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, DVCWeights_Type, (Name)"0", _DVCWeights_DefaultNew );
RegisterParent( WeightsCalculator_Type, Stg_Component_Type );
RegisterParent( ConstantWeights_Type, WeightsCalculator_Type );
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/IterativeWeights.c
--- a/Weights/src/IterativeWeights.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/IterativeWeights.c Wed Jan 13 21:01:30 2010 +1100
@@ -98,7 +98,7 @@ void _IterativeWeights_Init( void* itera
self->tolerance = tolerance;
self->alpha = alpha;
- Journal_Firewall( self->dim == 2, Journal_Register( Error_Type, self->type ), "%s only works in 2D.\n", self->type );
+ Journal_Firewall( self->dim == 2, Journal_Register( Error_Type, (Name)self->type ), "%s only works in 2D.\n", self->type );
}
/*------------------------------------------------------------------------------------------------------------------------
@@ -162,11 +162,11 @@ void _IterativeWeights_AssignFromXML( vo
_ConstantWeights_AssignFromXML( self, cf, data );
- initialWeights = Stg_ComponentFactory_ConstructByKey( cf, self->name, "InitialWeights", WeightsCalculator, False, data );
+ initialWeights = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"InitialWeights", WeightsCalculator, False, data );
- maxIterations = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "maxIterations", 10 );
- tolerance = Stg_ComponentFactory_GetDouble( cf, self->name, "tolerance", 0.01 );
- alpha = Stg_ComponentFactory_GetDouble( cf, self->name, "alpha", 0.8 ); /* 0.8 is default in Dufour p. 65 */
+ maxIterations = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"maxIterations", 10 );
+ tolerance = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"tolerance", 0.01 );
+ alpha = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"alpha", 0.8 ); /* 0.8 is default in Dufour p. 65 */
_IterativeWeights_Init( self, initialWeights, maxIterations, tolerance, alpha );
}
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/MomentBalanceWeights.c
--- a/Weights/src/MomentBalanceWeights.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/MomentBalanceWeights.c Wed Jan 13 21:01:30 2010 +1100
@@ -100,7 +100,7 @@ void _MomentBalanceWeights_Init( void* m
self->freeBackupWeights = True;
}
- Journal_Firewall( self->dim == 2, Journal_Register( Error_Type, self->type ), "%s only works in 2D.\n", self->type );
+ Journal_Firewall( self->dim == 2, Journal_Register( Error_Type, (Name)self->type ), "%s only works in 2D.\n", self->type );
}
@@ -156,7 +156,7 @@ void _MomentBalanceWeights_AssignFromXML
_WeightsCalculator_AssignFromXML( self, cf, data );
- backupWeights = Stg_ComponentFactory_ConstructByKey( cf, self->name, "BackupWeights", WeightsCalculator, False, data );
+ backupWeights = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"BackupWeights", WeightsCalculator, False, data );
_MomentBalanceWeights_Init( self, backupWeights );
}
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/VolumeWeights.c
--- a/Weights/src/VolumeWeights.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/VolumeWeights.c Wed Jan 13 21:01:30 2010 +1100
@@ -131,8 +131,8 @@ void _VolumeWeights_AssignFromXML( void*
_WeightsCalculator_AssignFromXML( self, cf, data );
- shape = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Shape", Stg_Shape, True, data );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Mesh", FeMesh, True, data );
+ shape = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Shape", Stg_Shape, True, data );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Mesh", FeMesh, True, data );
/*
Journal_Firewall(
Stg_Class_IsInstance( shape, Sphere_Type ),
@@ -199,7 +199,7 @@ void _VolumeWeights_Calculate( void* wei
** NOTE: Big assumption that the mesh is regular.
*/
vertGrid = *(Grid**)ExtensionManager_Get( self->mesh->info, self->mesh,
- ExtensionManager_GetHandle( self->mesh->info, "vertexGrid" ) );
+ ExtensionManager_GetHandle( self->mesh->info, (Name)"vertexGrid" ) );
dx = 1.0 / (double)(vertGrid->sizes[0] - 1); /* size of an element */
dy = 1.0 / (double)(vertGrid->sizes[1] - 1);
@@ -212,7 +212,7 @@ void _VolumeWeights_Calculate( void* wei
/* (V / np) * 4 / ( dx * dy * dz ) */
/* Where 4 in the value of cellLocalVolume in 2D */
- weight = (volume / (double)numberOfParticles) * ( self->cellLocalVolume / ( dx * dy * dz ) );
+ weight = (volume / (double)numberOfParticles) * ( self->cellLocalVolume / ( dx * dy * dz ) );
WeightsCalculator_SetWeightsValueAllInCell( self, swarm, lCell_I, weight );
}
diff -r 3a2d89521cec -r 41661372a1fc Weights/src/WeightsCalculator.c
--- a/Weights/src/WeightsCalculator.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/src/WeightsCalculator.c Wed Jan 13 21:01:30 2010 +1100
@@ -120,11 +120,11 @@ void _WeightsCalculator_AssignFromXML( v
WeightsCalculator* self = (WeightsCalculator*) weightsCalculator;
Dimension_Index dim;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", FiniteElementContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", FiniteElementContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", FiniteElementContext, True, data );
- dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 0 );
+ dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dim", 0 );
_WeightsCalculator_Init( self, dim );
}
@@ -176,7 +176,7 @@ void WeightsCalculator_CalculateAll( voi
double nextCompletionRatioToPrint=0;
Cell_Index nextCompletedCellCountToPrint=0;
Cell_Index nextPlusOneCompletedCellCountToPrint=0;
- Stream* stream = Journal_Register( Info_Type, self->type );
+ Stream* stream = Journal_Register( Info_Type, (Name)self->type );
Processor_Index formerStreamPrintingRank = 0;
Journal_RPrintf( stream, "In func %s(): for swarm \"%s\"\n", __func__, swarm->name );
@@ -364,7 +364,7 @@ double WeightsCalculator_TestConstraintO
Stream_UnIndent( swarm->debug );
Journal_Firewall( dim == 2 ? constraintCount == order + 1 : constraintCount*2 == (order + 1)*(order + 2) ,
- Journal_Register( Error_Type, swarm->type ),
+ Journal_Register( Error_Type, (Name)swarm->type ),
"In func %s: Number of constraints %u incorrect for dimension %u which should be %u\n",
__func__ , dim == 2 ? order + 1 : (order + 1)*(order + 2)/2 );
@@ -449,7 +449,7 @@ void WeightsCalculator_CheckEmptyCell( v
Particle_InCellIndex cParticleCount = swarm->cellParticleCountTbl[lCell_I];
if ( cParticleCount == 0 ) {
- Journal_Firewall( cParticleCount, Journal_Register( Error_Type, self->type ),
+ Journal_Firewall( cParticleCount, Journal_Register( Error_Type, (Name)self->type ),
"Error in func '%s' for %s '%s' and %s '%s' - Cell %u has no particles.\n"
"You must either add more initial particles or add population control.\n",
__func__, self->type, self->name, swarm->type, swarm->name, lCell_I );
diff -r 3a2d89521cec -r 41661372a1fc Weights/tests/ConstantWeightsSuite.c
--- a/Weights/tests/ConstantWeightsSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/tests/ConstantWeightsSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -92,10 +92,10 @@ void WeightsSuite_TestElementIntegral(
double expectedMean,
double expectedStdDev )
{
- Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "integrationSwarm" );
- Swarm* materialSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPoints" );
- FeMesh* mesh = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
- WeightsCalculator* weights = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
+ Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, (Name)"integrationSwarm" );
+ Swarm* materialSwarm = (Swarm* )LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialPoints" );
+ FeMesh* mesh = (FeMesh* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"linearMesh" );
+ WeightsCalculator* weights = (WeightsCalculator* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"weights" );
FeVariable* feVariable;
Element_LocalIndex lElement_I = 0;
double analyticValue = 0.0;
@@ -128,7 +128,7 @@ void WeightsSuite_TestElementIntegral(
MPI_COMM_WORLD,
context->fieldVariable_Register );
- Journal_Firewall( (funcName!=NULL), Journal_Register( Error_Type, "ConstantWeightsSuite" ),
+ Journal_Firewall( (funcName!=NULL), Journal_Register( Error_Type, (Name)"ConstantWeightsSuite" ),
"Error, function name input to %s is NULL", __func__ );
if ( strcasecmp( funcName, "ShapeFunction" ) == 0 ) {
@@ -166,7 +166,7 @@ void WeightsSuite_TestElementIntegral(
}
else
Journal_Firewall( False,
- Journal_Register( Error_Type, "ConstantWeightsSuite" ),
+ Journal_Register( Error_Type, (Name)"ConstantWeightsSuite" ),
"Cannot understand function name '%s'\n", funcName );
for ( loop_I = 0 ; loop_I < count ; loop_I++ ) {
@@ -204,7 +204,7 @@ void ConstantWeightsSuite_Setup( Constan
pcu_filename_input( "testConstantWeights.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
// Stg_ComponentFactory_BuildComponents( data->cf, NULL );
stgMainBuildAndInitialise( data->cf );
diff -r 3a2d89521cec -r 41661372a1fc Weights/tests/DVCWeightsSuite.c
--- a/Weights/tests/DVCWeightsSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/tests/DVCWeightsSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -124,7 +124,7 @@ void DVCWeightsSuite_TestConstructGrid(
fp=fopen(expectedGridFilename,"r");
if(!fp){
pcu_check_true(0);
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVCWeightsSuite_TestConstructGrid"),"expected test File %s Not Found in function %s\n" ,expectedGridFilename, __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVCWeightsSuite_TestConstructGrid" ),"expected test File %s Not Found in function %s\n" ,expectedGridFilename, __func__);
}
else{
/* Print out the grid */
@@ -279,7 +279,7 @@ void DVCWeightsSuite_TestGetCentroids( D
fp=fopen(expectedCentroidsFilename,"r");
if(!fp){
pcu_check_true(0);
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVCWeightsSuite_TestGetCentroids"),"expected test File %s Not Found in function %s\n" ,expectedCentroidsFilename, __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVCWeightsSuite_TestGetCentroids" ),"expected test File %s Not Found in function %s\n" ,expectedCentroidsFilename, __func__);
}
else{
for (i = 0; i < data->nump; i++) {
@@ -346,7 +346,7 @@ void DVCWeightsSuite_TestConstructGrid2D
fp=fopen(expectedGridFilename,"r");
if(!fp){
pcu_check_true(0);
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVCWeightsSuite_TestConstructGrid2D"),"expected test File %s Not Found in function %s\n" ,expectedGridFilename, __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVCWeightsSuite_TestConstructGrid2D" ),"expected test File %s Not Found in function %s\n" ,expectedGridFilename, __func__);
}
else{
/* Print out the grid */
@@ -480,7 +480,7 @@ void DVCWeightsSuite_TestGetCentroids2D(
fp=fopen(expectedCentroidsFilename,"r");
if(!fp){
pcu_check_true(0);
- Journal_Firewall( 0 , Journal_Register(Error_Type, "DVCWeightsSuite_TestGetCentroids2D"),"expected test File %s Not Found in function %s\n" ,expectedCentroidsFilename, __func__);
+ Journal_Firewall( 0 , Journal_Register( Error_Type, (Name)"DVCWeightsSuite_TestGetCentroids2D" ),"expected test File %s Not Found in function %s\n" ,expectedCentroidsFilename, __func__);
}
else{
diff -r 3a2d89521cec -r 41661372a1fc Weights/tests/IterativeWeightsSuite.c
--- a/Weights/tests/IterativeWeightsSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/tests/IterativeWeightsSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -52,7 +52,7 @@ void IterativeWeightsSuite_Setup( Iterat
pcu_filename_input( "testIterativeWeights.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
stgMainBuildAndInitialise( data->cf );
}
@@ -61,7 +61,7 @@ void IterativeWeightsSuite_Teardown( Ite
stgMainDestroy( data->cf );
}
-void IterativeWeightsSuite_TestConstantFunction( IterativeWeightsSuiteData* data ) {
+void IterativeWeightsSuite_TestConstantFunction( IterativeWeightsSuiteData* data ) {
WeightsSuite_TestElementIntegral( data->context, "ConstantFunction", 1000,
1e-10, /* --mean-tolerance */
1e-10, /* --standardDeviation-tolerance */
diff -r 3a2d89521cec -r 41661372a1fc Weights/tests/MomentBalanceWeightsSuite.c
--- a/Weights/tests/MomentBalanceWeightsSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/Weights/tests/MomentBalanceWeightsSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -51,7 +51,7 @@ void MomentBalanceWeightsSuite_Setup( Mo
pcu_filename_input( "testMomentBalanceWeights.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = (PICelleratorContext*) LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*) LiveComponentRegister_Get( data->cf->LCRegister, (Name)"context" );
stgMainBuildAndInitialise( data->cf );
}
@@ -59,7 +59,7 @@ void MomentBalanceWeightsSuite_Teardown(
stgMainDestroy( data->cf );
}
-void MomentBalanceWeightsSuite_TestConstantFunction( MomentBalanceWeightsSuiteData* data ) {
+void MomentBalanceWeightsSuite_TestConstantFunction( MomentBalanceWeightsSuiteData* data ) {
WeightsSuite_TestElementIntegral( data->context, "ConstantFunction", 1000,
1e-10, /* --mean-tolerance */
1e-10, /* --standardDeviation-tolerance */
diff -r 3a2d89521cec -r 41661372a1fc libPICellerator/Toolbox/Toolbox.c
--- a/libPICellerator/Toolbox/Toolbox.c Tue Jan 12 14:39:57 2010 +1100
+++ b/libPICellerator/Toolbox/Toolbox.c Wed Jan 13 21:01:30 2010 +1100
@@ -71,11 +71,11 @@ void PICellerator_Toolbox_Finalise( Plug
void PICellerator_Toolbox_Finalise( PluginsManager* pluginsManager ) {
PICellerator_Finalise();
- Journal_RPrintf( Journal_Register( Info_Type, PICellerator_Toolbox_Type ), "Finalised: PICellerator Toolbox.\n" );
+ Journal_RPrintf( Journal_Register( Info_Type, (Name)PICellerator_Toolbox_Type ), "Finalised: PICellerator Toolbox.\n" );
}
Index PICellerator_Toolbox_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, PICellerator_Toolbox_Type, "0", _PICellerator_Toolbox_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, PICellerator_Toolbox_Type, (Name)"0", _PICellerator_Toolbox_DefaultNew );
}
diff -r 3a2d89521cec -r 41661372a1fc libPICellerator/src/Finalise.c
--- a/libPICellerator/src/Finalise.c Tue Jan 12 14:39:57 2010 +1100
+++ b/libPICellerator/src/Finalise.c Wed Jan 13 21:01:30 2010 +1100
@@ -53,7 +53,7 @@
Bool PICellerator_Finalise( void ) {
if( ToolboxesManager_IsInitialised( stgToolboxesManager, "PICellerator" ) ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
PICellerator_Utils_Finalise();
PICellerator_MaterialPoints_Finalise();
diff -r 3a2d89521cec -r 41661372a1fc libPICellerator/src/Init.c
--- a/libPICellerator/src/Init.c Tue Jan 12 14:39:57 2010 +1100
+++ b/libPICellerator/src/Init.c Wed Jan 13 21:01:30 2010 +1100
@@ -65,14 +65,14 @@ Bool PICellerator_Init( int* argc, char*
PICellerator_MaterialPoints_Init( argc, argv );
PICellerator_Utils_Init( argc, argv );
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ) );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ), 0 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
- Journal_Register( InfoStream_Type, "Context" ),
+ Journal_Register( InfoStream_Type, (Name)"Context" ),
"Particle-In-Cellerator (FEM/PIC framework) revision %s. Copyright (C) 2005 VPAC & Monash Cluster Computing.\n", VERSION );
- Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
+ Stream_Flush( Journal_Register( InfoStream_Type, (Name)"Context" ) );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ), tmp );
/* Add the PICellerator path to the global xml path dictionary */
directory = Memory_Alloc_Array( char, 200, "xmlDirectory" ) ;
diff -r 3a2d89521cec -r 41661372a1fc libPICellerator/tests/LibPICelleratorSuite.c
--- a/libPICellerator/tests/LibPICelleratorSuite.c Tue Jan 12 14:39:57 2010 +1100
+++ b/libPICellerator/tests/LibPICelleratorSuite.c Wed Jan 13 21:01:30 2010 +1100
@@ -26,28 +26,28 @@ void LibPICelleratorSuite_Teardown( LibP
void LibPICelleratorSuite_TestDirectoryStGermain( LibPICelleratorSuiteData* data ) {
Stg_Object* testDirectoryStGermain;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, "StGermain" );
+ testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
pcu_check_true( testDirectoryStGermain != NULL );
}
-void LibPICelleratorSuite_TestDirectoryStgFEM( LibPICelleratorSuiteData * data ) {
+void LibPICelleratorSuite_TestDirectoryStgFEM( LibPICelleratorSuiteData * data ) {
Stg_Object* testDirectoryStGermain;
Stg_Object* testDirectoryStgFEM;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, "StGermain" );
- testDirectoryStgFEM= Stg_ObjectList_Get( Project_XMLSearchPaths, "StgFEM" );
+ testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
+ testDirectoryStgFEM= Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StgFEM" );
- pcu_check_true( ( strcmp((char*)LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryStgFEM != NULL ) );
+ pcu_check_true( ( strcmp((char* )LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryStgFEM != NULL ) );
}
void LibPICelleratorSuite_TestDirectoryPICellerator( LibPICelleratorSuiteData * data ) {
Stg_Object* testDirectoryStGermain;
Stg_Object* testDirectoryPICellerator;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, "StGermain" );
- testDirectoryPICellerator= Stg_ObjectList_Get( Project_XMLSearchPaths, "PICellerator" );
+ testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
+ testDirectoryPICellerator= Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"PICellerator" );
- pcu_check_true( ( strcmp((char*)LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryPICellerator != NULL ) );
+ pcu_check_true( ( strcmp((char* )LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryPICellerator != NULL ) );
}
void LibPICelleratorSuite( pcu_suite_t* suite ) {
diff -r 3a2d89521cec -r 41661372a1fc plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
--- a/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Tue Jan 12 14:39:57 2010 +1100
+++ b/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Wed Jan 13 21:01:30 2010 +1100
@@ -62,35 +62,28 @@ void _PICellerator_CalculateParticleDisp
StandardParticle particle;
ParticleDisplacementInfo* particleExt;
- context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, (Name)"context", DomainContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Initialise, _PICellerator_CalculateParticleDisplacement_StoreOriginalPos );
ContextEP_Append( context, AbstractContext_EP_Step, _PICellerator_CalculateParticleDisplacement_UpdateDisplacement );
/* Extend particle with original pos */
- materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, "materialSwarm" );
- assert( materialPointsSwarm );
- self->particleDisplacementInfo_Handle = ExtensionManager_Add( materialPointsSwarm->particleExtensionMgr, CURR_MODULE_NAME,
- sizeof( ParticleDisplacementInfo ) );
+ materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialSwarm" );
+ assert( materialPointsSwarm );
+ self->particleDisplacementInfo_Handle = ExtensionManager_Add( materialPointsSwarm->particleExtensionMgr, (Name)CURR_MODULE_NAME, sizeof( ParticleDisplacementInfo ) );
/* now register these guys as swarm variables */
particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle,
self->particleDisplacementInfo_Handle );
- self->particleOriginalCoordSwarmVariable = Swarm_NewVectorVariable(
- materialPointsSwarm,
- "OriginalCoord",
- (ArithPointer) &particleExt->originalCoord - (ArithPointer) &particle,
+ self->particleOriginalCoordSwarmVariable = Swarm_NewVectorVariable( materialPointsSwarm, (Name)"OriginalCoord", (ArithPointer) &particleExt->originalCoord - (ArithPointer) &particle,
Variable_DataType_Double,
materialPointsSwarm->dim,
"OriginalCoordX",
"OriginalCoordY",
"OriginalCoordZ" );
- self->particleDisplacementSwarmVariable = Swarm_NewVectorVariable(
- materialPointsSwarm,
- "Displacement",
- (ArithPointer) &particleExt->displacement - (ArithPointer) &particle,
+ self->particleDisplacementSwarmVariable = Swarm_NewVectorVariable( materialPointsSwarm, (Name)"Displacement", (ArithPointer) &particleExt->displacement - (ArithPointer) &particle,
Variable_DataType_Double,
materialPointsSwarm->dim,
"DisplacementX",
@@ -119,14 +112,13 @@ void _PICellerator_CalculateParticleDisp
ParticleDisplacementInfo* particleDisplacementInfo;
Particle_Index lParticle_I;
- materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, "materialSwarm" );
+ materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialSwarm" );
assert( materialPointsSwarm );
- self = (CalculateParticleDisplacementPlugin*) LiveComponentRegister_Get( context->CF->LCRegister,
- "PICellerator_CalculateParticleDisplacement" );
+ self = (CalculateParticleDisplacementPlugin* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"PICellerator_CalculateParticleDisplacement" );
assert( self );
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
- particle = (GlobalParticle*)Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
+ particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
particleDisplacementInfo = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr,
particle, self->particleDisplacementInfo_Handle );
originalCoord = particleDisplacementInfo->originalCoord;
@@ -148,14 +140,13 @@ void _PICellerator_CalculateParticleDisp
Dimension_Index dim_I;
/* Add original pos to particle */
- materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, "materialSwarm" );
+ materialPointsSwarm = (MaterialPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"materialSwarm" );
assert( materialPointsSwarm );
- self = (CalculateParticleDisplacementPlugin*) LiveComponentRegister_Get( context->CF->LCRegister,
- "PICellerator_CalculateParticleDisplacement" );
+ self = (CalculateParticleDisplacementPlugin* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)"PICellerator_CalculateParticleDisplacement" );
assert( self );
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
- particle = (GlobalParticle*)Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
+ particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
coord = particle->coord;
particleDisplacementInfo = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle,
self->particleDisplacementInfo_Handle );
@@ -192,8 +183,7 @@ Index PICellerator_CalculateParticleDisp
Index PICellerator_CalculateParticleDisplacement_Register( PluginsManager* pluginsManager ) {
Index result;
- result = PluginsManager_Submit( pluginsManager, PICellerator_CalculateParticleDisplacement_Type, "0",
- _PICellerator_CalculateParticleDisplacement_DefaultNew );
+ result = PluginsManager_Submit( pluginsManager, PICellerator_CalculateParticleDisplacement_Type, (Name)"0", _PICellerator_CalculateParticleDisplacement_DefaultNew );
return result;
}
diff -r 3a2d89521cec -r 41661372a1fc plugins/Output/MaterialCentroid/MaterialCentroid.c
--- a/plugins/Output/MaterialCentroid/MaterialCentroid.c Tue Jan 12 14:39:57 2010 +1100
+++ b/plugins/Output/MaterialCentroid/MaterialCentroid.c Wed Jan 13 21:01:30 2010 +1100
@@ -57,23 +57,23 @@ void MaterialCentroid( PICelleratorConte
Coord centroid;
double volume;
static Bool beenHere = False;
- Stream* stream = Journal_Register( Info_Type, "MaterialCentroid" );
+ Stream* stream = Journal_Register( Info_Type, (Name)"MaterialCentroid" );
- if (!beenHere) {
+ if (!beenHere ) {
Name swarmName;
Name materialName;
Name filename;
Bool fileOpened;
- Stream* errorStream = Journal_Register( Error_Type, CURR_MODULE_NAME );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)CURR_MODULE_NAME );
swarmName = Dictionary_GetString_WithDefault( context->dictionary, "MaterialCentroid_Swarm", "picIntegrationPoints" );
/* Get Swarm */
- swarm = (IntegrationPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, swarmName );
- assert( swarm );
+ swarm = (IntegrationPointsSwarm*) LiveComponentRegister_Get( context->CF->LCRegister, (Name)swarmName );
+ assert( swarm );
/* Get Material */
- materialName = Dictionary_GetString( context->dictionary, "CentroidMaterial" );
+ materialName = Dictionary_GetString( context->dictionary, (Dictionary_Entry_Key)"CentroidMaterial" );
material = Materials_Register_GetByName( swarm->materials_Register, materialName );
assert( material );
@@ -113,7 +113,7 @@ void _PICellerator_MaterialCentroid_Assi
AbstractContext* context;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
ContextEP_Append( context, AbstractContext_EP_FrequentOutput, MaterialCentroid );
}
@@ -142,8 +142,7 @@ Index PICellerator_MaterialCentroid_Regi
Index PICellerator_MaterialCentroid_Register( PluginsManager* pluginsManager ) {
Index result;
- result = PluginsManager_Submit( pluginsManager, PICellerator_MaterialCentroid_Type, "0",
- _PICellerator_MaterialCentroid_DefaultNew );
+ result = PluginsManager_Submit( pluginsManager, PICellerator_MaterialCentroid_Type, (Name)"0", _PICellerator_MaterialCentroid_DefaultNew );
return result;
}
More information about the CIG-COMMITS
mailing list