[cig-commits] commit: Minor changes to code lines causing compile warnings.
Mercurial
hg at geodynamics.org
Mon Feb 1 15:30:40 PST 2010
changeset: 317:4801a60eda49
branch: pcu_rejig
user: JericoRevote
date: Wed Nov 18 18:23:22 2009 +1100
files: MaterialPoints/src/SwarmVariableField.c MaterialPoints/tests/PeriodicBoundariesManagerSuite.c Utils/src/BuoyancyForceTerm.c Utils/src/BuoyancyForceTerm.h Utils/src/DiffusionSMT.c Utils/src/DiffusionSMT.h Weights/src/MomentBalanceWeights.c Weights/src/MomentBalanceWeights.h plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
description:
Minor changes to code lines causing compile warnings.
diff -r 22a9f568d844 -r 4801a60eda49 MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c Wed Nov 18 16:00:48 2009 +1100
+++ b/MaterialPoints/src/SwarmVariableField.c Wed Nov 18 18:23:22 2009 +1100
@@ -180,7 +180,6 @@ void _SwarmVariableField_AssignFromXML(
assert( integrationSwarm );
_SwarmVariableField_Init( self, swarmVar, variable_Register );
- _ParticleFeVariable_Init( self, integrationSwarm );
}
void _SwarmVariableField_Build( void* swarmVariableField, void* data ) {
diff -r 22a9f568d844 -r 4801a60eda49 MaterialPoints/tests/PeriodicBoundariesManagerSuite.c
--- a/MaterialPoints/tests/PeriodicBoundariesManagerSuite.c Wed Nov 18 16:00:48 2009 +1100
+++ b/MaterialPoints/tests/PeriodicBoundariesManagerSuite.c Wed Nov 18 18:23:22 2009 +1100
@@ -66,7 +66,7 @@ void PeriodicBoundariesManagerSuite_Setu
pcu_filename_input( "testPeriodicBoundariesManager.xml", xmlInputFilename );
data->cf = stgMainInitFromXML( xmlInputFilename, MPI_COMM_WORLD, NULL );
- data->context = LiveComponentRegister_Get( data->cf->LCRegister, "context" );
+ data->context = (PICelleratorContext*)LiveComponentRegister_Get( data->cf->LCRegister, "context" );
}
diff -r 22a9f568d844 -r 4801a60eda49 Utils/src/BuoyancyForceTerm.c
--- a/Utils/src/BuoyancyForceTerm.c Wed Nov 18 16:00:48 2009 +1100
+++ b/Utils/src/BuoyancyForceTerm.c Wed Nov 18 18:23:22 2009 +1100
@@ -124,12 +124,14 @@ BuoyancyForceTerm* _BuoyancyForceTerm_Ne
}
void _BuoyancyForceTerm_Init(
- BuoyancyForceTerm* self,
+ void* forceTerm,
FeVariable* temperatureField,
double gravity,
Bool adjust,
Materials_Register* materials_Register )
{
+ BuoyancyForceTerm* self = (BuoyancyForceTerm*)forceTerm;
+
self->temperatureField = temperatureField;
self->gravity = gravity;
self->gHat = NULL;
@@ -264,7 +266,7 @@ void _BuoyancyForceTerm_Build( void* for
name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Density" );
self->densitySwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
name,
- self->context,
+ (AbstractContext*)self->context,
materialSwarms[materialSwarm_I],
1,
self->materials_Register,
@@ -275,7 +277,7 @@ void _BuoyancyForceTerm_Build( void* for
name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Alpha" );
self->alphaSwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
name,
- self->context,
+ (AbstractContext*)self->context,
materialSwarms[materialSwarm_I],
1,
self->materials_Register,
diff -r 22a9f568d844 -r 4801a60eda49 Utils/src/BuoyancyForceTerm.h
--- a/Utils/src/BuoyancyForceTerm.h Wed Nov 18 16:00:48 2009 +1100
+++ b/Utils/src/BuoyancyForceTerm.h Wed Nov 18 18:23:22 2009 +1100
@@ -100,6 +100,13 @@
ForceTerm_AssembleElementFunction* _assembleElement,
BuoyancyForceTerm_CalcGravityFunction* _calcGravity,
Name name );
+
+ void _BuoyancyForceTerm_Init(
+ void* forceTerm,
+ FeVariable* temperatureField,
+ double gravity,
+ Bool adjust,
+ Materials_Register* materials_Register );
void _BuoyancyForceTerm_Delete( void* forceTerm );
diff -r 22a9f568d844 -r 4801a60eda49 Utils/src/DiffusionSMT.c
--- a/Utils/src/DiffusionSMT.c Wed Nov 18 16:00:48 2009 +1100
+++ b/Utils/src/DiffusionSMT.c Wed Nov 18 18:23:22 2009 +1100
@@ -112,7 +112,8 @@ DiffusionSMT* _DiffusionSMT_New(
return self;
}
-void _DiffusionSMT_Init( DiffusionSMT* self ) {
+void _DiffusionSMT_Init( void* matrixTerm ) {
+ DiffusionSMT* self = (DiffusionSMT*)matrixTerm;
}
void _DiffusionSMT_Delete( void* matrixTerm ) {
@@ -214,7 +215,7 @@ void _DiffusionSMT_Build( void* matrixTe
name = Stg_Object_AppendSuffix( materialSwarms[ii], "diffusivity" );
self->diffusionSwarmVariables[ii] = MaterialSwarmVariable_New(
name,
- self->context,
+ (AbstractContext*) self->context,
materialSwarms[ii],
1,
self->materials_Register,
diff -r 22a9f568d844 -r 4801a60eda49 Utils/src/DiffusionSMT.h
--- a/Utils/src/DiffusionSMT.h Wed Nov 18 16:00:48 2009 +1100
+++ b/Utils/src/DiffusionSMT.h Wed Nov 18 18:23:22 2009 +1100
@@ -44,63 +44,71 @@
/** Textual name of this class */
extern const Type DiffusionSMT_Type;
-typedef struct {
- double diffusion;
-} DiffusionSMT_MaterialExt;
+ typedef struct {
+ double diffusion;
+ } DiffusionSMT_MaterialExt;
-/** DiffusionSMT class contents */
-#define __DiffusionSMT \
- /* General info */ \
- __StiffnessMatrixTerm \
- \
- /* Virtual info */ \
- \
- /* DiffusionSMT info */ \
- \
- Materials_Register* materials_Register; \
- ExtensionInfo_Index materialExtHandle; \
- MaterialSwarmVariable** diffusionSwarmVariables; \
- Index materialSwarmCount;
+ /** DiffusionSMT class contents */
+ #define __DiffusionSMT \
+ /* General info */ \
+ __StiffnessMatrixTerm \
+ \
+ /* Virtual info */ \
+ \
+ /* DiffusionSMT info */ \
+ \
+ Materials_Register* materials_Register; \
+ ExtensionInfo_Index materialExtHandle; \
+ MaterialSwarmVariable** diffusionSwarmVariables; \
+ Index materialSwarmCount;
-struct DiffusionSMT { __DiffusionSMT };
+ struct DiffusionSMT { __DiffusionSMT };
-DiffusionSMT* DiffusionSMT_New(
- Name name,
- FiniteElementContext* context,
- StiffnessMatrix* stiffnessMatrix,
- Swarm* integrationSwarm );
+ DiffusionSMT* DiffusionSMT_New(
+ Name name,
+ FiniteElementContext* context,
+ StiffnessMatrix* stiffnessMatrix,
+ Swarm* integrationSwarm );
-DiffusionSMT* _DiffusionSMT_New(
- SizeT sizeOfSelf,
- Type type,
- Stg_Class_DeleteFunction* _delete,
- Stg_Class_PrintFunction* _print,
- Stg_Class_CopyFunction* _copy,
- Stg_Component_DefaultConstructorFunction* _defaultConstructor,
- Stg_Component_ConstructFunction* _construct,
- Stg_Component_BuildFunction* _build,
- Stg_Component_InitialiseFunction* _initialise,
- Stg_Component_ExecuteFunction* _execute,
- Stg_Component_DestroyFunction* _destroy,
- StiffnessMatrixTerm_AssembleElementFunction* _assembleElement,
- Name name );
+ DiffusionSMT* _DiffusionSMT_New(
+ SizeT sizeOfSelf,
+ Type type,
+ Stg_Class_DeleteFunction* _delete,
+ Stg_Class_PrintFunction* _print,
+ Stg_Class_CopyFunction* _copy,
+ Stg_Component_DefaultConstructorFunction* _defaultConstructor,
+ Stg_Component_ConstructFunction* _construct,
+ Stg_Component_BuildFunction* _build,
+ Stg_Component_InitialiseFunction* _initialise,
+ Stg_Component_ExecuteFunction* _execute,
+ Stg_Component_DestroyFunction* _destroy,
+ StiffnessMatrixTerm_AssembleElementFunction* _assembleElement,
+ Name name );
+
+ void _DiffusionSMT_Init( void* matrixTerm );
-void _DiffusionSMT_Delete( void* matrixTerm );
-void _DiffusionSMT_Print( void* matrixTerm, Stream* stream );
+ void _DiffusionSMT_Delete( void* matrixTerm );
-void* _DiffusionSMT_DefaultNew( Name name ) ;
-void _DiffusionSMT_AssignFromXML( void* matrixTerm, Stg_ComponentFactory* cf, void* data ) ;
-void _DiffusionSMT_Build( void* matrixTerm, void* data ) ;
-void _DiffusionSMT_Initialise( void* matrixTerm, void* data ) ;
-void _DiffusionSMT_Execute( void* matrixTerm, void* data ) ;
-void _DiffusionSMT_Destroy( void* matrixTerm, void* data ) ;
+ void _DiffusionSMT_Print( void* matrixTerm, Stream* stream );
-void _DiffusionSMT_AssembleElement(
- void* matrixTerm,
- StiffnessMatrix* stiffnessMatrix,
- Element_LocalIndex lElement_I,
- SystemLinearEquations* sle,
- FiniteElementContext* context,
- double** elStiffMat ) ;
+ void* _DiffusionSMT_DefaultNew( Name name );
+
+ void _DiffusionSMT_AssignFromXML( void* matrixTerm, Stg_ComponentFactory* cf, void* data );
+
+ void _DiffusionSMT_Build( void* matrixTerm, void* data );
+
+ void _DiffusionSMT_Initialise( void* matrixTerm, void* data );
+
+ void _DiffusionSMT_Execute( void* matrixTerm, void* data );
+
+ void _DiffusionSMT_Destroy( void* matrixTerm, void* data );
+
+ void _DiffusionSMT_AssembleElement(
+ void* matrixTerm,
+ StiffnessMatrix* stiffnessMatrix,
+ Element_LocalIndex lElement_I,
+ SystemLinearEquations* sle,
+ FiniteElementContext* context,
+ double** elStiffMat ) ;
#endif
diff -r 22a9f568d844 -r 4801a60eda49 Weights/src/MomentBalanceWeights.c
--- a/Weights/src/MomentBalanceWeights.c Wed Nov 18 16:00:48 2009 +1100
+++ b/Weights/src/MomentBalanceWeights.c Wed Nov 18 18:23:22 2009 +1100
@@ -98,9 +98,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, self->type ), "%s only works in 2D.\n", self->type );
}
diff -r 22a9f568d844 -r 4801a60eda49 Weights/src/MomentBalanceWeights.h
--- a/Weights/src/MomentBalanceWeights.h Wed Nov 18 16:00:48 2009 +1100
+++ b/Weights/src/MomentBalanceWeights.h Wed Nov 18 18:23:22 2009 +1100
@@ -56,49 +56,58 @@
/* Textual name of this class */
extern const Type MomentBalanceWeights_Type;
-/* MomentBalanceWeights information */
-#define __MomentBalanceWeights \
- /* General info */ \
- __WeightsCalculator \
- \
- /* Virtual Info */ \
- WeightsCalculator* backupWeights; \
- Bool freeBackupWeights;
+ /* MomentBalanceWeights information */
+ #define __MomentBalanceWeights \
+ /* General info */ \
+ __WeightsCalculator \
+ \
+ /* Virtual Info */ \
+ WeightsCalculator* backupWeights; \
+ Bool freeBackupWeights;
-struct MomentBalanceWeights { __MomentBalanceWeights };
+ struct MomentBalanceWeights { __MomentBalanceWeights };
-/*---------------------------------------------------------------------------------------------------------------------
-** Constructors
-*/
+ #define MOMENTBALANCEWEIGHTS_DEFARGS \
+ WEIGHTSCALCULATOR_DEFARGS, \
+ WeightsCalculator* backupWeights
-#define MOMENTBALANCEWEIGHTS_DEFARGS \
- WEIGHTSCALCULATOR_DEFARGS, \
- WeightsCalculator* backupWeights
+ #define MOMENTBALANCEWEIGHTS_PASSARGS \
+ WEIGHTSCALCULATOR_PASSARG, \
+ backupWeights
-#define MOMENTBALANCEWEIGHTS_PASSARGS \
- WEIGHTSCALCULATOR_PASSARG, \
- backupWeights
+ /*---------------------------------------------------------------------------------------------------------------------
+ ** Constructors
+ */
-MomentBalanceWeights* MomentBalanceWeights_New( Name name, Dimension_Index dim, WeightsCalculator* backupWeights );
+ MomentBalanceWeights* MomentBalanceWeights_New( Name name, Dimension_Index dim, WeightsCalculator* backupWeights );
-MomentBalanceWeights* _MomentBalanceWeights_New( MOMENTBALANCEWEIGHTS_DEFARGS );
+ MomentBalanceWeights* _MomentBalanceWeights_New( MOMENTBALANCEWEIGHTS_DEFARGS );
-/* Stg_Class implementation */
-void _MomentBalanceWeights_Delete( void* momentBalanceWeights );
-void _MomentBalanceWeights_Print( void* momentBalanceWeights, Stream* stream );
-#define MomentBalanceWeights_Copy( self ) \
- (MomentBalanceWeights*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
-#define MomentBalanceWeights_DeepCopy( self ) \
- (MomentBalanceWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _MomentBalanceWeights_Copy( void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ /* Stg_Class implementation */
+ void _MomentBalanceWeights_Delete( void* momentBalanceWeights );
+
+ void _MomentBalanceWeights_Print( void* momentBalanceWeights, Stream* stream );
+
+ #define MomentBalanceWeights_Copy( self ) \
+ (MomentBalanceWeights*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
+ #define MomentBalanceWeights_DeepCopy( self ) \
+ (MomentBalanceWeights*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
+
+ void _MomentBalanceWeights_Init( void* momentBalanceWeights, WeightsCalculator* backupWeights );
+
+ void* _MomentBalanceWeights_Copy( void* momentBalanceWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
-void* _MomentBalanceWeights_DefaultNew( Name name ) ;
-void _MomentBalanceWeights_AssignFromXML( void* momentBalanceWeights, Stg_ComponentFactory* cf, void* data ) ;
-void _MomentBalanceWeights_Build( void* momentBalanceWeights, void* data ) ;
-void _MomentBalanceWeights_Initialise( void* momentBalanceWeights, void* data ) ;
-void _MomentBalanceWeights_Execute( void* momentBalanceWeights, void* data );
+ void* _MomentBalanceWeights_DefaultNew( Name name );
+
+ void _MomentBalanceWeights_AssignFromXML( void* momentBalanceWeights, Stg_ComponentFactory* cf, void* data );
+
+ void _MomentBalanceWeights_Build( void* momentBalanceWeights, void* data );
+
+ void _MomentBalanceWeights_Initialise( void* momentBalanceWeights, void* data );
+
+ void _MomentBalanceWeights_Execute( void* momentBalanceWeights, void* data );
-void _MomentBalanceWeights_Calculate( void* momentBalanceWeights, void* _swarm, Cell_LocalIndex lCell_I ) ;
+ void _MomentBalanceWeights_Calculate( void* momentBalanceWeights, void* _swarm, Cell_LocalIndex lCell_I );
/*---------------------------------------------------------------------------------------------------------------------
** Private functions
diff -r 22a9f568d844 -r 4801a60eda49 plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
--- a/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Wed Nov 18 16:00:48 2009 +1100
+++ b/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Wed Nov 18 18:23:22 2009 +1100
@@ -103,7 +103,7 @@ void _PICellerator_CalculateParticleDisp
you give, so we have to add it manually here */
self->particleDisplacementMagSwarmVariable = OperatorSwarmVariable_NewUnary(
"materialSwarm-DisplacementMagnitude",
- context,
+ (AbstractContext*)context,
self->particleDisplacementSwarmVariable,
"Magnitude" );
More information about the CIG-COMMITS
mailing list