[cig-commits] commit: Make it compile with C++ and C compilers
Mercurial
hg at geodynamics.org
Wed May 11 14:49:29 PDT 2011
changeset: 417:420e7ed7a877
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Wed May 11 13:26:28 2011 -0700
files: MaterialPoints/src/BackgroundParticleLayout.c MaterialPoints/src/BackgroundParticleLayout.h MaterialPoints/src/CoincidentMapper.c MaterialPoints/src/CoincidentMapper.h MaterialPoints/src/GaussCoincidentMapper.c MaterialPoints/src/GaussCoincidentMapper.h MaterialPoints/src/GaussMapper.c MaterialPoints/src/GaussMapper.h MaterialPoints/src/Init.c MaterialPoints/src/IntegrationPointMapper.c MaterialPoints/src/IntegrationPointMapper.h MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/IntegrationPointsSwarm.h MaterialPoints/src/ManyToOneMapper.c MaterialPoints/src/ManyToOneMapper.h MaterialPoints/src/MappedParticleLayout.c MaterialPoints/src/MappedParticleLayout.h MaterialPoints/src/Material.c MaterialPoints/src/Material.h MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/MaterialFeVariable.h MaterialPoints/src/MaterialPointsSwarm.c MaterialPoints/src/MaterialPointsSwarm.h MaterialPoints/src/Materials_Register.c MaterialPoints/src/Materials_Register.h MaterialPoints/src/OneToManyMapper.c MaterialPoints/src/OneToManyMapper.h MaterialPoints/src/OneToOneMapper.c MaterialPoints/src/OneToOneMapper.h MaterialPoints/src/PICelleratorContext.c MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/ParticleFeVariable.h MaterialPoints/src/PeriodicBoundariesManager.c MaterialPoints/src/PeriodicBoundariesManager.h MaterialPoints/src/SwarmAdvectionInAPlane.c MaterialPoints/src/SwarmAdvectionInAPlane.h MaterialPoints/src/SwarmAdvector.c MaterialPoints/src/SwarmAdvector.h MaterialPoints/src/SwarmVariableField.c MaterialPoints/tests/AdvectionSuite.c PopulationControl/src/EscapedRoutine.c PopulationControl/src/EscapedRoutine.h SConscript SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Utils/src/BuoyancyForceTerm.c Utils/src/BuoyancyForceTermThermoChem.c Utils/src/DiffusionSMT.c Utils/src/HydrostaticTerm.c Utils/src/Init.c Utils/src/PCDVC.c Utils/src/PCDVC.h Utils/tests/PCDVCSuite.c Weights/src/ConstantWeights.c Weights/src/ConstantWeights.h Weights/src/DVCWeights.c Weights/src/DVCWeights.h Weights/src/IterativeWeights.c Weights/src/IterativeWeights.h Weights/src/MomentBalanceWeights.c Weights/src/MomentBalanceWeights.h Weights/src/VolumeWeights.c Weights/src/VolumeWeights.h Weights/src/WeightsCalculator.c Weights/src/WeightsCalculator.h Weights/tests/ConstantWeightsSuite.c Weights/tests/DVCWeightsSuite.c libPICellerator/Toolbox/Toolbox.c libPICellerator/tests/LibPICelleratorSuite.c plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c plugins/Output/MaterialCentroid/MaterialCentroid.c
description:
Make it compile with C++ and C compilers
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/BackgroundParticleLayout.c
--- a/MaterialPoints/src/BackgroundParticleLayout.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/BackgroundParticleLayout.c Wed May 11 13:26:28 2011 -0700
@@ -52,7 +52,7 @@ BackgroundParticleLayout* BackgroundPart
CoordSystem coordSystem,
Bool weightsInitialisedAtStartup ) {
- BackgroundParticleLayout* self = _BackgroundParticleLayout_DefaultNew( name );
+ BackgroundParticleLayout* self = (BackgroundParticleLayout*)_BackgroundParticleLayout_DefaultNew( name );
_ParticleLayout_Init( self, context, coordSystem, weightsInitialisedAtStartup );
_BackgroundParticleLayout_Init( self );
@@ -93,7 +93,7 @@ void _BackgroundParticleLayout_Print( vo
}
-void* _BackgroundParticleLayout_Copy( void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _BackgroundParticleLayout_Copy( const void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
BackgroundParticleLayout* self = (BackgroundParticleLayout*)particleLayout;
BackgroundParticleLayout* newBackgroundParticleLayout;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/BackgroundParticleLayout.h
--- a/MaterialPoints/src/BackgroundParticleLayout.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/BackgroundParticleLayout.h Wed May 11 13:26:28 2011 -0700
@@ -40,7 +40,7 @@ void _BackgroundParticleLayout_Print( vo
(BackgroundParticleLayout*)Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define BackgroundParticleLayout_DeepCopy( self ) \
(BackgroundParticleLayout*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _BackgroundParticleLayout_Copy( void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _BackgroundParticleLayout_Copy( const void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _BackgroundParticleLayout_DefaultNew( Name name );
void _BackgroundParticleLayout_AssignFromXML( void* component, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/CoincidentMapper.c
--- a/MaterialPoints/src/CoincidentMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/CoincidentMapper.c Wed May 11 13:26:28 2011 -0700
@@ -71,7 +71,7 @@ CoincidentMapper* CoincidentMapper_New(
IntegrationPointsSwarm* integrationSwarm,
MaterialPointsSwarm* materialSwarm )
{
- CoincidentMapper* self = _CoincidentMapper_DefaultNew( name );
+ CoincidentMapper* self = (CoincidentMapper*)_CoincidentMapper_DefaultNew( name );
self->isConstructed = True;
_IntegrationPointMapper_Init( self, context, integrationSwarm );
@@ -130,7 +130,7 @@ void _CoincidentMapper_Print( void* mapp
_IntegrationPointMapper_Print( mapper, stream );
}
-void* _CoincidentMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _CoincidentMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
return _IntegrationPointMapper_Copy( mapper, dest, deep, nameExt, ptrMap );
}
@@ -168,7 +168,7 @@ void _CoincidentMapper_Map( void* mapper
#ifdef CAUTIOUS
Index dim_I;
- Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
+ Stream* errorStream = Journal_Register( Error_Type, self->type );
#endif
Stream* debugStream = Swarm_Debug;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/CoincidentMapper.h
--- a/MaterialPoints/src/CoincidentMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/CoincidentMapper.h Wed May 11 13:26:28 2011 -0700
@@ -95,7 +95,7 @@
#define CoincidentMapper_DeepCopy( self ) \
(CoincidentMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _CoincidentMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _CoincidentMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _CoincidentMapper_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/GaussCoincidentMapper.c
--- a/MaterialPoints/src/GaussCoincidentMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/GaussCoincidentMapper.c Wed May 11 13:26:28 2011 -0700
@@ -71,7 +71,7 @@ GaussCoincidentMapper* GaussCoincidentMa
IntegrationPointsSwarm* integrationSwarm,
MaterialPointsSwarm* materialSwarm )
{
- GaussCoincidentMapper* self = _GaussCoincidentMapper_DefaultNew( name );
+ GaussCoincidentMapper* self = (GaussCoincidentMapper*)_GaussCoincidentMapper_DefaultNew( name );
self->isConstructed = True;
_IntegrationPointMapper_Init( self, context, integrationSwarm );
@@ -134,7 +134,7 @@ void _GaussCoincidentMapper_Print( void*
_IntegrationPointMapper_Print( self, stream );
}
-void* _GaussCoincidentMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _GaussCoincidentMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
return _IntegrationPointMapper_Copy( mapper, dest, deep, nameExt, ptrMap );
}
@@ -174,7 +174,7 @@ void _GaussCoincidentMapper_Map( void* m
#ifdef CAUTIOUS
Index dim_I;
- Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
+ Stream* errorStream = Journal_Register( Error_Type, self->type );
#endif
Stream* debugStream = Swarm_Debug;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/GaussCoincidentMapper.h
--- a/MaterialPoints/src/GaussCoincidentMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/GaussCoincidentMapper.h Wed May 11 13:26:28 2011 -0700
@@ -95,7 +95,7 @@
#define GaussCoincidentMapper_DeepCopy( self ) \
(GaussCoincidentMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _GaussCoincidentMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _GaussCoincidentMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _GaussCoincidentMapper_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/GaussMapper.c
--- a/MaterialPoints/src/GaussMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/GaussMapper.c Wed May 11 13:26:28 2011 -0700
@@ -94,7 +94,7 @@ void _GaussMapper_Print( void* mapper, S
_OneToOneMapper_Print( self, stream );
}
-void* _GaussMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _GaussMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
return _IntegrationPointMapper_Copy( mapper, dest, deep, nameExt, ptrMap );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/GaussMapper.h
--- a/MaterialPoints/src/GaussMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/GaussMapper.h Wed May 11 13:26:28 2011 -0700
@@ -68,7 +68,7 @@
#define GaussMapper_DeepCopy( self ) \
(GaussMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _GaussMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _GaussMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _GaussMapper_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/Init.c
--- a/MaterialPoints/src/Init.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/Init.c Wed May 11 13:26:28 2011 -0700
@@ -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, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, PICelleratorContext_Type, (Name)"0", _PICelleratorContext_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PICelleratorContext_Type, "0", _PICelleratorContext_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, BackgroundParticleLayout_Type, (Name)"0", _BackgroundParticleLayout_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, BackgroundParticleLayout_Type, "0", _BackgroundParticleLayout_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, 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, MaterialFeVariable_Type, (Name)"0", _MaterialFeVariable_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, Material_Type, (Name)"0", _Material_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, MaterialFeVariable_Type, "0", _MaterialFeVariable_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, Material_Type, "0", _Material_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, 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, SwarmAdvector_Type, (Name)"0", _SwarmAdvector_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, SwarmAdvectionInAPlane_Type, (Name)"0", _SwarmAdvectionInAPlane_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmAdvector_Type, "0", _SwarmAdvector_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmAdvectionInAPlane_Type, "0", _SwarmAdvectionInAPlane_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, PeriodicBoundariesManager_Type, (Name)"0", _PeriodicBoundariesManager_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PeriodicBoundariesManager_Type, "0", _PeriodicBoundariesManager_DefaultNew );
- Stg_ComponentRegister_Add( componentsRegister, SwarmVariableField_Type, (Name)"0", _SwarmVariableField_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, SwarmVariableField_Type, "0", _SwarmVariableField_DefaultNew );
/* Doing this in alphabetical order to match ls output */
RegisterParent( BackgroundParticleLayout_Type, ParticleLayout_Type );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/IntegrationPointMapper.c
--- a/MaterialPoints/src/IntegrationPointMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/IntegrationPointMapper.c Wed May 11 13:26:28 2011 -0700
@@ -99,11 +99,11 @@ void _IntegrationPointMapper_Print( void
Stream_UnIndent( stream );
}
-void* _IntegrationPointMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _IntegrationPointMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
IntegrationPointMapper* self = (IntegrationPointMapper*)mapper;
IntegrationPointMapper* newCopy = (IntegrationPointMapper*)_Stg_Component_Copy( self, dest, deep, nameExt, ptrMap );
- newCopy->integrationSwarm = Stg_Class_Copy( self->integrationSwarm, NULL, deep, nameExt, ptrMap );
+ newCopy->integrationSwarm = (IntegrationPointsSwarm*)(Stg_Class_Copy( self->integrationSwarm, NULL, deep, nameExt, ptrMap ));
return newCopy;
}
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/IntegrationPointMapper.h
--- a/MaterialPoints/src/IntegrationPointMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/IntegrationPointMapper.h Wed May 11 13:26:28 2011 -0700
@@ -146,7 +146,7 @@
#define IntegrationPointMapper_DeepCopy( self ) \
(IntegrationPointMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _IntegrationPointMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _IntegrationPointMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _IntegrationPointMapper_AssignFromXML( void* mapper, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c Wed May 11 13:26:28 2011 -0700
@@ -258,7 +258,7 @@ void _IntegrationPointsSwarm_Init(
timeIntegrator,
"MaterialPointsSwarm_Update", /* Needs to be after a the material update */
"IntegrationPointsSwarm_Update",
- _IntegrationPointsSwarm_UpdateHook,
+ (Func_Ptr)_IntegrationPointsSwarm_UpdateHook,
self->name,
self );
}
@@ -286,7 +286,7 @@ void _IntegrationPointsSwarm_Print( void
_Swarm_Print( self, stream );
}
-void* _IntegrationPointsSwarm_Copy( void* integrationPoints, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _IntegrationPointsSwarm_Copy( const void* integrationPoints, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
IntegrationPointsSwarm* self = (IntegrationPointsSwarm*)integrationPoints;
IntegrationPointsSwarm* newIntegrationPointsSwarm;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/IntegrationPointsSwarm.h
--- a/MaterialPoints/src/IntegrationPointsSwarm.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/IntegrationPointsSwarm.h Wed May 11 13:26:28 2011 -0700
@@ -134,7 +134,7 @@
(IntegrationPointsSwarm*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define IntegrationPointsSwarm_DeepCopy( self ) \
(IntegrationPointsSwarm*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _IntegrationPointsSwarm_Copy( void* integrationPoints, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _IntegrationPointsSwarm_Copy( const void* integrationPoints, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _IntegrationPointsSwarm_Build( void* integrationPoints, void* data ) ;
void _IntegrationPointsSwarm_Initialise( void* integrationPoints, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/ManyToOneMapper.c
--- a/MaterialPoints/src/ManyToOneMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/ManyToOneMapper.c Wed May 11 13:26:28 2011 -0700
@@ -68,7 +68,7 @@ ManyToOneMapper* _ManyToOneMapper_New(
void _ManyToOneMapper_Init( void* mapper, MaterialPointsSwarm** materialSwarms, Index materialSwarmCount ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
- int i;
+ unsigned int i;
self->materialSwarms = materialSwarms;
self->materialSwarmCount = materialSwarmCount;
@@ -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, (Name)materialSwarms[i]->name, sizeof(MaterialPointRef) );
+ ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, materialSwarms[i]->name, sizeof(MaterialPointRef) );
}
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -89,7 +89,7 @@ void _ManyToOneMapper_Delete( void* mapp
void _ManyToOneMapper_Print( void* mapper, Stream* stream ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
- int i;
+ unsigned int i;
_IntegrationPointMapper_Print( self, stream );
if ( self->materialSwarms != NULL ) {
@@ -101,14 +101,14 @@ void _ManyToOneMapper_Print( void* mappe
}
}
-void* _ManyToOneMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ManyToOneMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
ManyToOneMapper* newCopy;
newCopy = (ManyToOneMapper*)_IntegrationPointMapper_Copy( self, dest, deep, nameExt, ptrMap );
if ( self->materialSwarms != NULL ) {
- newCopy->materialSwarms = PtrMap_Find( ptrMap, self->materialSwarms );
+ newCopy->materialSwarms = (MaterialPointsSwarm**)PtrMap_Find( ptrMap, self->materialSwarms );
if ( newCopy->materialSwarms == NULL ) {
newCopy->materialSwarms = Memory_Alloc_Array( MaterialPointsSwarm*, self->materialSwarmCount, "componentList" );
@@ -141,7 +141,7 @@ void _ManyToOneMapper_AssignFromXML( voi
void _ManyToOneMapper_Build( void* mapper, void* data ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
- int i;
+ unsigned int i;
_IntegrationPointMapper_Build( mapper, data );
@@ -152,7 +152,7 @@ void _ManyToOneMapper_Build( void* mappe
void _ManyToOneMapper_Initialise( void* mapper, void* data ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
- int i;
+ unsigned int i;
_IntegrationPointMapper_Initialise( mapper, data );
@@ -166,7 +166,7 @@ void _ManyToOneMapper_Execute( void* map
void _ManyToOneMapper_Destroy( void* mapper, void* data ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
- int i;
+ unsigned int i;
for ( i = 0; i < self->materialSwarmCount; ++i ) {
Stg_Component_Destroy( self->materialSwarms[i], data, False );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/ManyToOneMapper.h
--- a/MaterialPoints/src/ManyToOneMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/ManyToOneMapper.h Wed May 11 13:26:28 2011 -0700
@@ -95,7 +95,7 @@
#define ManyToOneMapper_DeepCopy( self ) \
(ManyToOneMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _ManyToOneMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ManyToOneMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _ManyToOneMapper_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MappedParticleLayout.c
--- a/MaterialPoints/src/MappedParticleLayout.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MappedParticleLayout.c Wed May 11 13:26:28 2011 -0700
@@ -55,7 +55,7 @@ MappedParticleLayout* MappedParticleLayo
Bool weightsInitialisedAtStartup )
{
- MappedParticleLayout* self = _MappedParticleLayout_DefaultNew( name );
+ MappedParticleLayout* self = (MappedParticleLayout*)_MappedParticleLayout_DefaultNew( name );
_ParticleLayout_Init( self, context, coordSystem, weightsInitialisedAtStartup );
_MappedParticleLayout_Init( self );
@@ -96,7 +96,7 @@ void _MappedParticleLayout_Print( void*
}
-void* _MappedParticleLayout_Copy( void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _MappedParticleLayout_Copy( const void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
MappedParticleLayout* self = (MappedParticleLayout*)particleLayout;
MappedParticleLayout* newMappedParticleLayout;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MappedParticleLayout.h
--- a/MaterialPoints/src/MappedParticleLayout.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MappedParticleLayout.h Wed May 11 13:26:28 2011 -0700
@@ -40,7 +40,7 @@ void _MappedParticleLayout_Print( void*
(MappedParticleLayout*)Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define MappedParticleLayout_DeepCopy( self ) \
(MappedParticleLayout*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _MappedParticleLayout_Copy( void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _MappedParticleLayout_Copy( const void* particleLayout, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _MappedParticleLayout_DefaultNew( Name name );
void _MappedParticleLayout_AssignFromXML( void* component, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/Material.c Wed May 11 13:26:28 2011 -0700
@@ -67,7 +67,7 @@ Material* Material_New(
Dictionary* materialDictionary,
Materials_Register* materialRegister )
{
- Material* self = _Material_DefaultNew( name );
+ Material* self = (Material*)_Material_DefaultNew( name );
self->isConstructed = True;
_Material_Init( self, context, shape, materialDictionary, materialRegister );
@@ -156,11 +156,11 @@ void _Material_Print( void* material, St
}
-void* _Material_Copy( void* material, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _Material_Copy( const void* material, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
Material* self = (Material*) material;
Material* newMaterial;
- newMaterial = _Stg_Component_Copy( self, dest, deep, nameExt, ptrMap );
+ newMaterial = (Material*)_Stg_Component_Copy( self, dest, deep, nameExt, ptrMap );
newMaterial->dictionary = self->dictionary;
newMaterial->index = self->index;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/Material.h
--- a/MaterialPoints/src/Material.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/Material.h Wed May 11 13:26:28 2011 -0700
@@ -98,7 +98,7 @@
void _Material_Print( void* material, Stream* stream );
- void* _Material_Copy( void* material, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _Material_Copy( const void* material, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _Material_Build( void* material, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MaterialFeVariable.c
--- a/MaterialPoints/src/MaterialFeVariable.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MaterialFeVariable.c Wed May 11 13:26:28 2011 -0700
@@ -95,7 +95,7 @@ void _MaterialFeVariable_Print( void* ma
Journal_PrintPointer( stream, self->material );
}
-void* _MaterialFeVariable_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _MaterialFeVariable_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
MaterialFeVariable* self = (MaterialFeVariable*)feVariable;
MaterialFeVariable* newMaterialFeVariable;
@@ -128,10 +128,10 @@ void* _MaterialFeVariable_DefaultNew( Na
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _MaterialFeVariable_ValueAtParticle;
/* Variables that are set to ZERO are variables that will be set either by the current _New function or another parent _New function further up the hierachy */
- AllocationType nameAllocationType = ZERO;
- FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
- FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
- FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
+ FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = NULL;
+ FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = NULL;
+ FeVariable_SyncShadowValuesFunc* _syncShadowValues = NULL;
return (void*) _MaterialFeVariable_New( MATERIALFEVARIABLE_PASSARGS );
}
@@ -151,7 +151,7 @@ void _MaterialFeVariable_Build( void* ma
void _MaterialFeVariable_Build( void* materialFeVariable, void* data ) {
MaterialFeVariable* self = (MaterialFeVariable*) materialFeVariable;
IntegrationPointsSwarm* swarm;
- Name tmpName;
+ char *tmpName;
Variable_Register* variable_Register = NULL;
Stg_Component_Build( self->feMesh, data, False );
@@ -161,13 +161,13 @@ void _MaterialFeVariable_Build( void* ma
if ( swarm->swarmVariable_Register )
variable_Register = swarm->swarmVariable_Register->variable_Register;
- tmpName = Stg_Object_AppendSuffix( self, (Name)"DataVariable" );
+ tmpName = Stg_Object_AppendSuffix( self, "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,
+ (Index*)(&((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains),
NULL,
(void**)&self->data,
variable_Register );
@@ -209,7 +209,7 @@ void _MaterialFeVariable_ValueAtParticle
double* particleValue )
{
MaterialFeVariable* self = (MaterialFeVariable*) materialFeVariable;
- *particleValue = (double) ( self->material->index == IntegrationPointsSwarm_GetMaterialIndexOn( swarm, particle ) );
+ *particleValue = (double) ( self->material->index == IntegrationPointsSwarm_GetMaterialIndexOn( swarm, (IntegrationPoint*)particle ) );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MaterialFeVariable.h
--- a/MaterialPoints/src/MaterialFeVariable.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MaterialFeVariable.h Wed May 11 13:26:28 2011 -0700
@@ -76,7 +76,7 @@
void* _MaterialFeVariable_DefaultNew( Name name );
void _MaterialFeVariable_Delete( void* variable );
void _MaterialFeVariable_Print( void* variable, Stream* stream );
- void* _MaterialFeVariable_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _MaterialFeVariable_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _MaterialFeVariable_AssignFromXML( void* variable, Stg_ComponentFactory* cf, void* data );
void _MaterialFeVariable_Build( void* variable, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Wed May 11 13:26:28 2011 -0700
@@ -61,7 +61,7 @@ const Type MaterialPointsSwarm_Type = "M
const Type MaterialPointsSwarm_Type = "MaterialPointsSwarm";
MaterialPointsSwarm* MaterialPointsSwarm_New(
- Name name,
+ Name name,
AbstractContext* context,
void* cellLayout,
void* particleLayout,
@@ -194,7 +194,7 @@ void _MaterialPointsSwarm_Print( void* s
_Swarm_Print( self, stream );
}
-void* _MaterialPointsSwarm_Copy( void* swarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _MaterialPointsSwarm_Copy( const void* swarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*)swarm;
MaterialPointsSwarm* newMaterialPointsSwarm;
@@ -264,10 +264,10 @@ void _MaterialPointsSwarm_AssignFromXML(
void _MaterialPointsSwarm_Build( void* swarm, void* data ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*) swarm;
- int commHandler_I;
+ unsigned int commHandler_I;
Bool movementCommHandlerFound = False;
Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
- int var_I;
+ Index var_I;
_Swarm_Build( self, data );
@@ -299,7 +299,7 @@ void _MaterialPointsSwarm_Initialise( vo
void _MaterialPointsSwarm_Initialise( void* swarm, void* data ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*) swarm;
AbstractContext* context = (AbstractContext*)self->context;
- Index var_I = 0;
+ Index var_I = 0;
Particle_Index lParticle_I=0;
MaterialPoint* matPoint=NULL;
@@ -439,7 +439,7 @@ void _MaterialPointsSwarm_Execute( void*
}
void _MaterialPointsSwarm_Destroy( void* swarm, void* data ) {
MaterialPointsSwarm* self = (MaterialPointsSwarm*)swarm;
- int var_I;
+ Index var_I;
Stg_Component_Destroy( self->mesh, data , False );
if( self->escapedRoutine != NULL) Stg_Component_Destroy( self->escapedRoutine, data , False );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/MaterialPointsSwarm.h
--- a/MaterialPoints/src/MaterialPointsSwarm.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/MaterialPointsSwarm.h Wed May 11 13:26:28 2011 -0700
@@ -113,7 +113,7 @@
(MaterialPointsSwarm*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define MaterialPointsSwarm_DeepCopy( self ) \
(MaterialPointsSwarm*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _MaterialPointsSwarm_Copy( void* swarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _MaterialPointsSwarm_Copy( const void* swarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _MaterialPointsSwarm_DefaultNew( Name name ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/Materials_Register.c
--- a/MaterialPoints/src/Materials_Register.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/Materials_Register.c Wed May 11 13:26:28 2011 -0700
@@ -84,7 +84,7 @@ void _Materials_Register_Print( void* _m
_NamedObject_Register_Print( self, stream );
}
-void* _Materials_Register_Copy( void* _materialsRegister, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _Materials_Register_Copy( const void* _materialsRegister, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
Materials_Register* self = (Materials_Register*) _materialsRegister;
Materials_Register* newMaterials_Register;
@@ -125,7 +125,7 @@ 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, (Name)type, extensionSize );
+ result = ExtensionManager_Add( material->extensionMgr, (char*)type, extensionSize );
if ( material_I == 0 )
firstResult = result;
@@ -148,7 +148,7 @@ void _Materials_Register_LayoutGeometry(
for ( material_I = 0 ; material_I < Materials_Register_GetCount( self ) ; material_I++) {
material = Materials_Register_GetByIndex( self, material_I );
- Material_Layout( material, swarm );
+ Material_Layout( material, (MaterialPointsSwarm*)swarm );
}
}
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/Materials_Register.h
--- a/MaterialPoints/src/Materials_Register.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/Materials_Register.h Wed May 11 13:26:28 2011 -0700
@@ -79,7 +79,7 @@
*/
void _Materials_Register_Delete( void* _materialsRegister ) ;
void _Materials_Register_Print( void* _materialsRegister, Stream* stream ) ;
- void* _Materials_Register_Copy( void* _materialsRegister, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _Materials_Register_Copy( const void* _materialsRegister, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/*--------------------------------------------------------------------------------------------------------------------------
** Public functions
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/OneToManyMapper.c
--- a/MaterialPoints/src/OneToManyMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/OneToManyMapper.c Wed May 11 13:26:28 2011 -0700
@@ -72,7 +72,7 @@ void _OneToManyMapper_Init( void* mapper
self->materialSwarm = materialSwarm;
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, False );
- self->refHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, (Name)materialSwarm->name, sizeof(OneToManyRef) );
+ self->refHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, materialSwarm->name, sizeof(OneToManyRef) );
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -89,7 +89,7 @@ void _OneToManyMapper_Print( void* mappe
Stg_Class_Print( self->materialSwarm, stream );
Stream_UnIndent( stream );
}
-void* _OneToManyMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _OneToManyMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
OneToManyMapper* self = (OneToManyMapper*)mapper;
OneToManyMapper* newCopy;
@@ -170,8 +170,8 @@ double _OneToManyMapper_GetDoubleFromExt
ref = OneToManyMapper_GetMaterialRef(mapper, intPoint);
for(ii = 0; ii < ref->numParticles; ii++) {
- c = *(double*)(MaterialPointsSwarm_GetExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
- v += ((double)ref->weights[ii])*c;
+ c = *(double*)(MaterialPointsSwarm_GetExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
+ v += ((double)ref->weights[ii])*c;
}
return v;
@@ -185,8 +185,8 @@ double _OneToManyMapper_GetDoubleFromMat
ref = OneToManyMapper_GetMaterialRef(mapper, intPoint);
for(ii = 0; ii < ref->numParticles; ii++) {
- c = *(double*)(MaterialPointsSwarm_GetMaterialExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
- v += ((double)ref->weights[ii])*c;
+ c = *(double*)(MaterialPointsSwarm_GetMaterialExtensionAt(self->materialSwarm, ref->particleInds[ii], extHandle) + offs);
+ v += ((double)ref->weights[ii])*c;
}
return v;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/OneToManyMapper.h
--- a/MaterialPoints/src/OneToManyMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/OneToManyMapper.h Wed May 11 13:26:28 2011 -0700
@@ -97,7 +97,7 @@ void _OneToManyMapper_Init( void* mapper
(OneToManyMapper*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define OneToManyMapper_DeepCopy( self ) \
(OneToManyMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _OneToManyMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _OneToManyMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _OneToManyMapper_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data );
void _OneToManyMapper_Build( void* mapper, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/OneToOneMapper.c
--- a/MaterialPoints/src/OneToOneMapper.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/OneToOneMapper.c Wed May 11 13:26:28 2011 -0700
@@ -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, (Name)materialSwarm->name, sizeof(MaterialPointRef) );
+ self->materialRefHandle = ExtensionManager_Add( self->integrationSwarm->particleExtensionMgr, materialSwarm->name, sizeof(MaterialPointRef) );
ExtensionManager_SetLockDown( self->integrationSwarm->particleExtensionMgr, True );
}
@@ -92,7 +92,7 @@ void _OneToOneMapper_Print( void* mapper
Stream_UnIndent( stream );
}
-void* _OneToOneMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _OneToOneMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
OneToOneMapper* self = (OneToOneMapper*)mapper;
OneToOneMapper* newCopy;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/OneToOneMapper.h
--- a/MaterialPoints/src/OneToOneMapper.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/OneToOneMapper.h Wed May 11 13:26:28 2011 -0700
@@ -97,7 +97,7 @@
#define OneToOneMapper_DeepCopy( self ) \
(OneToOneMapper*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _OneToOneMapper_Copy( void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _OneToOneMapper_Copy( const void* mapper, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _OneToOneMapper_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/PICelleratorContext.c
--- a/MaterialPoints/src/PICelleratorContext.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/PICelleratorContext.c Wed May 11 13:26:28 2011 -0700
@@ -64,7 +64,7 @@ PICelleratorContext* PICelleratorContext
MPI_Comm communicator,
Dictionary* dictionary )
{
- PICelleratorContext* self = _PICelleratorContext_DefaultNew( name );
+ PICelleratorContext* self = (PICelleratorContext*)_PICelleratorContext_DefaultNew( name );
self->isConstructed = True;
_AbstractContext_Init( (AbstractContext*) self );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/ParticleFeVariable.c Wed May 11 13:26:28 2011 -0700
@@ -56,7 +56,7 @@
const Type ParticleFeVariable_Type = "ParticleFeVariable";
-char* ParticleFeVariable_names[10];
+Name ParticleFeVariable_names[10];
int ParticleFeVariable_nNames = 0;
int ParticleFeVariable_curName = 0;
@@ -131,7 +131,7 @@ void _ParticleFeVariable_Print( void* ma
/* ParticleFeVariable info */
}
-void* _ParticleFeVariable_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ParticleFeVariable_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
abort();
return NULL;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/ParticleFeVariable.h
--- a/MaterialPoints/src/ParticleFeVariable.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/ParticleFeVariable.h Wed May 11 13:26:28 2011 -0700
@@ -63,16 +63,16 @@
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle; \
\
/* ParticleFeVariable info */ \
- double* data; \
- Variable* dataVariable; \
- Name assemblyVectorName; \
- ForceVector* assemblyVector; \
- ForceTerm* assemblyTerm; \
- Name massMatrixName; \
- ForceVector* massMatrix; \
- ForceTerm* massMatrixForceTerm; \
- int currentParticleIndex; \
- Bool useDeriv;
+ double* data; \
+ Variable* dataVariable; \
+ char* assemblyVectorName; \
+ ForceVector* assemblyVector; \
+ ForceTerm* assemblyTerm; \
+ char* massMatrixName; \
+ ForceVector* massMatrix; \
+ ForceTerm* massMatrixForceTerm; \
+ int currentParticleIndex; \
+ Bool useDeriv;
struct ParticleFeVariable { __ParticleFeVariable };
@@ -98,7 +98,7 @@
void _ParticleFeVariable_Print( void* variable, Stream* stream );
- void* _ParticleFeVariable_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ParticleFeVariable_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _ParticleFeVariable_AssignFromXML( void* variable, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/PeriodicBoundariesManager.c
--- a/MaterialPoints/src/PeriodicBoundariesManager.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/PeriodicBoundariesManager.c Wed May 11 13:26:28 2011 -0700
@@ -70,7 +70,7 @@ PeriodicBoundariesManager* PeriodicBound
Swarm* swarm,
Dictionary* dictionary )
{
- PeriodicBoundariesManager* self = _PeriodicBoundariesManager_DefaultNew( name );
+ PeriodicBoundariesManager* self = (PeriodicBoundariesManager*)_PeriodicBoundariesManager_DefaultNew( name );
self->isConstructed = True;
_PeriodicBoundariesManager_Init( self, context, mesh, swarm, dictionary );
@@ -178,7 +178,7 @@ void _PeriodicBoundariesManager_Print( v
Stream_UnIndent( stream );
}
-void* _PeriodicBoundariesManager_Copy( void* periodicBCsManager, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _PeriodicBoundariesManager_Copy( const void* periodicBCsManager, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
PeriodicBoundariesManager* self = (PeriodicBoundariesManager*)periodicBCsManager;
PeriodicBoundariesManager* newPeriodicBCsManager;
PtrMap* map = ptrMap;
@@ -189,7 +189,7 @@ void* _PeriodicBoundariesManager_Copy( v
ownMap = True;
}
- newPeriodicBCsManager = _Stg_Class_Copy( self, dest, deep, nameExt, map );
+ newPeriodicBCsManager = (PeriodicBoundariesManager*)_Stg_Class_Copy( self, dest, deep, nameExt, map );
newPeriodicBCsManager->count = self->count;
newPeriodicBCsManager->size = self->size;
@@ -263,7 +263,7 @@ void _PeriodicBoundariesManager_Build( v
for ( dim_I = 0 ; dim_I < self->swarm->dim ; dim_I++ ) {
/* Add boundaries straight from mesh generator */
if ( cartesianGenerator->periodic[ dim_I ] )
- PeriodicBoundariesManager_AddPeriodicBoundary( self, dim_I );
+ PeriodicBoundariesManager_AddPeriodicBoundary( self, (Axis)dim_I );
}
}
}
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/PeriodicBoundariesManager.h
--- a/MaterialPoints/src/PeriodicBoundariesManager.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/PeriodicBoundariesManager.h Wed May 11 13:26:28 2011 -0700
@@ -117,7 +117,7 @@
void _PeriodicBoundariesManager_Print( void* context, Stream* stream );
- void* _PeriodicBoundariesManager_Copy( void* periodicBCsManager, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _PeriodicBoundariesManager_Copy( const void* periodicBCsManager, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _PeriodicBoundariesManager_Build( void* periodicBCsManager, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/SwarmAdvectionInAPlane.c
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.c Wed May 11 13:26:28 2011 -0700
@@ -79,7 +79,7 @@ SwarmAdvectionInAPlane* SwarmAdvectionIn
PeriodicBoundariesManager* periodicBCsManager )
{
SwarmAdvectionInAPlane* self = (SwarmAdvectionInAPlane*) _SwarmAdvectionInAPlane_DefaultNew( name );
- int whichaxis;
+ int whichaxis=0;
/* SwarmAdvectionInAPlane_InitAll */
_TimeIntegrand_Init( self, context, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
@@ -116,7 +116,7 @@ void _SwarmAdvectionInAPlane_Init( Swarm
** Virtual functions
*/
-void* _SwarmAdvectionInAPlane_Copy( void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _SwarmAdvectionInAPlane_Copy( const void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
SwarmAdvectionInAPlane* self = (SwarmAdvectionInAPlane*)swarmAdvector;
SwarmAdvectionInAPlane* newSwarmAdvectionInAPlane;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/SwarmAdvectionInAPlane.h
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.h Wed May 11 13:26:28 2011 -0700
@@ -99,7 +99,7 @@
(SwarmAdvectionInAPlane*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define SwarmAdvectionInAPlane_DeepCopy( self ) \
(SwarmAdvectionInAPlane*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _SwarmAdvectionInAPlane_Copy( void* materialSwarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _SwarmAdvectionInAPlane_Copy( const void* materialSwarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _SwarmAdvectionInAPlane_DefaultNew( Name name ) ;
void _SwarmAdvectionInAPlane_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/SwarmAdvector.c Wed May 11 13:26:28 2011 -0700
@@ -136,14 +136,14 @@ void _SwarmAdvector_Init(
TimeIntegrator_AppendSetupEP( self->timeIntegrator,
- "SwarmAdvector_AdvectionSetup", SwarmAdvector_AdvectionSetup, self->name, self );
+ "SwarmAdvector_AdvectionSetup", (Func_Ptr)SwarmAdvector_AdvectionSetup, self->name, self );
TimeIntegrator_PrependFinishEP( self->timeIntegrator,
- "SwarmAdvector_AdvectionFinish", SwarmAdvector_AdvectionFinish, self->name, self );
+ "SwarmAdvector_AdvectionFinish", (Func_Ptr)SwarmAdvector_AdvectionFinish, self->name, self );
TimeIntegrator_InsertBeforeFinishEP(
self->timeIntegrator,
"IntegrationPointsSwarm_Update", /* Must before this */
"MaterialPointsSwarm_Update",
- _MaterialPointsSwarm_UpdateHook,
+ (Func_Ptr)_MaterialPointsSwarm_UpdateHook,
swarm->name,
swarm );
@@ -170,7 +170,7 @@ void _SwarmAdvector_Print( void* swarmAd
}
-void* _SwarmAdvector_Copy( void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _SwarmAdvector_Copy( const void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
SwarmAdvector* newSwarmAdvector;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/SwarmAdvector.h
--- a/MaterialPoints/src/SwarmAdvector.h Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/SwarmAdvector.h Wed May 11 13:26:28 2011 -0700
@@ -105,7 +105,7 @@
(SwarmAdvector*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define SwarmAdvector_DeepCopy( self ) \
(SwarmAdvector*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _SwarmAdvector_Copy( void* materialSwarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _SwarmAdvector_Copy( const void* materialSwarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _SwarmAdvector_DefaultNew( Name name ) ;
void _SwarmAdvector_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/src/SwarmVariableField.c Wed May 11 13:26:28 2011 -0700
@@ -116,10 +116,10 @@ void* _SwarmVariableField_DefaultNew( Na
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = (ParticleFeVariable_ValueAtParticleFunction*)_SwarmVariableField_ValueAtParticle;
/* Variables that are set to ZERO are variables that will be set either by the current _New function or another parent _New function further up the hierachy */
- AllocationType nameAllocationType = ZERO;
- FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
- FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
- FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
+ FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = NULL;
+ FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = NULL;
+ FeVariable_SyncShadowValuesFunc* _syncShadowValues = NULL;
return (void*)_SwarmVariableField_New( SWARMVARIABLEFIELD_PASSARGS );
}
@@ -149,7 +149,7 @@ void _SwarmVariableField_Build( void* sw
unsigned nDomainVerts = Mesh_GetDomainSize( self->feMesh, MT_VERTEX );
SwarmVariable_Register* swarmVar_Register = self->materialSwarm->swarmVariable_Register;
Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
- Name tmpName;
+ char* 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
diff -r eb3ff4560d4a -r 420e7ed7a877 MaterialPoints/tests/AdvectionSuite.c
--- a/MaterialPoints/tests/AdvectionSuite.c Fri Nov 12 16:00:52 2010 -0800
+++ b/MaterialPoints/tests/AdvectionSuite.c Wed May 11 13:26:28 2011 -0700
@@ -55,7 +55,7 @@ void AdvectionSuite_Teardown( AdvectionS
void AdvectionSuite_Teardown( AdvectionSuiteData* data ) {
}
-double dt( void* class, PICelleratorContext* context ) {
+double dt( void* dd, PICelleratorContext* context ) {
return Dictionary_GetDouble_WithDefault( context->dictionary, (Dictionary_Entry_Key)"dt", 0.01 );
}
@@ -88,7 +88,7 @@ void check( PICelleratorContext* context
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
coord = particle->coord;
- originalCoord = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle, handle );
+ originalCoord = (double*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle, handle );
currentRadius = StGermain_VectorMagnitude( coord, 2 );
originalRadius = StGermain_VectorMagnitude( originalCoord, 2 );
@@ -140,7 +140,7 @@ void AdvectionSuite_TestEuler( Advection
for( particle_i = 0; particle_i < matSwarm->particleLocalCount; particle_i++ ) {
particle = (GlobalParticle*)Swarm_ParticleAt( matSwarm, particle_i );
- origCoord = ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
+ origCoord = (double*)ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
memcpy( origCoord, particle->coord, sizeof(Coord) );
}
@@ -173,7 +173,7 @@ void AdvectionSuite_TestRK2( AdvectionSu
for( particle_i = 0; particle_i < matSwarm->particleLocalCount; particle_i++ ) {
particle = (GlobalParticle*)Swarm_ParticleAt( matSwarm, particle_i );
- origCoord = ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
+ origCoord = (double*)ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
memcpy( origCoord, particle->coord, sizeof(Coord) );
}
@@ -206,7 +206,7 @@ void AdvectionSuite_TestRK4( AdvectionSu
for( particle_i = 0; particle_i < matSwarm->particleLocalCount; particle_i++ ) {
particle = (GlobalParticle*)Swarm_ParticleAt( matSwarm, particle_i );
- origCoord = ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
+ origCoord = (double*)ExtensionManager_Get( matSwarm->particleExtensionMgr, particle, handle );
memcpy( origCoord, particle->coord, sizeof(Coord) );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 PopulationControl/src/EscapedRoutine.c
--- a/PopulationControl/src/EscapedRoutine.c Fri Nov 12 16:00:52 2010 -0800
+++ b/PopulationControl/src/EscapedRoutine.c Wed May 11 13:26:28 2011 -0700
@@ -137,7 +137,7 @@ void _EscapedRoutine_Print( void* escape
_Stg_Component_Print( self, stream );
}
-void* _EscapedRoutine_Copy( void* escapedRoutine, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _EscapedRoutine_Copy( const void* escapedRoutine, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
EscapedRoutine* self = (EscapedRoutine*)escapedRoutine;
EscapedRoutine* newEscapedRoutine;
diff -r eb3ff4560d4a -r 420e7ed7a877 PopulationControl/src/EscapedRoutine.h
--- a/PopulationControl/src/EscapedRoutine.h Fri Nov 12 16:00:52 2010 -0800
+++ b/PopulationControl/src/EscapedRoutine.h Wed May 11 13:26:28 2011 -0700
@@ -112,7 +112,7 @@
#define EscapedRoutine_DeepCopy( self ) \
(EscapedRoutine*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _EscapedRoutine_Copy( void* escapedRoutine, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _EscapedRoutine_Copy( const void* escapedRoutine, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _EscapedRoutine_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data );
diff -r eb3ff4560d4a -r 420e7ed7a877 SConscript
--- a/SConscript Fri Nov 12 16:00:52 2010 -0800
+++ b/SConscript Wed May 11 13:26:28 2011 -0700
@@ -142,10 +142,10 @@ if env['static_libs']:
n = n[:-6]
reg_c += 'extern void (%s_MetaAsDictionary)();\n'%n
reg_c += 'extern void (%s_GetName)();\n'%n
- reg_c += 'extern void (%s_Register)();\n'%n
+ reg_c += 'extern void (%s_Register)(PluginsManager *pluginsManager);\n'%n
if n.find('Toolbox') != -1:
- reg_c += 'extern void (%s_Initialise)();\n'%n
- reg_c += 'extern void (%s_Finalise)();\n'%n
+ reg_c += 'extern void (%s_Initialise)(PluginsManager* pluginsManager, int * argc, char *** argv);\n'%n
+ reg_c += 'extern void (%s_Finalise)(PluginsManager* pluginsManager);\n'%n
reg_c += '\n'
reg_c += 'void picellerator_register_static_modules() {\n'
@@ -226,7 +226,7 @@ if env['static_libs']:
env.PCUTest('tests/testPICellerator', suites,
PCU_LIBHEADERS="#include <StGermain/StGermain.h>\n#include <StgDomain/StgDomain.h>\n" \
- "#include <StgFEM/StgFEM.h>\n#include <PICellerator/PICellerator.h>",
+ "#include <StgFEM/StgFEM.h>\n#include <PICellerator/PICellerator.h>\nextern void picellerator_register_static_modules();\nextern void stgfem_register_static_modules();\nextern void stgdomain_register_static_modules();",
PCU_SETUP="StGermain_Init(&argc, &argv);\nStgDomain_Init(&argc, &argv);\n" \
"StgFEM_Init(&argc, &argv);\nPICellerator_Init(&argc, &argv);\n\n" \
"#ifdef NOSHARED\n" \
diff -r eb3ff4560d4a -r 420e7ed7a877 SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c
--- a/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Fri Nov 12 16:00:52 2010 -0800
+++ b/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Wed May 11 13:26:28 2011 -0700
@@ -102,7 +102,7 @@ void* _AnalyticPressure_DefaultNew( Name
}
Index PICellerator_AnalyticPressure_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, AnalyticPressure_Type, (Name)"0", _AnalyticPressure_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, AnalyticPressure_Type, "0", _AnalyticPressure_DefaultNew );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/BuoyancyForceTerm.c
--- a/Utils/src/BuoyancyForceTerm.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/BuoyancyForceTerm.c Wed May 11 13:26:28 2011 -0700
@@ -227,7 +227,7 @@ void _BuoyancyForceTerm_Build( void* for
IntegrationPointsSwarm* swarm = (IntegrationPointsSwarm*)self->integrationSwarm;
MaterialPointsSwarm** materialSwarms;
Index materialSwarm_I;
- Name name;
+ char* name;
Stg_ComponentFactory* cf;
cf = self->context->CF;
@@ -244,7 +244,7 @@ void _BuoyancyForceTerm_Build( void* for
sizeof(BuoyancyForceTerm_MaterialExt) );
for ( material_I = 0 ; material_I < Materials_Register_GetCount( materials_Register ) ; material_I++) {
material = Materials_Register_GetByIndex( materials_Register, material_I );
- materialExt = ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
+ materialExt = (BuoyancyForceTerm_MaterialExt*)ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
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 );
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/BuoyancyForceTermThermoChem.c
--- a/Utils/src/BuoyancyForceTermThermoChem.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/BuoyancyForceTermThermoChem.c Wed May 11 13:26:28 2011 -0700
@@ -193,7 +193,7 @@ void _BuoyancyForceTermThermoChem_Build(
IntegrationPointsSwarm* swarm = (IntegrationPointsSwarm*)self->integrationSwarm;
MaterialPointsSwarm** materialSwarms;
Index materialSwarm_I;
- Name name;
+ char* name;
_ForceTerm_Build( self, data );
@@ -207,7 +207,7 @@ void _BuoyancyForceTermThermoChem_Build(
sizeof(BuoyancyForceTermThermoChem_MaterialExt) );
for ( material_I = 0 ; material_I < Materials_Register_GetCount( materials_Register ) ; material_I++) {
material = Materials_Register_GetByIndex( materials_Register, material_I );
- materialExt = ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
+ materialExt = (BuoyancyForceTermThermoChem_MaterialExt*)ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
materialExt->density = Dictionary_GetDouble_WithDefault( material->dictionary, (Dictionary_Entry_Key)"density", 0.0 );
}
@@ -333,7 +333,7 @@ void _BuoyancyForceTermThermoChem_Assemb
FeVariable_InterpolateFromMeshLocalCoord( temperatureField, mesh, lElement_I, xi, &temperature );
material = IntegrationPointsSwarm_GetMaterialOn( (IntegrationPointsSwarm*) swarm, particle );
- materialExt = ExtensionManager_Get( material->extensionMgr, material, self->materialExtHandle );
+ materialExt = (BuoyancyForceTermThermoChem_MaterialExt*)ExtensionManager_Get( material->extensionMgr, material, self->materialExtHandle );
/* Calculate Force */
RaT = BuoyancyForceTermThermoChem_CalcRaT( self, (Swarm*)swarm, lElement_I, particle );
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/DiffusionSMT.c
--- a/Utils/src/DiffusionSMT.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/DiffusionSMT.c Wed May 11 13:26:28 2011 -0700
@@ -94,7 +94,7 @@ void _DiffusionSMT_Init( void* matrixTer
void _DiffusionSMT_Delete( void* matrixTerm ) {
DiffusionSMT* self = (DiffusionSMT*)matrixTerm;
- int ii;
+ Index ii;
for(ii = 0; ii < self->materialSwarmCount; ii++)
Stg_Class_Delete( self->diffusionSwarmVariables[ii] );
@@ -147,14 +147,14 @@ void _DiffusionSMT_Build( void* matrixTe
void _DiffusionSMT_Build( void* matrixTerm, void* data ) {
DiffusionSMT* self = (DiffusionSMT*)matrixTerm;
AbstractContext* context;
- Stg_ComponentFactory* cf;
+ Stg_ComponentFactory* cf=NULL;
Materials_Register* materials_Register = self->materials_Register;
IntegrationPointsSwarm* swarm = (IntegrationPointsSwarm*)self->integrationSwarm;
MaterialPointsSwarm** materialSwarms;
DiffusionSMT_MaterialExt* materialExt;
- Name name;
+ char* name;
Material* material;
- int ii;
+ Index ii;
_StiffnessMatrixTerm_Build( self, data );
@@ -172,8 +172,8 @@ void _DiffusionSMT_Build( void* matrixTe
for ( ii = 0 ; ii < Materials_Register_GetCount( materials_Register ) ; ii++) {
material = Materials_Register_GetByIndex( materials_Register, ii );
- materialExt = ExtensionManager_GetFunc( material->extensionMgr, material,
- self->materialExtHandle );
+ materialExt = (DiffusionSMT_MaterialExt*)ExtensionManager_GetFunc( material->extensionMgr, material,
+ self->materialExtHandle );
if ( cf ) {
materialExt->diffusion = Stg_ComponentFactory_GetDouble( cf, material->name, (Dictionary_Entry_Key)"diffusivity", 0.0 );
@@ -208,7 +208,7 @@ void _DiffusionSMT_Build( void* matrixTe
void _DiffusionSMT_Initialise( void* matrixTerm, void* data ) {
DiffusionSMT* self = (DiffusionSMT*)matrixTerm;
- int ii;
+ Index ii;
_StiffnessMatrixTerm_Initialise( self, data );
@@ -222,7 +222,7 @@ void _DiffusionSMT_Execute( void* matrix
void _DiffusionSMT_Destroy( void* matrixTerm, void* data ) {
DiffusionSMT* self = (DiffusionSMT*)matrixTerm;
- int ii;
+ Index ii;
_StiffnessMatrixTerm_Destroy( matrixTerm, data );
for ( ii = 0; ii < self->materialSwarmCount; ++ii )
Stg_Component_Destroy( self->diffusionSwarmVariables[ii], data, False );
@@ -274,8 +274,7 @@ void _DiffusionSMT_AssembleElement(
material = IntegrationPointsSwarm_GetMaterialOn(
(IntegrationPointsSwarm*) swarm, currIntegrationPoint );
- materialExt = ExtensionManager_Get(
- material->extensionMgr, material, self->materialExtHandle );
+ materialExt = (DiffusionSMT_MaterialExt*)ExtensionManager_Get(material->extensionMgr, material, self->materialExtHandle );
xi = currIntegrationPoint->xi;
weight = currIntegrationPoint->weight;
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/HydrostaticTerm.c
--- a/Utils/src/HydrostaticTerm.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/HydrostaticTerm.c Wed May 11 13:26:28 2011 -0700
@@ -331,7 +331,6 @@ double HydrostaticTerm_Density( void* fo
double HydrostaticTerm_Density( void* forceTerm, Coord coord)
{
HydrostaticTerm *self=(HydrostaticTerm *)forceTerm;
- double h=self->height-coord[1];
double T, density, alpha;
double current_height, current_boundary;
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/Init.c
--- a/Utils/src/Init.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/Init.c Wed May 11 13:26:28 2011 -0700
@@ -56,9 +56,9 @@ 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, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentsRegister, PCDVC_Type, (Name)"0", _PCDVC_DefaultNew );
+ Stg_ComponentRegister_Add( componentsRegister, PCDVC_Type, "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 );
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/PCDVC.c
--- a/Utils/src/PCDVC.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/PCDVC.c Wed May 11 13:26:28 2011 -0700
@@ -137,7 +137,7 @@ PCDVC* PCDVC_New(
int ParticlesPerCell,
double Threshold )
{
- PCDVC *self = _PCDVC_DefaultNew( name );
+ PCDVC *self = (PCDVC*)_PCDVC_DefaultNew( name );
self->isConstructed = True;
_WeightsCalculator_Init( self, dim );
@@ -202,7 +202,7 @@ void _PCDVC_Print( void* pcdvc, Stream*
-void* _PCDVC_Copy( void* pcdvc, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _PCDVC_Copy( const void* pcdvc, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
PCDVC* self = (PCDVC*)pcdvc;
PCDVC* newPCDVC;
@@ -315,8 +315,8 @@ void _PCDVC_Execute( void* pcdvc, void*
If this function is being called ever, then some other module/component somewhere has messed up the mapping between the integration Swarm and the material Swarm*/
MaterialPointRef* getIntParticleMaterialRef_PointingToMaterialParticle( IntegrationPointsSwarm* intSwarm, Particle_Index matLastParticle_IndexOnCPU ){
IntegrationPoint* intTestParticle;
- MaterialPointRef* ref;
- int i;
+ MaterialPointRef* ref=NULL;
+ Index i;
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");
@@ -849,12 +849,12 @@ void _PCDVC_Calculate3D( void* pcdvc, vo
/************************************/
/************************************/
- int *VCsize;
- int **particleVoronoiCellList;
- int *count; // count of how many cells each particle owns in the Voronoi diagram.
+ int *VCsize=NULL;
+ int **particleVoronoiCellList=NULL;
+ int *count=NULL; // count of how many cells each particle owns in the Voronoi diagram.
int flag =0;
double FEMCEllspan = BBXMAX - BBXMIN;
- double dist;
+ double dist=0;
if(Inflow){
for(i=0;i<nump_orig;i++){
dist = (pList[i].cx - pList[i].x)*(pList[i].cx - pList[i].x) + (pList[i].cy - pList[i].y)*(pList[i].cy - pList[i].y) + (pList[i].cz - pList[i].z)*(pList[i].cz - pList[i].z);
@@ -1284,12 +1284,12 @@ void _PCDVC_Calculate2D( void* pcdvc, vo
/************************************/
/************************************/
// if(0){
- int *VCsize;
- int **particleVoronoiCellList;
- int *count; // count of how many cells each particle owns in the Voronoi diagram.
+ int *VCsize=NULL;
+ int **particleVoronoiCellList=NULL;
+ int *count=NULL; // count of how many cells each particle owns in the Voronoi diagram.
int flag =0;
double FEMCEllspan = BBXMAX - BBXMIN;
- double dist;
+ double dist=0;
if(Inflow){
for(i=0;i<nump_orig;i++){
dist = (pList[i].x-pList[i].cx)*(pList[i].x-pList[i].cx)+(pList[i].y-pList[i].cy)*(pList[i].y-pList[i].cy);;
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/src/PCDVC.h
--- a/Utils/src/PCDVC.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/src/PCDVC.h Wed May 11 13:26:28 2011 -0700
@@ -149,7 +149,7 @@ void _PCDVC_Print( void* pcdvc, Stream*
(PCDVC*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define PCDVC_DeepCopy( self ) \
(PCDVC*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _PCDVC_Copy( void* pcdvc, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _PCDVC_Copy( const void* pcdvc, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _PCDVC_DefaultNew( Name name ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 Utils/tests/PCDVCSuite.c
--- a/Utils/tests/PCDVCSuite.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Utils/tests/PCDVCSuite.c Wed May 11 13:26:28 2011 -0700
@@ -102,7 +102,7 @@ void PCDVCSuite_Teardown( PCDVCSuiteData
void PCDVCSuite_Teardown( PCDVCSuiteData* data ) {
}
-void compareAgainstReferenceSolution(PICelleratorContext* context, Stream* stream, double mean, double standardDeviation, char* expFile) {
+void compareAgainstReferenceSolution(PICelleratorContext* context, Stream* stream, double mean, double standardDeviation, Name expFile) {
double meanTolerance, stdDevTolerance;
double expectedMean, expectedStdDev;
char expectedFile[PCU_PATH_MAX];
@@ -124,7 +124,6 @@ void testElementIntegral_CircleInterface
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;
@@ -134,7 +133,7 @@ void testElementIntegral_CircleInterface
double errorSum = 0.0;
Index loop_I;
Index count = Dictionary_GetUnsignedInt_WithDefault( context->dictionary, "SampleSize", 5000 );
- void* data;
+ void* data=NULL;
IntegrationPoint* intParticle;
MaterialPoint* materialPoint;
/* Create FeVariable */
@@ -169,7 +168,7 @@ void testElementIntegral_CircleInterface
/* calling this function again causes a first iteration in Lloyd's algorithm for the Voronoi cells which we don't want here */
//WeightsCalculator_CalculateCell( weights, integrationSwarm, lElement_I );
if(loop_I%10 == 0){
- int i;
+ Index i;
for(i=0;i<integrationSwarm->cellParticleCountTbl[0];i++){
intParticle = (IntegrationPoint*)Swarm_ParticleInCellAt( integrationSwarm, 0, i );
@@ -201,7 +200,6 @@ void testElementIntegral_PolynomialFunct
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;
@@ -211,7 +209,7 @@ void testElementIntegral_PolynomialFunct
double errorSum = 0.0;
Index loop_I;
Index count = Dictionary_GetUnsignedInt_WithDefault( context->dictionary, "SampleSize", 5000 );
- void* data;
+ void* data=NULL;
/* Create FeVariable */
feVariable = FeVariable_New_Full(
@@ -265,7 +263,6 @@ void testElementIntegral_ExponentialInte
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;
@@ -275,7 +272,7 @@ void testElementIntegral_ExponentialInte
double errorSum = 0.0;
Index loop_I;
Index count = Dictionary_GetUnsignedInt_WithDefault( context->dictionary, "SampleSize", 5000 );
- void* data;
+ void* data=NULL;
/* Create FeVariable */
feVariable = FeVariable_New_Full(
@@ -336,21 +333,21 @@ void PCDVCSuite_Test( PCDVCSuiteData* da
pcu_filename_input( "testPCDVC.xml", inputFile );
/* rejigged this test to clean up after each run */
- context = _PICelleratorContext_DefaultNew( "context" );
+ context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
stgMainBuildAndInitialise( cf );
testElementIntegral_CircleInterface( context, &mean, &standardDeviation );
compareAgainstReferenceSolution(context, stream, mean, standardDeviation, "testPCDVC_CircleInterface.expected" );
stgMainDestroy( cf );
- context = _PICelleratorContext_DefaultNew( "context" );
+ context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
stgMainBuildAndInitialise( cf );
testElementIntegral_PolynomialFunction( context, &mean, &standardDeviation );
compareAgainstReferenceSolution(context, stream, mean, standardDeviation, "testPCDVC_PolynomialFunction.expected" );
stgMainDestroy( cf );
- context = _PICelleratorContext_DefaultNew( "context" );
+ context = (PICelleratorContext*)_PICelleratorContext_DefaultNew( "context" );
cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
stgMainBuildAndInitialise( cf );
testElementIntegral_ExponentialInterface( context, &mean, &standardDeviation );
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/ConstantWeights.c
--- a/Weights/src/ConstantWeights.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/ConstantWeights.c Wed May 11 13:26:28 2011 -0700
@@ -64,7 +64,7 @@ const Type ConstantWeights_Type = "Const
*/
ConstantWeights* ConstantWeights_New( Name name, int dim ) {
- ConstantWeights *self = _ConstantWeights_DefaultNew( name );
+ ConstantWeights *self = (ConstantWeights*)_ConstantWeights_DefaultNew( name );
self->isConstructed = True;
_WeightsCalculator_Init( self, dim );
@@ -115,7 +115,7 @@ void _ConstantWeights_Print( void* const
-void* _ConstantWeights_Copy( void* constantWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ConstantWeights_Copy( const void* constantWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
ConstantWeights* self = (ConstantWeights*)constantWeights;
ConstantWeights* newConstantWeights;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/ConstantWeights.h
--- a/Weights/src/ConstantWeights.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/ConstantWeights.h Wed May 11 13:26:28 2011 -0700
@@ -96,7 +96,7 @@
#define ConstantWeights_DeepCopy( self ) \
(ConstantWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _ConstantWeights_Copy( void* constantWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ConstantWeights_Copy( const void* constantWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _ConstantWeights_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/DVCWeights.c
--- a/Weights/src/DVCWeights.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/DVCWeights.c Wed May 11 13:26:28 2011 -0700
@@ -80,7 +80,7 @@ const Type DVCWeights_Type = "DVCWeights
** Constructors
*/
DVCWeights* DVCWeights_New( Name name, Dimension_Index dim, int *res ) {
- DVCWeights *self = _DVCWeights_DefaultNew( name );
+ DVCWeights *self = (DVCWeights*)_DVCWeights_DefaultNew( name );
self->isConstructed = True;
_WeightsCalculator_Init( self, dim );
@@ -131,7 +131,7 @@ void _DVCWeights_Print( void* dvcWeights
-void* _DVCWeights_Copy( void* dvcWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _DVCWeights_Copy( const void* dvcWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
DVCWeights* self = (DVCWeights*)dvcWeights;
DVCWeights* newDVCWeights;
@@ -502,7 +502,7 @@ void _DVCWeights_ConstructGrid(struct ce
int i,j,k;
double dx,dy,dz,Dx,Dy,Dz,X,Y,Z;
- cells = malloc(n*m*l*sizeof(struct cell));
+ cells = (struct cell*)malloc(n*m*l*sizeof(struct cell));
for(i=0;i<l*m*n;i++){
cells[i].S = -2;
cells[i].N = -2;
@@ -559,7 +559,7 @@ void _DVCWeights_ConstructGrid2D(struct
int i,j;
double dx,dy,Dx,Dy,X,Y;
- cells = malloc(m*l*sizeof(struct cell));
+ cells = (struct cell2d*)malloc(m*l*sizeof(struct cell));
for(i=0;i<l*m;i++){
cells[i].S = -2;
cells[i].N = -2;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/DVCWeights.h
--- a/Weights/src/DVCWeights.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/DVCWeights.h Wed May 11 13:26:28 2011 -0700
@@ -253,7 +253,7 @@ void _DVCWeights_Print( void* dvcWeights
(DVCWeights*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define DVCWeights_DeepCopy( self ) \
(DVCWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _DVCWeights_Copy( void* dvcWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _DVCWeights_Copy( const void* dvcWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _DVCWeights_DefaultNew( Name name ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/IterativeWeights.c
--- a/Weights/src/IterativeWeights.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/IterativeWeights.c Wed May 11 13:26:28 2011 -0700
@@ -124,7 +124,7 @@ void _IterativeWeights_Print( void* iter
-void* _IterativeWeights_Copy( void* iterativeWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _IterativeWeights_Copy( const void* iterativeWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
IterativeWeights* self = (IterativeWeights*)iterativeWeights;
IterativeWeights* newIterativeWeights;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/IterativeWeights.h
--- a/Weights/src/IterativeWeights.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/IterativeWeights.h Wed May 11 13:26:28 2011 -0700
@@ -96,7 +96,7 @@
#define IterativeWeights_DeepCopy( self ) \
(IterativeWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _IterativeWeights_Copy( void* iterativeWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _IterativeWeights_Copy( const void* iterativeWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _IterativeWeights_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/MomentBalanceWeights.c
--- a/Weights/src/MomentBalanceWeights.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/MomentBalanceWeights.c Wed May 11 13:26:28 2011 -0700
@@ -65,7 +65,7 @@ const Type MomentBalanceWeights_Type = "
*/
MomentBalanceWeights* MomentBalanceWeights_New( Name name, Dimension_Index dim, WeightsCalculator* backupWeights ) {
- MomentBalanceWeights* self = _MomentBalanceWeights_DefaultNew( name );
+ MomentBalanceWeights* self = (MomentBalanceWeights*)_MomentBalanceWeights_DefaultNew( name );
self->isConstructed = True;
_WeightsCalculator_Init( self, dim );
@@ -122,7 +122,7 @@ void _MomentBalanceWeights_Print( void*
_WeightsCalculator_Print( self, stream );
}
-void* _MomentBalanceWeights_Copy( void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _MomentBalanceWeights_Copy( const void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
MomentBalanceWeights* newMomentBalanceWeights;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/MomentBalanceWeights.h
--- a/Weights/src/MomentBalanceWeights.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/MomentBalanceWeights.h Wed May 11 13:26:28 2011 -0700
@@ -100,7 +100,7 @@ extern const Type MomentBalanceWeights_T
void _MomentBalanceWeights_Init( void* momentBalanceWeights, WeightsCalculator* backupWeights );
- void* _MomentBalanceWeights_Copy( void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _MomentBalanceWeights_Copy( const void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _MomentBalanceWeights_DefaultNew( Name name );
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/VolumeWeights.c
--- a/Weights/src/VolumeWeights.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/VolumeWeights.c Wed May 11 13:26:28 2011 -0700
@@ -43,7 +43,7 @@ const Type VolumeWeights_Type = "VolumeW
** Constructors
*/
VolumeWeights* VolumeWeights_New( Name name, Dimension_Index dim, Stg_Shape* shape, FeMesh* mesh ) {
- VolumeWeights *self = _VolumeWeights_DefaultNew( name );
+ VolumeWeights *self = (VolumeWeights*)_VolumeWeights_DefaultNew( name );
self->isConstructed = True;
_WeightsCalculator_Init( self, dim );
@@ -95,7 +95,7 @@ void _VolumeWeights_Print( void* weights
-void* _VolumeWeights_Copy( void* weights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _VolumeWeights_Copy( const void* weights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
VolumeWeights* self = (VolumeWeights*)weights;
VolumeWeights* newVolumeWeights;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/VolumeWeights.h
--- a/Weights/src/VolumeWeights.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/VolumeWeights.h Wed May 11 13:26:28 2011 -0700
@@ -76,7 +76,7 @@ void _VolumeWeights_Print( void* weights
(VolumeWeights*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define VolumeWeights_DeepCopy( self ) \
(VolumeWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _VolumeWeights_Copy( void* weights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _VolumeWeights_Copy( const void* weights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _VolumeWeights_DefaultNew( Name name ) ;
void _VolumeWeights_AssignFromXML( void* weights, Stg_ComponentFactory* cf, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/WeightsCalculator.c
--- a/Weights/src/WeightsCalculator.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/WeightsCalculator.c Wed May 11 13:26:28 2011 -0700
@@ -105,7 +105,7 @@ void _WeightsCalculator_Print( void* wei
}
-void* _WeightsCalculator_Copy( void* weightsCalculator, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _WeightsCalculator_Copy( const void* weightsCalculator, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
WeightsCalculator* self = (WeightsCalculator*)weightsCalculator;
WeightsCalculator* newWeightsCalculator;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/src/WeightsCalculator.h
--- a/Weights/src/WeightsCalculator.h Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/src/WeightsCalculator.h Wed May 11 13:26:28 2011 -0700
@@ -102,7 +102,7 @@ extern const Type WeightsCalculator_Type
(WeightsCalculator*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define WeightsCalculator_DeepCopy( self ) \
(WeightsCalculator*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _WeightsCalculator_Copy( void* self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _WeightsCalculator_Copy( const void* self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _WeightsCalculator_AssignFromXML( void* self, Stg_ComponentFactory* cf, void* data ) ;
void _WeightsCalculator_Build( void* self, void* data ) ;
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/tests/ConstantWeightsSuite.c
--- a/Weights/tests/ConstantWeightsSuite.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/tests/ConstantWeightsSuite.c Wed May 11 13:26:28 2011 -0700
@@ -106,7 +106,7 @@ void WeightsSuite_TestElementIntegral(
double mean;
double standardDeviation;
Index loop_I;
- void* data;
+ void* data=NULL;
double differenceMean, differenceStdDev;
/* Create FeVariable */
diff -r eb3ff4560d4a -r 420e7ed7a877 Weights/tests/DVCWeightsSuite.c
--- a/Weights/tests/DVCWeightsSuite.c Fri Nov 12 16:00:52 2010 -0800
+++ b/Weights/tests/DVCWeightsSuite.c Wed May 11 13:26:28 2011 -0700
@@ -109,7 +109,7 @@ void DVCWeightsSuite_TestConstructGrid(
void DVCWeightsSuite_TestConstructGrid( DVCWeightsSuiteData* data ) {
FILE *fp;
unsigned int ii=0;
- const char* gridFilename = "DVCWeightsSuite_testConstructGrid.txt";
+ Name gridFilename = "DVCWeightsSuite_testConstructGrid.txt";
char expectedGridFilename[PCU_PATH_MAX];
//int passed=0;
char line[100];
@@ -179,7 +179,7 @@ void DVCWeightsSuite_TestResetGrid( DVCW
void _DVCWeightsSuite_InitialiseParticleCoords( DVCWeightsSuiteData* data ) {
- int i;
+ Index i;
/*Initialise particle coords */
@@ -229,7 +229,7 @@ void _DVCWeightsSuite_InitialiseParticle
void DVCWeightsSuite_TestCreateVoronoi( DVCWeightsSuiteData* data ) {
- int i;
+ Index i;
_DVCWeights_ConstructGrid(&data->cells, data->numz, data->numy, data->numx, BBXMIN,BBYMIN,BBZMIN,BBXMAX,BBYMAX,BBZMAX);
_DVCWeights_InitialiseStructs( &data->bchain, &data->pList, data->nump);
@@ -259,7 +259,7 @@ void DVCWeightsSuite_TestGetCentroids( D
void DVCWeightsSuite_TestGetCentroids( DVCWeightsSuiteData* data ) {
FILE *fp;
unsigned int i;
- const char* centroidsFilename = "DVCWeightsSuite_testGetCentroids.txt";
+ Name centroidsFilename = "DVCWeightsSuite_testGetCentroids.txt";
char expectedCentroidsFilename[PCU_PATH_MAX];
char line[100];
float x,y,z,dx,dy,dz;
@@ -333,7 +333,7 @@ void DVCWeightsSuite_TestConstructGrid2D
void DVCWeightsSuite_TestConstructGrid2D( DVCWeightsSuiteData* data ) {
FILE *fp;
unsigned int ii=0;
- const char* gridFilename = "DVCWeightsSuite_testConstructGrid2D.txt";
+ Name gridFilename = "DVCWeightsSuite_testConstructGrid2D.txt";
char expectedGridFilename[PCU_PATH_MAX];
char line[100];
float x,y,dx,dy;
@@ -394,7 +394,7 @@ void DVCWeightsSuite_TestResetGrid2D( DV
}
void _DVCWeightsSuite_InitialiseParticleCoords2D( DVCWeightsSuiteData* data ) {
- int i;
+ Index i;
/*Initialise particle coords */
i=0;
@@ -432,7 +432,7 @@ void _DVCWeightsSuite_InitialiseParticle
void DVCWeightsSuite_TestCreateVoronoi2D( DVCWeightsSuiteData* data ) {
- int i;
+ Index i;
_DVCWeights_ConstructGrid2D(&data->cells2D,data->numy,data->numx, BBXMIN,BBYMIN,BBXMAX,BBYMAX);
_DVCWeights_InitialiseStructs2D( &data->bchain2D, &data->pList2D, data->nump2D);
@@ -462,7 +462,7 @@ void DVCWeightsSuite_TestGetCentroids2D(
void DVCWeightsSuite_TestGetCentroids2D( DVCWeightsSuiteData* data ) {
FILE *fp;
unsigned int i;
- const char* centroidsFilename = "DVCWeightsSuite_testGetCentroids2D.txt";
+ Name centroidsFilename = "DVCWeightsSuite_testGetCentroids2D.txt";
char expectedCentroidsFilename[PCU_PATH_MAX];
char line[100];
float x,y,dx,dy;
diff -r eb3ff4560d4a -r 420e7ed7a877 libPICellerator/Toolbox/Toolbox.c
--- a/libPICellerator/Toolbox/Toolbox.c Fri Nov 12 16:00:52 2010 -0800
+++ b/libPICellerator/Toolbox/Toolbox.c Wed May 11 13:26:28 2011 -0700
@@ -75,7 +75,7 @@ void PICellerator_Toolbox_Finalise( Plug
}
Index PICellerator_Toolbox_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, PICellerator_Toolbox_Type, (Name)"0", _PICellerator_Toolbox_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, PICellerator_Toolbox_Type, (Name)"0", _PICellerator_Toolbox_DefaultNew );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 libPICellerator/tests/LibPICelleratorSuite.c
--- a/libPICellerator/tests/LibPICelleratorSuite.c Fri Nov 12 16:00:52 2010 -0800
+++ b/libPICellerator/tests/LibPICelleratorSuite.c Wed May 11 13:26:28 2011 -0700
@@ -26,7 +26,7 @@ void LibPICelleratorSuite_Teardown( LibP
void LibPICelleratorSuite_TestDirectoryStGermain( LibPICelleratorSuiteData* data ) {
Stg_Object* testDirectoryStGermain;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
+ testDirectoryStGermain = (Stg_Object*)Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
pcu_check_true( testDirectoryStGermain != NULL );
}
@@ -34,8 +34,8 @@ void LibPICelleratorSuite_TestDirectoryS
Stg_Object* testDirectoryStGermain;
Stg_Object* testDirectoryStgFEM;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
- testDirectoryStgFEM= Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StgFEM" );
+ testDirectoryStGermain = (Stg_Object*)Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
+ testDirectoryStgFEM= (Stg_Object*)Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StgFEM" );
pcu_check_true( ( strcmp((char* )LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryStgFEM != NULL ) );
}
@@ -44,8 +44,8 @@ void LibPICelleratorSuite_TestDirectoryP
Stg_Object* testDirectoryStGermain;
Stg_Object* testDirectoryPICellerator;
- testDirectoryStGermain = Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
- testDirectoryPICellerator= Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"PICellerator" );
+ testDirectoryStGermain = (Stg_Object*)Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"StGermain" );
+ testDirectoryPICellerator= (Stg_Object*)Stg_ObjectList_Get( Project_XMLSearchPaths, (Name)"PICellerator" );
pcu_check_true( ( strcmp((char* )LIB_DIR, (char*)testDirectoryStGermain) ) || ( testDirectoryPICellerator != NULL ) );
}
diff -r eb3ff4560d4a -r 420e7ed7a877 plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
--- a/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Fri Nov 12 16:00:52 2010 -0800
+++ b/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Wed May 11 13:26:28 2011 -0700
@@ -73,7 +73,7 @@ void _PICellerator_CalculateParticleDisp
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,
+ particleExt = (ParticleDisplacementInfo*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle,
self->particleDisplacementInfo_Handle );
self->particleOriginalCoordSwarmVariable = Swarm_NewVectorVariable( materialPointsSwarm, (Name)"OriginalCoord", (ArithPointer) &particleExt->originalCoord - (ArithPointer) &particle,
@@ -119,7 +119,7 @@ void _PICellerator_CalculateParticleDisp
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
- particleDisplacementInfo = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr,
+ particleDisplacementInfo = (ParticleDisplacementInfo*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr,
particle, self->particleDisplacementInfo_Handle );
originalCoord = particleDisplacementInfo->originalCoord;
@@ -148,7 +148,7 @@ void _PICellerator_CalculateParticleDisp
for ( lParticle_I = 0 ; lParticle_I < materialPointsSwarm->particleLocalCount ; lParticle_I++ ) {
particle = (GlobalParticle* )Swarm_ParticleAt( materialPointsSwarm, lParticle_I );
coord = particle->coord;
- particleDisplacementInfo = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle,
+ particleDisplacementInfo = (ParticleDisplacementInfo*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, particle,
self->particleDisplacementInfo_Handle );
originalCoord = particleDisplacementInfo->originalCoord;
@@ -183,7 +183,7 @@ Index PICellerator_CalculateParticleDisp
Index PICellerator_CalculateParticleDisplacement_Register( PluginsManager* pluginsManager ) {
Index result;
- result = PluginsManager_Submit( pluginsManager, PICellerator_CalculateParticleDisplacement_Type, (Name)"0", _PICellerator_CalculateParticleDisplacement_DefaultNew );
+ result = PluginsManager_Submit( pluginsManager, PICellerator_CalculateParticleDisplacement_Type, "0", _PICellerator_CalculateParticleDisplacement_DefaultNew );
return result;
}
diff -r eb3ff4560d4a -r 420e7ed7a877 plugins/Output/MaterialCentroid/MaterialCentroid.c
--- a/plugins/Output/MaterialCentroid/MaterialCentroid.c Fri Nov 12 16:00:52 2010 -0800
+++ b/plugins/Output/MaterialCentroid/MaterialCentroid.c Wed May 11 13:26:28 2011 -0700
@@ -60,9 +60,9 @@ void MaterialCentroid( PICelleratorConte
Stream* stream = Journal_Register( Info_Type, (Name)"MaterialCentroid" );
if (!beenHere ) {
- Name swarmName;
- Name materialName;
- Name filename;
+ char* swarmName;
+ char* materialName;
+ char* filename;
Bool fileOpened;
Stream* errorStream = Journal_Register( Error_Type, (Name)CURR_MODULE_NAME );
More information about the CIG-COMMITS
mailing list