[cig-commits] commit: Make it compile with C++ and C compilers
Mercurial
hg at geodynamics.org
Wed May 11 14:50:57 PDT 2011
changeset: 861:038180046f6f
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Wed May 11 13:27:52 2011 -0700
files: Rheology/src/ConstitutiveMatCartesian_Refactored.c Rheology/src/ConstitutiveMat_Refactored.c Rheology/src/ConstitutiveMat_Refactored.h Rheology/src/ConstitutiveMatrix.c Rheology/src/ConstitutiveMatrix.h Rheology/src/ConstitutiveMatrixCartesian.c Rheology/src/DepthDependentViscosity.c Rheology/src/Director.c Rheology/src/DruckerPrager.c Rheology/src/FaultingMoresiMuhlhaus2006.c Rheology/src/MultiRheologyMaterial.c Rheology/src/Pouliquen_etal.c Rheology/src/RheologyClass.c Rheology/src/RheologyClass.h Rheology/src/RheologyMaterial.c Rheology/src/RheologyMaterial.h Rheology/src/StoreStress.c Rheology/src/StoreViscosity.c Rheology/src/StrainWeakening.c Rheology/src/YieldRheology.c Rheology/src/YieldRheology.h SConscript SysTest/AnalyticPlugins/Velic_solA/Analytic_solA.c SysTest/AnalyticPlugins/Velic_solB/Analytic_solB.c SysTest/AnalyticPlugins/Velic_solS/Analytic_solS.c Utils/src/BaseRecoveryFeVar.c Utils/src/DensityField.c Utils/src/DensityField.h Utils/src/DivergenceForce.c Utils/src/MixedStabiliserTerm.c Utils/src/NodalPressureField.c Utils/src/NodalPressureField.h Utils/src/REP_Algorithm.h Utils/src/RadiogenicHeatingTerm.c Utils/src/RecoveredFeVariable.c Utils/src/RecoveredFeVariable.h Utils/src/SPR_StrainRate.c Utils/src/SPR_StrainRate.h Utils/src/SmoothVelGradField.c Utils/src/SmoothVelGradField.h Utils/src/StressBC.c Utils/src/StressField.c Utils/src/StressField.h Utils/src/TracerOutput.c Utils/src/TracerOutput.h Utils/src/UnderworldContext.c Utils/src/Underworld_SwarmOutput.c Utils/src/Underworld_SwarmOutput.h Utils/src/ViscosityField.c Utils/src/ViscosityField.h Utils/src/Wall.c Utils/src/XDMFGenerator.c plugins/DensityChangeAtDepth/DensityChangeAtDepth.c plugins/EulerDeform/EulerDeform.c plugins/EulerDeform/EulerDeform.h plugins/HRS_Erosion/HRS_Erosion.c plugins/IncompressibleExtensionBC/IncompressibleExtensionBC.c plugins/MeshAdvectionCorrection/MeshAdvectionCorrection.c plugins/Output/VTKOutput/VTKOutput.c plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.c plugins/SurfaceProcess/SurfaceProcess.c plugins/VariableConditions/ShapeFemIC/ShapeFemIC.c
description:
Make it compile with C++ and C compilers
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMatCartesian_Refactored.c
--- a/Rheology/src/ConstitutiveMatCartesian_Refactored.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMatCartesian_Refactored.c Wed May 11 13:27:52 2011 -0700
@@ -71,7 +71,7 @@ ConstitutiveMatCartesian_Refactored* Con
PICelleratorContext* context,
Materials_Register* materials_Register )
{
- ConstitutiveMatCartesian_Refactored* self = _ConstitutiveMatCartesian_Refactored_DefaultNew( name );
+ ConstitutiveMatCartesian_Refactored* self = (ConstitutiveMatCartesian_Refactored*)_ConstitutiveMatCartesian_Refactored_DefaultNew( name );
self->isConstructed = True;
_ConstitutiveMat_Refactored_Init( self, dim, context, materials_Register );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMat_Refactored.c
--- a/Rheology/src/ConstitutiveMat_Refactored.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMat_Refactored.c Wed May 11 13:27:52 2011 -0700
@@ -159,7 +159,7 @@ void _ConstitutiveMat_Refactored_Print(
}
-void* _ConstitutiveMat_Refactored_Copy( void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ConstitutiveMat_Refactored_Copy( const void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
ConstitutiveMat_Refactored* self = (ConstitutiveMat_Refactored*)constitutiveMatrix;
ConstitutiveMat_Refactored* newConstitutiveMat_Refactored;
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMat_Refactored.h
--- a/Rheology/src/ConstitutiveMat_Refactored.h Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMat_Refactored.h Wed May 11 13:27:52 2011 -0700
@@ -128,7 +128,7 @@
#define ConstitutiveMat_Refactored_DeepCopy( self ) \
(ConstitutiveMat_Refactored*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _ConstitutiveMat_Refactored_Copy( void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ConstitutiveMat_Refactored_Copy( const void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' Virtual Functions */
void _ConstitutiveMat_Refactored_AssignFromXML( void* constitutiveMatrix, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMatrix.c
--- a/Rheology/src/ConstitutiveMatrix.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMatrix.c Wed May 11 13:27:52 2011 -0700
@@ -179,7 +179,7 @@ void _ConstitutiveMatrix_Print( void* co
}
-void* _ConstitutiveMatrix_Copy( void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ConstitutiveMatrix_Copy( const void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
ConstitutiveMatrix* self = (ConstitutiveMatrix*)constitutiveMatrix;
ConstitutiveMatrix* newConstitutiveMatrix;
@@ -297,7 +297,7 @@ void ConstitutiveMatrix_Assemble(
if( self->storeConstitutiveMatrix ) {
/* copy the recently calculated self->matrixData, the constitutive matrix, onto the particle extension */
- double* cMatrix = ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialPoint, self->storedConstHandle );
+ double* cMatrix = (double*)ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialPoint, self->storedConstHandle );
Index row_I, rowSize = self->rowSize;
Index columnSize = self->columnSize;
@@ -324,7 +324,7 @@ void ConstitutiveMatrix_AssembleMaterial
if( self->storeConstitutiveMatrix ) {
/* copy the recently calculated self->matrixData, the constitutive matrix, onto the particle extension */
- double* cMatrix = ExtensionManager_Get( matSwarm->particleExtensionMgr, matPoint, self->storedConstHandle );
+ double* cMatrix = (double*)ExtensionManager_Get( matSwarm->particleExtensionMgr, matPoint, self->storedConstHandle );
Index row_I, rowSize = self->rowSize;
Index columnSize = self->columnSize;
@@ -400,7 +400,7 @@ void ConstitutiveMatrix_GetStoredMatrixO
ConstitutiveMatrix* self = (ConstitutiveMatrix*)constitutiveMatrix;
ExtensionInfo_Index handle = self->storedConstHandle;
- double* ext = _OneToOneMapper_GetExtensionOn(
+ double* ext = (double*)_OneToOneMapper_GetExtensionOn(
((IntegrationPointsSwarm*)self->integrationSwarm)->mapper,
particle, handle );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMatrix.h
--- a/Rheology/src/ConstitutiveMatrix.h Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMatrix.h Wed May 11 13:27:52 2011 -0700
@@ -120,7 +120,7 @@
(ConstitutiveMatrix*)Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define ConstitutiveMatrix_DeepCopy( self ) \
(ConstitutiveMatrix*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _ConstitutiveMatrix_Copy( void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ConstitutiveMatrix_Copy( const void* constitutiveMatrix, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' Virtual Functions */
void _ConstitutiveMatrix_AssignFromXML( void* constitutiveMatrix, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/ConstitutiveMatrixCartesian.c
--- a/Rheology/src/ConstitutiveMatrixCartesian.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/ConstitutiveMatrixCartesian.c Wed May 11 13:27:52 2011 -0700
@@ -279,7 +279,7 @@ void _ConstitutiveMatrixCartesian_Assemb
/* Loop over points to build Stiffness Matrix */
for ( cParticle_I = 0 ; cParticle_I < cellParticleCount ; cParticle_I++ ) {
- particle = (void*) Swarm_ParticleInCellAt( swarm, cell_I, cParticle_I );
+ particle = (IntegrationPoint*)Swarm_ParticleInCellAt( swarm, cell_I, cParticle_I );
/* Calculate Determinant of Jacobian and Shape Function Global Derivatives */
ElementType_ShapeFunctionsGlobalDerivs(
@@ -721,14 +721,14 @@ void ConstitutiveMatrixCartesian_SetupPa
/* get material swram mapped to the integration points,
* * currently only one material point is mapped 26 FEB 09 */
- materialSwarms = IntegrationPointMapper_GetMaterialPointsSwarms( swarm->mapper, &materialSwarmCount );
+ materialSwarms = IntegrationPointMapper_GetMaterialPointsSwarms( swarm->mapper, (Index*)(&materialSwarmCount) );
assert( materialSwarmCount < 2 );
materialSwarm = materialSwarms[0];
/* add extension to material swarm */
self->storedConstHandle = ExtensionManager_Add( materialSwarm->particleExtensionMgr, (Name)self->type, self->rowSize * self->columnSize * sizeof(double) );
- cMatrix = ExtensionManager_Get( materialSwarm->particleExtensionMgr, &particle, self->storedConstHandle );
+ cMatrix = (double*)ExtensionManager_Get( materialSwarm->particleExtensionMgr, &particle, self->storedConstHandle );
#if 0
/*This isn't needed so I've disabled it, 2Dec09, JG*/
diff -r d795d40fd164 -r 038180046f6f Rheology/src/DepthDependentViscosity.c
--- a/Rheology/src/DepthDependentViscosity.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/DepthDependentViscosity.c Wed May 11 13:27:52 2011 -0700
@@ -120,7 +120,7 @@ void _DepthDependentViscosity_AssignFrom
void _DepthDependentViscosity_AssignFromXML( void* rheology, Stg_ComponentFactory* cf, void* data ){
DepthDependentViscosity* self = (DepthDependentViscosity*)rheology;
FeMesh* feMesh;
- Axis variationAxis = 0;
+ Axis variationAxis = (Axis)0;
Name variationAxisName;
Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/Director.c
--- a/Rheology/src/Director.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/Director.c Wed May 11 13:27:52 2011 -0700
@@ -156,7 +156,7 @@ void _Director_Init(
self->particleExtHandle =
ExtensionManager_Add( materialPointsSwarm->particleExtensionMgr, (Name)Director_Type, sizeof(Director_ParticleExt) );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
+ particleExt = (Director_ParticleExt*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
self->directorSwarmVariable = Swarm_NewVectorVariable( materialPointsSwarm, (Name)"Director", (ArithPointer) &particleExt->director - (ArithPointer) &particle,
Variable_DataType_Double,
@@ -167,7 +167,7 @@ void _Director_Init(
self->dontUpdateParticle = Swarm_NewScalarVariable( materialPointsSwarm, (Name)"dontUpdateParticle", (ArithPointer) &particleExt->dontUpdateParticle - (ArithPointer) &particle, Variable_DataType_Int );
}
else {
- Name variableName;
+ char* variableName;
/* Get Variables already created */
variableName = Stg_Object_AppendSuffix( materialPointsSwarm, (Name)"Director" );
@@ -184,7 +184,7 @@ void _Director_Init(
self->variable = self->directorSwarmVariable->variable;
TimeIntegrator_AppendSetupEP( self->timeIntegrator,
- "Director_UpdateVariables", Director_UpdateVariables, self->name, self );
+ "Director_UpdateVariables", (void*)Director_UpdateVariables, self->name, self );
}
void* _Director_DefaultNew( Name name ) {
diff -r d795d40fd164 -r 038180046f6f Rheology/src/DruckerPrager.c
--- a/Rheology/src/DruckerPrager.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/DruckerPrager.c Wed May 11 13:27:52 2011 -0700
@@ -193,7 +193,7 @@ void _DruckerPrager_Init(
EP_PrependClassHook( Context_GetEntryPoint( self->context, AbstractContext_EP_DumpClass ),
_DruckerPrager_UpdateDrawParameters, self );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
+ particleExt = (DruckerPrager_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
/* Setup Variables for Visualisation */
self->brightness = Swarm_NewScalarVariable( materialPointsSwarm, (Name)"DruckerPragerBrightness", (ArithPointer) &particleExt->brightness - (ArithPointer) &materialPoint, Variable_DataType_Float );
@@ -381,7 +381,7 @@ double _DruckerPrager_GetYieldCriterion(
minimumViscosity = self->minimumViscosity;
maxStrainRate = self->maxStrainRate;
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (DruckerPrager_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
if( self->pressureField )
FeVariable_InterpolateWithinElement( self->pressureField, lElement_I, xi, &pressure );
@@ -419,12 +419,14 @@ double _DruckerPrager_GetYieldCriterion(
element_gI = FeMesh_ElementDomainToGlobal( self->pressureField->feMesh, lElement_I );
RegularMeshUtils_Element_1DTo3D( self->pressureField->feMesh, element_gI, inds );
- inside_boundary=(self->boundaryBottom && inds[1]==0)
- || (self->boundaryTop && inds[1]==elGrid->sizes[1]-1)
- || (self->boundaryLeft && inds[0]==0)
- || (self->boundaryRight && inds[0]==elGrid->sizes[0]-1)
- || (dim==3 && ((self->boundaryBack && inds[2]==0)
- || (self->boundaryFront && inds[2]==elGrid->sizes[2]-1)));
+ inside_boundary=
+ ((self->boundaryBottom && inds[1]==0)
+ || (self->boundaryTop && inds[1]==elGrid->sizes[1]-1)
+ || (self->boundaryLeft && inds[0]==0)
+ || (self->boundaryRight && inds[0]==elGrid->sizes[0]-1)
+ || (dim==3 && ((self->boundaryBack && inds[2]==0)
+ || (self->boundaryFront && inds[2]==elGrid->sizes[2]-1))))
+ ? True : False;
effectiveFrictionCoefficient =
_DruckerPrager_EffectiveFrictionCoefficient( self, materialPoint,
diff -r d795d40fd164 -r 038180046f6f Rheology/src/FaultingMoresiMuhlhaus2006.c
--- a/Rheology/src/FaultingMoresiMuhlhaus2006.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/FaultingMoresiMuhlhaus2006.c Wed May 11 13:27:52 2011 -0700
@@ -182,7 +182,7 @@ void _FaultingMoresiMuhlhaus2006_Init(
EP_PrependClassHook( Context_GetEntryPoint( context, AbstractContext_EP_DumpClass ),
_FaultingMoresiMuhlhaus2006_UpdateDrawParameters, self );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
/* Add variables for viz purpose */
@@ -518,7 +518,7 @@ double _FaultingMoresiMuhlhaus2006_GetYi
Director_GetNormal( self->director, materialPoint, normal );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
if ( self->tryingOldOrientation ) {
sigma_ns = SymmetricTensor_MultiplyByVectors( stress, normal, particleExt->slip, dim );
@@ -556,7 +556,7 @@ double _FaultingMoresiMuhlhaus2006_GetYi
double sigma_nn;
FaultingMoresiMuhlhaus2006_Particle* particleExt;
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
/* Calculate frictional strength */
effectiveFrictionCoefficient = _FaultingMoresiMuhlhaus2006_EffectiveFrictionCoefficient( self, materialPoint );
@@ -605,7 +605,7 @@ void _FaultingMoresiMuhlhaus2006_HasYiel
else
ConstitutiveMatrix_SetSecondViscosity( constitutiveMatrix, -corr, normal );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
particleExt->slipRate = self->storedSlipRateValue;
/* Set a flag to tell the director that particles which have failed don't need to have their normal updated */
@@ -627,7 +627,7 @@ Bool _FaultingMoresiMuhlhaus2006_OldOrie
Director_GetNormal( self->director, materialPoint, normal );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
n = normal;
s = particleExt->slip;
@@ -679,7 +679,7 @@ Bool _FaultingMoresiMuhlhaus2006_OldOrie
/* LM: No, I don't think this is true ... in this case we keep the orientation unless it hardens as well */
- return (dVparalleldXperpendicular1 < dVparalleldXperpendicular); // ? True : !self->updateOrientations;
+ return (dVparalleldXperpendicular1 < dVparalleldXperpendicular) ? True : False; // ? True : !self->updateOrientations;
}
double* _FaultingMoresiMuhlhaus2006_UpdateNormalDirection( void* rheology, MaterialPointsSwarm* materialPointsSwarm, void* materialPoint, Dimension_Index dim ) {
@@ -697,7 +697,7 @@ double* _FaultingMoresiMuhlhaus2006_Upda
normalDirector = Director_GetNormalPtr( self->director, materialPoint);
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
/* This function is specific for pristine materials --
* We don't need to calculate it for failure in old orientations */
@@ -896,7 +896,7 @@ void _FaultingMoresiMuhlhaus2006_StoreCu
Dimension_Index dim = constitutiveMatrix->dim;
FaultingMoresiMuhlhaus2006_Particle* particleExt;
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (FaultingMoresiMuhlhaus2006_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
particleExt->slipRate = 0.0;
FeVariable_InterpolateWithinElement( self->pressureField, lElement_I, xi, &self->currentPressure );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/MultiRheologyMaterial.c
--- a/Rheology/src/MultiRheologyMaterial.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/MultiRheologyMaterial.c Wed May 11 13:27:52 2011 -0700
@@ -74,7 +74,7 @@ MultiRheologyMaterial* MultiRheologyMate
Rheology_Index* rheologyCountList,
Index rheologyListCount )
{
- MultiRheologyMaterial* self = _MultiRheologyMaterial_DefaultNew( name );
+ MultiRheologyMaterial* self = (MultiRheologyMaterial*)_MultiRheologyMaterial_DefaultNew( name );
self->isConstructed = True;
_Material_Init( self, context, shape, materialDictionary, materialRegister );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/Pouliquen_etal.c
--- a/Rheology/src/Pouliquen_etal.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/Pouliquen_etal.c Wed May 11 13:27:52 2011 -0700
@@ -124,7 +124,7 @@ void _Pouliquen_etal_Init(
EP_PrependClassHook( Context_GetEntryPoint( self->context, AbstractContext_EP_DumpClass ),
_Pouliquen_etal_UpdateDrawParameters, self );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
+ particleExt = (Pouliquen_etal_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &materialPoint, self->particleExtHandle );
/* Setup Variables for Visualisation */
self->brightness = Swarm_NewScalarVariable( materialPointsSwarm, (Name)"Pouliquen_etalBrightness", (ArithPointer) &particleExt->brightness - (ArithPointer) &materialPoint, Variable_DataType_Float );
@@ -282,7 +282,7 @@ double _Pouliquen_etal_GetYieldCriterion
Pouliquen_etal_Particle* particleExt;
double strainRateInv;
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (Pouliquen_etal_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
FeVariable_InterpolateWithinElement( self->pressureField, lElement_I, xi, &pressure );
FeVariable_InterpolateWithinElement( self->strainRateInvField, lElement_I, xi, &strainRateInv );
@@ -435,7 +435,7 @@ void _Pouliquen_etal_HasYielded(
strainWeakeningRatio = StrainWeakening_CalcRatio( self->strainWeakening, materialPoint );
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (Pouliquen_etal_Particle*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
if (fabs(particleExt->strainRateInv) <1.0e-10)
particleExt->strainRateInv = 1.0e-10;
diff -r d795d40fd164 -r 038180046f6f Rheology/src/RheologyClass.c
--- a/Rheology/src/RheologyClass.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/RheologyClass.c Wed May 11 13:27:52 2011 -0700
@@ -94,7 +94,7 @@ void _Rheology_Delete( void* rheology )
void _Rheology_Print( void* rheology, Stream* stream ) {}
-void* _Rheology_Copy( void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _Rheology_Copy( const void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
Rheology* self = (Rheology*)rheology;
/* TODO */ abort();
diff -r d795d40fd164 -r 038180046f6f Rheology/src/RheologyClass.h
--- a/Rheology/src/RheologyClass.h Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/RheologyClass.h Wed May 11 13:27:52 2011 -0700
@@ -104,7 +104,7 @@
(Rheology*)Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define Rheology_DeepCopy( self ) \
(Rheology*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _Rheology_Copy( void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _Rheology_Copy( const void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' implementations */
void* _Rheology_DefaultNew( Name name ) ;
diff -r d795d40fd164 -r 038180046f6f Rheology/src/RheologyMaterial.c
--- a/Rheology/src/RheologyMaterial.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/RheologyMaterial.c Wed May 11 13:27:52 2011 -0700
@@ -70,7 +70,7 @@ RheologyMaterial* RheologyMaterial_New(
Rheology_Index rheologyCount,
Compressible* compressible )
{
- RheologyMaterial* self = _RheologyMaterial_DefaultNew( name );
+ RheologyMaterial* self = (RheologyMaterial*)_RheologyMaterial_DefaultNew( name );
self->isConstructed = True;
_Material_Init( self, context, shape, materialDictionary, materialRegister );
@@ -190,7 +190,7 @@ void _RheologyMaterial_Print( void* rheo
void _RheologyMaterial_Print( void* rheologyMaterial, Stream* stream ) {}
-void* _RheologyMaterial_Copy( void* rheologyMaterial, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _RheologyMaterial_Copy( const void* rheologyMaterial, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
RheologyMaterial* self = (RheologyMaterial*)rheologyMaterial;
/* TODO */ abort();
diff -r d795d40fd164 -r 038180046f6f Rheology/src/RheologyMaterial.h
--- a/Rheology/src/RheologyMaterial.h Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/RheologyMaterial.h Wed May 11 13:27:52 2011 -0700
@@ -119,7 +119,7 @@
#define RheologyMaterial_DeepCopy( self ) \
(RheologyMaterial*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _RheologyMaterial_Copy( void* rheologyMaterial, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _RheologyMaterial_Copy( const void* rheologyMaterial, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' implementations */
void _RheologyMaterial_Build( void* rheologyMaterial, void* data );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/StoreStress.c
--- a/Rheology/src/StoreStress.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/StoreStress.c Wed May 11 13:27:52 2011 -0700
@@ -74,7 +74,7 @@ void _StoreStress_Init(
MaterialPointsSwarm* materialPointsSwarm,
FeVariable* strainRateField )
{
- Name variableName[6];
+ char* variableName[6];
StandardParticle particle;
StoreStress_ParticleExt* particleExt;
Index variable_I;
@@ -87,7 +87,7 @@ void _StoreStress_Init(
self->particleExtHandle = ExtensionManager_Add( materialPointsSwarm->particleExtensionMgr, (Name)self->type, sizeof( StoreStress_ParticleExt ) );
/* Add SwarmVariables for plotting */
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
+ particleExt = (StoreStress_ParticleExt*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
if ( dim == 2 ) {
variableName[0] = StG_Strdup( "tau_xx" );
@@ -208,7 +208,7 @@ void _StoreStress_ModifyConstitutiveMatr
if ( !constitutiveMatrix->previousSolutionExists )
return;
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (StoreStress_ParticleExt*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
FeVariable_InterpolateWithinElement( self->strainRateField, lElement_I, xi, strainRate );
ConstitutiveMatrix_CalculateStress( constitutiveMatrix, strainRate, particleExt->stress );
diff -r d795d40fd164 -r 038180046f6f Rheology/src/StoreViscosity.c
--- a/Rheology/src/StoreViscosity.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/StoreViscosity.c Wed May 11 13:27:52 2011 -0700
@@ -82,7 +82,7 @@ void _StoreVisc_Init(
self->particleExtHandle = ExtensionManager_Add( materialPointsSwarm->particleExtensionMgr, (Name)self->type, sizeof( StoreVisc_ParticleExt ) );
/* Add SwarmVariables for plotting */
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
+ particleExt = (StoreVisc_ParticleExt*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, &particle, self->particleExtHandle );
self->swarmVariable = Swarm_NewScalarVariable( materialPointsSwarm, (Name)"Viscosity", (ArithPointer) &particleExt->effVisc - (ArithPointer) &particle, Variable_DataType_Double );
}
@@ -173,7 +173,7 @@ void _StoreVisc_ModifyConstitutiveMatrix
#endif
/* Get Parameters From Material Extension */
- particleExt = ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
+ particleExt = (StoreVisc_ParticleExt*)ExtensionManager_Get( materialPointsSwarm->particleExtensionMgr, materialPoint, self->particleExtHandle );
particleExt->effVisc = ConstitutiveMatrix_GetIsotropicViscosity(constitutiveMatrix);
diff -r d795d40fd164 -r 038180046f6f Rheology/src/StrainWeakening.c
--- a/Rheology/src/StrainWeakening.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/StrainWeakening.c Wed May 11 13:27:52 2011 -0700
@@ -169,7 +169,7 @@ void _StrainWeakening_Init(
self->particleExtHandle =
ExtensionManager_Add( swarm->particleExtensionMgr, (Name)StrainWeakening_Type, sizeof(StrainWeakening_ParticleExt) );
- particleExt = ExtensionManager_Get( swarm->particleExtensionMgr, &particle, self->particleExtHandle );
+ particleExt = (StrainWeakening_ParticleExt*)ExtensionManager_Get( swarm->particleExtensionMgr, &particle, self->particleExtHandle );
/*Add variables for vizualization / analysis purposes */
@@ -180,7 +180,7 @@ void _StrainWeakening_Init(
self->postFailureWeakeningIncrement = Swarm_NewScalarVariable( swarm, (Name)"PostFailureWeakeningIncrement", (ArithPointer) &particleExt->postFailureWeakeningIncrement - (ArithPointer) &particle, Variable_DataType_Double );
}
else {
- Name variableName;
+ char* variableName;
/* Get Variables already created */
variableName = Stg_Object_AppendSuffix( swarm, (Name)"PostFailureWeakening" );
@@ -202,7 +202,7 @@ void _StrainWeakening_Init(
/* Add function to entry point which is called at the end of the time integration steps -
* this will make all the negative values zero */
TimeIntegrator_AppendFinishEP( self->timeIntegrator,
- "StrainWeakening_MakeValuesPositive", _StrainWeakening_MakeValuesPositive, self->name, self );
+ "StrainWeakening_MakeValuesPositive", (void*)_StrainWeakening_MakeValuesPositive, self->name, self );
}
@@ -483,7 +483,7 @@ double _StrainWeakening_CalcIncrementIso
double viscosity = ConstitutiveMatrix_GetIsotropicViscosity( constitutiveMatrix );
double postFailureWeakening;
- particleExt = ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
+ particleExt = (StrainWeakening_ParticleExt*)ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
postFailureWeakening = particleExt->postFailureWeakening;
if (beta < 0.0)
@@ -502,7 +502,7 @@ double StrainWeakening_CalcRatio( void*
if ( self == NULL )
return 0.0;
- particleExt = ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
+ particleExt = (StrainWeakening_ParticleExt*)ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
if ( particleExt->postFailureWeakening < 0.0 )
particleExt->postFailureWeakening = 0.0;
@@ -530,7 +530,7 @@ void StrainWeakening_AssignIncrement(
StrainWeakening* self = (StrainWeakening*) strainWeakening;
StrainWeakening_ParticleExt* particleExt;
- particleExt = ExtensionManager_Get( swarm->particleExtensionMgr, particle, self->particleExtHandle );
+ particleExt = (StrainWeakening_ParticleExt*)ExtensionManager_Get( swarm->particleExtensionMgr, particle, self->particleExtHandle );
particleExt->postFailureWeakeningIncrement =
self->_calcIncrement( self, constitutiveMatrix, swarm, lElement_I, particle, yieldCriterion, yieldIndicator );
@@ -540,7 +540,7 @@ double StrainWeakening_GetPostFailureWea
StrainWeakening* self = (StrainWeakening*) strainWeakening;
StrainWeakening_ParticleExt* particleExt;
- particleExt = ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
+ particleExt = (StrainWeakening_ParticleExt*)ExtensionManager_Get( self->swarm->particleExtensionMgr, particle, self->particleExtHandle );
return particleExt->postFailureWeakening;
}
diff -r d795d40fd164 -r 038180046f6f Rheology/src/YieldRheology.c
--- a/Rheology/src/YieldRheology.c Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/YieldRheology.c Wed May 11 13:27:52 2011 -0700
@@ -105,7 +105,7 @@ void _YieldRheology_Init( YieldRheology*
}
else {
/* if the variable has already been created - then just store the pointer */
- Name hasYieldedVariableName = Stg_Object_AppendSuffix( materialPointsSwarm, (Name)"HasYielded" );
+ char* hasYieldedVariableName = Stg_Object_AppendSuffix( materialPointsSwarm, (Name)"HasYielded" );
self->hasYieldedVariable = SwarmVariable_Register_GetByName( materialPointsSwarm->swarmVariable_Register, hasYieldedVariableName );
Memory_Free( hasYieldedVariableName );
}
@@ -129,7 +129,7 @@ void _YieldRheology_Delete( void* rheolo
void _YieldRheology_Print( void* rheology, Stream* stream ) {}
-void* _YieldRheology_Copy( void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _YieldRheology_Copy( const void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
YieldRheology* self = (YieldRheology*)rheology;
/* TODO */ abort();
diff -r d795d40fd164 -r 038180046f6f Rheology/src/YieldRheology.h
--- a/Rheology/src/YieldRheology.h Fri May 06 14:03:37 2011 -0700
+++ b/Rheology/src/YieldRheology.h Wed May 11 13:27:52 2011 -0700
@@ -120,7 +120,7 @@
(YieldRheology*)Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define YieldRheology_DeepCopy( self ) \
(YieldRheology*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _YieldRheology_Copy( void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _YieldRheology_Copy( const void* rheology, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' implementations */
void* _YieldRheology_DefaultNew( Name name ) ;
diff -r d795d40fd164 -r 038180046f6f SConscript
--- a/SConscript Fri May 06 14:03:37 2011 -0700
+++ b/SConscript Wed May 11 13:27:52 2011 -0700
@@ -165,10 +165,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 underworld_register_static_modules() {\n'
@@ -250,7 +250,7 @@ env.PCUTest('tests/testUnderworld', suit
env.PCUTest('tests/testUnderworld', suites,
PCU_LIBHEADERS="#include <StGermain/StGermain.h>\n#include <StgDomain/StgDomain.h>\n" \
"#include <StgFEM/StgFEM.h>\n#include <PICellerator/PICellerator.h>\n" \
- "#include <Underworld/Underworld.h>",
+ "#include <Underworld/Underworld.h>\nextern void underworld_register_static_modules();\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" \
"Underworld_Init(&argc, &argv);\n\n" \
diff -r d795d40fd164 -r 038180046f6f SysTest/AnalyticPlugins/Velic_solA/Analytic_solA.c
--- a/SysTest/AnalyticPlugins/Velic_solA/Analytic_solA.c Fri May 06 14:03:37 2011 -0700
+++ b/SysTest/AnalyticPlugins/Velic_solA/Analytic_solA.c Wed May 11 13:27:52 2011 -0700
@@ -44,6 +44,10 @@
#include "Analytic_solA.h"
const Type Underworld_solA_Type = "Underworld_Velic_solA";
+
+void _Velic_solutionA( double* pos,
+ double sigma, double Z, int n, double km,
+ double* velocity, double* pressure, double* Tstress, double* strainRate );
void Underworld_solA_PressureFunction( void* analyticSolution, double* coord, double* pressure ) {
Underworld_solA* self = (Underworld_solA*) analyticSolution;
@@ -117,7 +121,7 @@ Bool solA_checkInputParams( Underworld_s
return (
( self->sigma > 0.0 ) && ( self->Z > 0.0 ) &&
( self->km > 0.0 ) && ( self->n > 0 )
- );
+ ) ? True : False;
}
void* _Underworld_solA_DefaultNew( Name name ) {
diff -r d795d40fd164 -r 038180046f6f SysTest/AnalyticPlugins/Velic_solB/Analytic_solB.c
--- a/SysTest/AnalyticPlugins/Velic_solB/Analytic_solB.c Fri May 06 14:03:37 2011 -0700
+++ b/SysTest/AnalyticPlugins/Velic_solB/Analytic_solB.c Wed May 11 13:27:52 2011 -0700
@@ -116,7 +116,7 @@ Bool solB_checkInputParams( Underworld_s
return (
( self->sigma > 0.0 ) && ( self->Z > 0.0 ) &&
( self->km > 0.0 ) && ( self->n > 0 )
- );
+ ) ? True : False;
}
void* _Underworld_solB_DefaultNew( Name name ) {
/* Variables set in this function */
diff -r d795d40fd164 -r 038180046f6f SysTest/AnalyticPlugins/Velic_solS/Analytic_solS.c
--- a/SysTest/AnalyticPlugins/Velic_solS/Analytic_solS.c Fri May 06 14:03:37 2011 -0700
+++ b/SysTest/AnalyticPlugins/Velic_solS/Analytic_solS.c Wed May 11 13:27:52 2011 -0700
@@ -118,7 +118,7 @@ Bool _checkInputParams( Underworld_solS*
Bool _checkInputParams( Underworld_solS* self ) {
return (
( self->_eta > 0.0 ) && ( self->_n > 0.0 )
- );
+ ) ? True : False;
}
void* _Underworld_solS_DefaultNew( Name name ) {
diff -r d795d40fd164 -r 038180046f6f Utils/src/BaseRecoveryFeVar.c
--- a/Utils/src/BaseRecoveryFeVar.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/BaseRecoveryFeVar.c Wed May 11 13:27:52 2011 -0700
@@ -178,7 +178,7 @@ void _BaseRecoveryFeVar_Build( void* _se
NULL,
(void**)NULL,
variable_Register,
- variableName );
+ (const char**)variableName );
for( variable_I = 0; variable_I < dataVariable->dataTypeCounts[0]; variable_I++ )
dataVariable->components[variable_I]->allocateSelf = True;
diff -r d795d40fd164 -r 038180046f6f Utils/src/DensityField.c
--- a/Utils/src/DensityField.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/DensityField.c Wed May 11 13:27:52 2011 -0700
@@ -64,7 +64,7 @@ void _DensityField_Print( void* densityF
Journal_PrintPointer( stream, self->buoyancyForceTerm );
}
-void* _DensityField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _DensityField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
DensityField* self = (DensityField*)feVariable;
DensityField* newDensityField;
@@ -96,7 +96,7 @@ void* _DensityField_DefaultNew( Name nam
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _DensityField_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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
@@ -121,7 +121,7 @@ void _DensityField_Build( void* densityF
void _DensityField_Build( void* densityField, void* data ) {
DensityField* self = (DensityField*) densityField;
Variable_Register* variable_Register = (Variable_Register*) self->variable_Register;
- Name tmpName;
+ char* tmpName;
Stg_Component_Build( self->buoyancyForceTerm, data, False );
@@ -169,7 +169,7 @@ void _DensityField_ValueAtParticle( void
/* Calculate density from particle material */
material = IntegrationPointsSwarm_GetMaterialOn( (IntegrationPointsSwarm*)swarm, particle );
- materialExt = ExtensionManager_Get( material->extensionMgr, material, self->buoyancyForceTerm->materialExtHandle );
+ materialExt = (BuoyancyForceTerm_MaterialExt*)ExtensionManager_Get( material->extensionMgr, material, self->buoyancyForceTerm->materialExtHandle );
*density = materialExt->density;
}
diff -r d795d40fd164 -r 038180046f6f Utils/src/DensityField.h
--- a/Utils/src/DensityField.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/DensityField.h Wed May 11 13:27:52 2011 -0700
@@ -45,7 +45,7 @@
void* _DensityField_DefaultNew( Name name );
void _DensityField_Delete( void* variable );
void _DensityField_Print( void* variable, Stream* stream );
- void* _DensityField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _DensityField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _DensityField_AssignFromXML( void* variable, Stg_ComponentFactory* cf, void* data ) ;
void _DensityField_Build( void* variable, void* data ) ;
diff -r d795d40fd164 -r 038180046f6f Utils/src/DivergenceForce.c
--- a/Utils/src/DivergenceForce.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/DivergenceForce.c Wed May 11 13:27:52 2011 -0700
@@ -269,7 +269,7 @@ void _DivergenceForce_AssembleElement( v
Mesh_GetIncidence(mesh, Mesh_GetDimSize(mesh), lElement_I,
MT_VERTEX,incidence);
elementNodeCount=IArray_GetSize(incidence);
- elementNodes=IArray_GetPtr(incidence);
+ elementNodes=(Node_DomainIndex*)IArray_GetPtr(incidence);
for( eNode_I = 0 ; eNode_I < elementNodeCount; eNode_I++ ) {
if(Stg_Shape_IsCoordInside(self->domainShape,
diff -r d795d40fd164 -r 038180046f6f Utils/src/MixedStabiliserTerm.c
--- a/Utils/src/MixedStabiliserTerm.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/MixedStabiliserTerm.c Wed May 11 13:27:52 2011 -0700
@@ -223,7 +223,7 @@ void _MixedStabiliserTerm_AssembleElemen
OneToOneMapper_GetMaterialPoint( swarm->mapper,
integrationPoint, &mSwarm );
particleExt=
- ExtensionManager_Get( mSwarm->particleExtensionMgr,
+ (StoreVisc_ParticleExt*)ExtensionManager_Get( mSwarm->particleExtensionMgr,
materialparticle,
self->storeVisc->particleExtHandle );
diff -r d795d40fd164 -r 038180046f6f Utils/src/NodalPressureField.c
--- a/Utils/src/NodalPressureField.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/NodalPressureField.c Wed May 11 13:27:52 2011 -0700
@@ -67,7 +67,7 @@ void* _NodalPressureField_DefaultNew( Na
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _NodalPressureField_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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
@@ -95,7 +95,7 @@ void _NodalPressureField_Print( void* _s
_ParticleFeVariable_Print( self, stream );
}
-void* _NodalPressureField_Copy( void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _NodalPressureField_Copy( const void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
abort();
}
@@ -133,18 +133,18 @@ void _NodalPressureField_AssignFromXML(
void _NodalPressureField_Build( void* _self, void* data ) {
NodalPressureField* self = (NodalPressureField*) _self;
- Name tmpName, tmpName2;
+ char *tmpName, *tmpName2;
Node_DomainIndex node_I;
Stg_Component_Build( self->feMesh, data, False );
/* Create Variable to store data */
assert( Class_IsSuper( self->feMesh->topo, IGraph ) );
- tmpName = Stg_Object_AppendSuffix( self, (Name)"DataVariable" );
+ tmpName = Stg_Object_AppendSuffix( self, "DataVariable" );
self->dataVariable = Variable_NewScalar( tmpName, (AbstractContext*)self->context, Variable_DataType_Double, (Index*)&((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains, NULL, (void**)&self->data, self->variable_Register );
/* Create Dof Layout */
- tmpName2 = Stg_Object_AppendSuffix( self, (Name)"DofLayout" );
+ tmpName2 = Stg_Object_AppendSuffix( self, "DofLayout" );
self->dofLayout = DofLayout_New( tmpName2, self->context, self->variable_Register, 0, self->feMesh );
self->dofLayout->_numItemsInLayout = FeMesh_GetNodeDomainSize( self->feMesh );
for( node_I = 0; node_I < FeMesh_GetNodeDomainSize( self->feMesh ); node_I++ ) {
diff -r d795d40fd164 -r 038180046f6f Utils/src/NodalPressureField.h
--- a/Utils/src/NodalPressureField.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/NodalPressureField.h Wed May 11 13:27:52 2011 -0700
@@ -53,7 +53,7 @@
void _NodalPressureField_Print( void* _self, Stream* stream );
- void* _NodalPressureField_Copy( void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _NodalPressureField_Copy( const void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _NodalPressureField_AssignFromXML( void* _self, Stg_ComponentFactory* cf, void* data ) ;
diff -r d795d40fd164 -r 038180046f6f Utils/src/REP_Algorithm.h
--- a/Utils/src/REP_Algorithm.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/REP_Algorithm.h Wed May 11 13:27:52 2011 -0700
@@ -67,7 +67,7 @@
BoundaryNodesInfo* boundaryNodesInfo; \
ConstitutiveMatrix* constitutiveMatrix; \
/* Entry Point Setup */ \
- Name recoveryEPName; \
+ char* recoveryEPName; \
EntryPoint* recoveryEP; \
EntryPoint_Register* entryPoint_Register; \
/* General crap */ \
@@ -104,7 +104,7 @@
#define REP_Algorithm_DeepCopy( self ) \
(REP_Algorithm*)Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _REP_Algorithm_Copy( void* rep, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _REP_Algorithm_Copy( const void* rep, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* Private Functions */
void _REP_Algorithm_Init( void* rep,
@@ -139,7 +139,13 @@
void _REP_Algorithm_DoBoundaries( RecoveredFeVariable* self, int lNodeID, BoundaryNodesInfo* bNodeInfo );
+#ifdef __cplusplus
+extern "C"
+{
+#endif
void dgesv_( int* N, int* NRHS, double* AT, int* LDA, int* IPIV, double* bVec, int* LDB, int* info);
-
+#ifdef __cplusplus
+}
+#endif
#endif
diff -r d795d40fd164 -r 038180046f6f Utils/src/RadiogenicHeatingTerm.c
--- a/Utils/src/RadiogenicHeatingTerm.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/RadiogenicHeatingTerm.c Wed May 11 13:27:52 2011 -0700
@@ -129,7 +129,7 @@ void _RadiogenicHeatingTerm_Build( void*
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 = (RadiogenicHeatingTerm_MaterialExt*)ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
/* Get List of Heating Elements from material's dictionary */
list = Dictionary_Get( material->dictionary, (Dictionary_Entry_Key)"heatingElements" );
@@ -203,7 +203,7 @@ void _RadiogenicHeatingTerm_AssembleElem
/* Get parameters */
material = IntegrationPointsSwarm_GetMaterialOn( (IntegrationPointsSwarm*)swarm, particle );
- materialExt = ExtensionManager_Get( material->extensionMgr, material, self->materialExtHandle );
+ materialExt = (RadiogenicHeatingTerm_MaterialExt*)ExtensionManager_Get( material->extensionMgr, material, self->materialExtHandle );
/* Check if this material has heating term */
heatingElementCount = materialExt->heatingElementCount;
diff -r d795d40fd164 -r 038180046f6f Utils/src/RecoveredFeVariable.c
--- a/Utils/src/RecoveredFeVariable.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/RecoveredFeVariable.c Wed May 11 13:27:52 2011 -0700
@@ -77,7 +77,7 @@ void* _RecoveredFeVariable_DefaultNew( N
Stg_Component_DestroyFunction* _destroy = _RecoveredFeVariable_Destroy;
/* 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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_InterpolateValueAtFunction* _interpolateValueAt = ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
@@ -120,7 +120,7 @@ void _RecoveredFeVariable_Print( void* r
/* RecoveredFeVariable info */
}
-void* _RecoveredFeVariable_Copy( void* recFeVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _RecoveredFeVariable_Copy( const void* recFeVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
abort();
}
diff -r d795d40fd164 -r 038180046f6f Utils/src/RecoveredFeVariable.h
--- a/Utils/src/RecoveredFeVariable.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/RecoveredFeVariable.h Wed May 11 13:27:52 2011 -0700
@@ -115,7 +115,7 @@
void _RecoveredFeVariable_Print( void* recFeVariable, Stream* stream );
- void* _RecoveredFeVariable_Copy( void* recFeVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _RecoveredFeVariable_Copy( const void* recFeVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _RecoveredFeVariable_AssignFromXML( void* recFeVariable, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Utils/src/SPR_StrainRate.c
--- a/Utils/src/SPR_StrainRate.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/SPR_StrainRate.c Wed May 11 13:27:52 2011 -0700
@@ -40,7 +40,7 @@ SPR_StrainRate* SPR_StrainRate_New(
int rawOrderOfInterpolation,
Bool coeffInterpolation )
{
- SPR_StrainRate* self = _SPR_StrainRate_DefaultNew( name );
+ SPR_StrainRate* self = (SPR_StrainRate*)_SPR_StrainRate_DefaultNew( name );
self->isConstructed = True;
_FieldVariable_Init( (FieldVariable*)self, context, fieldComponentCount, dim, isCheckpointedAndReloaded, communicator, fV_Register );
@@ -66,7 +66,7 @@ void* _SPR_StrainRate_DefaultNew( Name n
Stg_Component_DestroyFunction* _destroy = _SPR_StrainRate_Destroy;
/* 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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_InterpolateValueAtFunction* _interpolateValueAt = ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
@@ -110,7 +110,7 @@ void _SPR_StrainRate_Print( void* sprVar
}
-void* _SPR_StrainRate_Copy( void* sprVar, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _SPR_StrainRate_Copy( const void* sprVar, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
return NULL;
}
diff -r d795d40fd164 -r 038180046f6f Utils/src/SPR_StrainRate.h
--- a/Utils/src/SPR_StrainRate.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/SPR_StrainRate.h Wed May 11 13:27:52 2011 -0700
@@ -60,7 +60,7 @@
void _SPR_StrainRate_Print( void* sprVar, Stream* stream );
- void* _SPR_StrainRate_Copy( void* sprVar, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _SPR_StrainRate_Copy( const void* sprVar, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _SPR_StrainRate_Init( SPR_StrainRate* self );
diff -r d795d40fd164 -r 038180046f6f Utils/src/SmoothVelGradField.c
--- a/Utils/src/SmoothVelGradField.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/SmoothVelGradField.c Wed May 11 13:27:52 2011 -0700
@@ -74,7 +74,7 @@ void* _SmoothVelGradField_DefaultNew( Na
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _SmoothVelGradField_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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
@@ -102,7 +102,7 @@ void _SmoothVelGradField_Print( void* _s
_ParticleFeVariable_Print( self, stream );
}
-void* _SmoothVelGradField_Copy( void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _SmoothVelGradField_Copy( const void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
abort();
}
@@ -142,8 +142,8 @@ void _SmoothVelGradField_AssignFromXML(
void _SmoothVelGradField_Build( void* _self, void* data ) {
SmoothVelGradField* self = (SmoothVelGradField*) _self;
- Name tmpName;
- Name variableName[9];
+ char* tmpName;
+ char* variableName[9];
Variable_Index variable_I;
Node_DomainIndex node_I;
int dim;
@@ -180,7 +180,7 @@ void _SmoothVelGradField_Build( void* _s
(AbstractContext*)self->context,
Variable_DataType_Double,
self->fieldComponentCount,
- &((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains,
+ (Index*)(&((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains),
NULL,
(void**)&self->data,
self->variable_Register,
diff -r d795d40fd164 -r 038180046f6f Utils/src/SmoothVelGradField.h
--- a/Utils/src/SmoothVelGradField.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/SmoothVelGradField.h Wed May 11 13:27:52 2011 -0700
@@ -60,7 +60,7 @@
void _SmoothVelGradField_Print( void* _self, Stream* stream );
- void* _SmoothVelGradField_Copy( void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _SmoothVelGradField_Copy( const void* _self, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _SmoothVelGradField_AssignFromXML( void* _self, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Utils/src/StressBC.c
--- a/Utils/src/StressBC.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/StressBC.c Wed May 11 13:27:52 2011 -0700
@@ -66,7 +66,7 @@
/* Textual name of this class */
const Type StressBC_Type = "StressBC";
-extern const char* WallEnumToStr[Wall_Size];
+extern Name WallEnumToStr[Wall_Size];
StressBC* StressBC_New(
Name name,
diff -r d795d40fd164 -r 038180046f6f Utils/src/StressField.c
--- a/Utils/src/StressField.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/StressField.c Wed May 11 13:27:52 2011 -0700
@@ -89,7 +89,7 @@ void _StressField_Print( void* stressFie
Journal_PrintPointer( stream, self->constitutiveMatrix );
}
-void* _StressField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _StressField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
StressField* self = (StressField*)feVariable;
StressField* newStressField;
@@ -122,7 +122,7 @@ void* _StressField_DefaultNew( Name name
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _StressField_ValueAtParticle_Recalculate;
/* 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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
@@ -169,8 +169,8 @@ void _StressField_AssignFromXML( void* s
void _StressField_Build( void* stressField, void* data ) {
StressField* self = (StressField*) stressField;
- Name tmpName;
- Name variableName[6];
+ char* tmpName;
+ char* variableName[6];
Dimension_Index dim = self->constitutiveMatrix->dim;
Variable_Index variable_I;
Node_DomainIndex node_I;
@@ -202,7 +202,7 @@ void _StressField_Build( void* stressFie
(AbstractContext*)self->context,
Variable_DataType_Double,
self->fieldComponentCount,
- &((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains,
+ (Index*)(&((IGraph*)self->feMesh->topo)->remotes[MT_VERTEX]->nDomains),
NULL,
(void**)&self->data,
self->variable_Register,
diff -r d795d40fd164 -r 038180046f6f Utils/src/StressField.h
--- a/Utils/src/StressField.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/StressField.h Wed May 11 13:27:52 2011 -0700
@@ -51,7 +51,7 @@
void _StressField_Print( void* variable, Stream* stream );
- void* _StressField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _StressField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _StressField_AssignFromXML( void* variable, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Utils/src/TracerOutput.c
--- a/Utils/src/TracerOutput.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/TracerOutput.c Wed May 11 13:27:52 2011 -0700
@@ -124,7 +124,7 @@ void _TracerOutput_Print( void* swarmOut
_SwarmOutput_Print( self, stream );
}
-void* _TracerOutput_Copy( void* swarmOutput, void* dest, Bool deep,
+void* _TracerOutput_Copy( const void* swarmOutput, void* dest, Bool deep,
Name nameExt, PtrMap* ptrMap ) {
TracerOutput* self = (TracerOutput*)swarmOutput;
TracerOutput* newTracerOutput;
diff -r d795d40fd164 -r 038180046f6f Utils/src/TracerOutput.h
--- a/Utils/src/TracerOutput.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/TracerOutput.h Wed May 11 13:27:52 2011 -0700
@@ -83,7 +83,7 @@ void _TracerOutput_Print( void* swarmOut
(TracerOutput*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define TracerOutput_DeepCopy( self ) \
(TracerOutput*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
-void* _TracerOutput_Copy( void* swarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+void* _TracerOutput_Copy( const void* swarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _TracerOutput_DefaultNew( Name name ) ;
void _TracerOutput_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data ) ;
diff -r d795d40fd164 -r 038180046f6f Utils/src/UnderworldContext.c
--- a/Utils/src/UnderworldContext.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/UnderworldContext.c Wed May 11 13:27:52 2011 -0700
@@ -67,7 +67,7 @@ UnderworldContext* UnderworldContext_New
MPI_Comm communicator,
Dictionary* dictionary )
{
- UnderworldContext* self = _UnderworldContext_DefaultNew( name );
+ UnderworldContext* self = (UnderworldContext*)_UnderworldContext_DefaultNew( name );
self->isConstructed = True;
_AbstractContext_Init( (AbstractContext*) self );
diff -r d795d40fd164 -r 038180046f6f Utils/src/Underworld_SwarmOutput.c
--- a/Utils/src/Underworld_SwarmOutput.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/Underworld_SwarmOutput.c Wed May 11 13:27:52 2011 -0700
@@ -116,7 +116,7 @@ void _Underworld_SwarmOutput_Print( void
_SwarmOutput_Print( self, stream );
}
-void* _Underworld_SwarmOutput_Copy( void* uwSwarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _Underworld_SwarmOutput_Copy( const void* uwSwarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
Underworld_SwarmOutput* self = (Underworld_SwarmOutput*)uwSwarmOutput;
Underworld_SwarmOutput* newUnderworld_SwarmOutput;
diff -r d795d40fd164 -r 038180046f6f Utils/src/Underworld_SwarmOutput.h
--- a/Utils/src/Underworld_SwarmOutput.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/Underworld_SwarmOutput.h Wed May 11 13:27:52 2011 -0700
@@ -91,7 +91,7 @@
(Underworld_SwarmOutput*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
#define Underworld_SwarmOutput_DeepCopy( self ) \
(Underworld_SwarmOutput*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _Underworld_SwarmOutput_Copy( void* swarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _Underworld_SwarmOutput_Copy( const void* swarmOutput, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _Underworld_SwarmOutput_DefaultNew( Name name ) ;
void _Underworld_SwarmOutput_AssignFromXML( void* shape, Stg_ComponentFactory* cf, void* data ) ;
diff -r d795d40fd164 -r 038180046f6f Utils/src/ViscosityField.c
--- a/Utils/src/ViscosityField.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/ViscosityField.c Wed May 11 13:27:52 2011 -0700
@@ -69,7 +69,7 @@ void _ViscosityField_Print( void* viscos
}
-void* _ViscosityField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
+void* _ViscosityField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
ViscosityField* self = (ViscosityField*)feVariable;
ViscosityField* newViscosityField;
@@ -101,7 +101,7 @@ void* _ViscosityField_DefaultNew( Name n
ParticleFeVariable_ValueAtParticleFunction* _valueAtParticle = _ViscosityField_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;
+ AllocationType nameAllocationType = (AllocationType)ZERO;
FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude = ZERO;
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude = ZERO;
FeVariable_SyncShadowValuesFunc* _syncShadowValues = ZERO;
@@ -126,7 +126,7 @@ void _ViscosityField_AssignFromXML( void
void _ViscosityField_Build( void* viscosityField, void* data ) {
ViscosityField* self = (ViscosityField*) viscosityField;
- Name tmpName;
+ char* tmpName;
Stg_Component_Build( self->feMesh, data, False );
Stg_Component_Build( self->constitutiveMatrix, data, False );
diff -r d795d40fd164 -r 038180046f6f Utils/src/ViscosityField.h
--- a/Utils/src/ViscosityField.h Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/ViscosityField.h Wed May 11 13:27:52 2011 -0700
@@ -48,7 +48,7 @@
void _ViscosityField_Print( void* variable, Stream* stream );
- void* _ViscosityField_Copy( void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
+ void* _ViscosityField_Copy( const void* feVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void _ViscosityField_AssignFromXML( void* variable, Stg_ComponentFactory* cf, void* data );
diff -r d795d40fd164 -r 038180046f6f Utils/src/Wall.c
--- a/Utils/src/Wall.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/Wall.c Wed May 11 13:27:52 2011 -0700
@@ -5,7 +5,7 @@
#include <PICellerator/PICellerator.h>
#include "types.h"
-const char* WallEnumToStr[Wall_Size] = {
+Name WallEnumToStr[Wall_Size] = {
"back",
"left",
"bottom",
diff -r d795d40fd164 -r 038180046f6f Utils/src/XDMFGenerator.c
--- a/Utils/src/XDMFGenerator.c Fri May 06 14:03:37 2011 -0700
+++ b/Utils/src/XDMFGenerator.c Wed May 11 13:27:52 2011 -0700
@@ -123,8 +123,8 @@ void _XDMFGenerator_WriteFieldSchema( Un
Index var_I = 0;
Bool saveCoords = Dictionary_GetBool_WithDefault( context->dictionary, (Dictionary_Entry_Key)"saveCoordsWithFields", False );
Stream* errorStream = Journal_Register( Error_Type, (Name)CURR_MODULE_NAME );
- Name variableType = NULL;
- Name topologyType = NULL;
+ char* variableType = NULL;
+ char* topologyType = NULL;
unsigned componentCount = LiveComponentRegister_GetCount(stgLiveComponentRegister);
unsigned compI;
Stg_Component* stgComp;
@@ -138,7 +138,7 @@ void _XDMFGenerator_WriteFieldSchema( Un
feMesh = (FeMesh*)stgComp;
nDims = Mesh_GetDimSize( mesh );
- totalVerts = Mesh_GetGlobalSize( mesh, 0 );
+ totalVerts = Mesh_GetGlobalSize( mesh, (MeshTopology_Dim)0 );
elementGlobalSize = FeMesh_GetElementGlobalSize(mesh);
/* get connectivity array size */
@@ -214,9 +214,9 @@ void _XDMFGenerator_WriteFieldSchema( Un
if( Stg_Class_IsInstance( feVar->feMesh->generator, MeshAdaptor_Type)) feVarMesh = feVar->feMesh;
/** make sure that the fevariable femesh is the same as that used above for the geometry definition, if so proceed **/
if( feVarMesh == feMesh ){
- Name centering = NULL;
+ char* centering = NULL;
Index offset = 0;
- Index meshSize = Mesh_GetGlobalSize( feVar->feMesh, 0 );
+ Index meshSize = Mesh_GetGlobalSize( feVar->feMesh, (MeshTopology_Dim)0 );
Index dofCountIndex;
Index dofAtEachNodeCount;
@@ -303,9 +303,9 @@ void _XDMFGenerator_WriteSwarmSchema( Un
Index ii;
Swarm* currentSwarm;
SwarmVariable* swarmVar;
- Name swarmVarName;
- Name variableType = NULL;
- Name filename_part = NULL;
+ char* swarmVarName;
+ char* variableType = NULL;
+ char* filename_part = NULL;
Stream* errorStream = Journal_Register( Error_Type, (Name)CURR_MODULE_NAME );
const int FINISHED_WRITING_TAG = 100;
MPI_Status status;
diff -r d795d40fd164 -r 038180046f6f plugins/DensityChangeAtDepth/DensityChangeAtDepth.c
--- a/plugins/DensityChangeAtDepth/DensityChangeAtDepth.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/DensityChangeAtDepth/DensityChangeAtDepth.c Wed May 11 13:27:52 2011 -0700
@@ -122,7 +122,7 @@ void Underworld_DensityChange_Setup( Und
if( self->material==NULL ) {
printf("Error\nCounld find the material with index %d\n", materialIndex ); exit(0);
}
- materialExt = ExtensionManager_Get( self->material->extensionMgr, self->material, bft->materialExtHandle );
+ materialExt = (BuoyancyForceTerm_MaterialExt*)ExtensionManager_Get( self->material->extensionMgr, self->material, bft->materialExtHandle );
Journal_RPrintf( stream, "Will change %s's density at height %g from %g to %g\n",
self->material->name, self->height, materialExt->density, self->newDensity );
diff -r d795d40fd164 -r 038180046f6f plugins/EulerDeform/EulerDeform.c
--- a/plugins/EulerDeform/EulerDeform.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/EulerDeform/EulerDeform.c Wed May 11 13:27:52 2011 -0700
@@ -45,7 +45,7 @@
#include "EulerDeform.h"
-const char* EULERDEFORM_PLUGIN_TAG = "EulerDeform";
+Name EULERDEFORM_PLUGIN_TAG = "EulerDeform";
const Type Underworld_EulerDeform_Type = "EulerDeform";
ExtensionInfo_Index EulerDeform_ContextHandle;
@@ -92,7 +92,7 @@ void _Underworld_EulerDeform_AssignFromX
/* Create new context. */
EulerDeform_ContextHandle = ExtensionManager_Add( uwCtx->extensionMgr, (Name)Underworld_EulerDeform_Type, sizeof(EulerDeform_Context) );
- edCtx = ExtensionManager_Get( uwCtx->extensionMgr, uwCtx, EulerDeform_ContextHandle );
+ edCtx = (EulerDeform_Context*)ExtensionManager_Get( uwCtx->extensionMgr, uwCtx, EulerDeform_ContextHandle );
memset( edCtx, 0, sizeof(EulerDeform_Context) );
edCtx->ctx = (AbstractContext*)uwCtx;
@@ -118,7 +118,7 @@ void _Underworld_EulerDeform_Build( void
assert( component );
assert( uwCtx );
- edCtx = ExtensionManager_Get( uwCtx->extensionMgr, uwCtx, EulerDeform_ContextHandle );
+ edCtx = (EulerDeform_Context*)ExtensionManager_Get( uwCtx->extensionMgr, uwCtx, EulerDeform_ContextHandle );
/* Get the dictionary. */
edDict = Dictionary_Get( uwCtx->dictionary, (Dictionary_Entry_Key)"EulerDeform" );
@@ -180,68 +180,89 @@ void _Underworld_EulerDeform_Build( void
sys->staticFront = Dictionary_GetBool_WithDefault( sysDict, (Dictionary_Entry_Key)"staticFront", False );
sys->staticBack = Dictionary_GetBool_WithDefault( sysDict, (Dictionary_Entry_Key)"staticBack", False );
- sys->staticLeftTop = Dictionary_GetBool_WithDefault( sysDict, "staticLeftTop", sys->staticLeft && sys->staticTop );
- sys->staticRightTop = Dictionary_GetBool_WithDefault( sysDict, "staticRightTop", sys->staticRight && sys->staticTop );
+ sys->staticLeftTop = Dictionary_GetBool_WithDefault( sysDict, "staticLeftTop", (sys->staticLeft && sys->staticTop)
+ ? True : False);
+ sys->staticRightTop = Dictionary_GetBool_WithDefault( sysDict, "staticRightTop", (sys->staticRight && sys->staticTop)
+ ? True : False );
sys->staticLeftTopFront = Dictionary_GetBool_WithDefault( sysDict, "staticLeftTopFront",
- sys->staticLeft && sys->staticTop && sys->staticFront );
+ (sys->staticLeft && sys->staticTop && sys->staticFront)
+ ? True : False );
sys->staticRightTopFront = Dictionary_GetBool_WithDefault( sysDict, "staticRightTopFront",
- sys->staticRight && sys->staticTop && sys->staticFront );
+ (sys->staticRight && sys->staticTop && sys->staticFront)
+ ? True : False );
sys->staticLeftTopBack = Dictionary_GetBool_WithDefault( sysDict, "staticLeftTopBack",
- sys->staticLeft && sys->staticTop && sys->staticBack );
+ (sys->staticLeft && sys->staticTop && sys->staticBack)
+ ? True : False );
sys->staticRightTopBack = Dictionary_GetBool_WithDefault( sysDict, "staticRightTopBack",
- sys->staticRight && sys->staticTop && sys->staticBack );
+ (sys->staticRight && sys->staticTop && sys->staticBack)
+ ? True : False );
- sys->staticLeftBottom = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBottom", sys->staticLeft && sys->staticBottom );
- sys->staticRightBottom = Dictionary_GetBool_WithDefault( sysDict, "staticRightBottom", sys->staticRight && sys->staticBottom );
+ sys->staticLeftBottom = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBottom", (sys->staticLeft && sys->staticBottom)
+ ? True : False );
+ sys->staticRightBottom = Dictionary_GetBool_WithDefault( sysDict, "staticRightBottom", (sys->staticRight && sys->staticBottom)
+ ? True : False );
sys->staticLeftBottomFront = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBottomFront",
- sys->staticLeft && sys->staticBottom && sys->staticFront );
+ (sys->staticLeft && sys->staticBottom && sys->staticFront)
+ ? True : False );
sys->staticRightBottomFront = Dictionary_GetBool_WithDefault( sysDict, "staticRightBottomFront",
- sys->staticRight && sys->staticBottom && sys->staticFront );
+ (sys->staticRight && sys->staticBottom && sys->staticFront)
+ ? True : False );
sys->staticLeftBottomBack = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBottomBack",
- sys->staticLeft && sys->staticBottom && sys->staticBack );
+ (sys->staticLeft && sys->staticBottom && sys->staticBack)
+ ? True : False );
sys->staticRightBottomBack = Dictionary_GetBool_WithDefault( sysDict, "staticRightBottomBack",
- sys->staticRight && sys->staticBottom && sys->staticBack );
+ (sys->staticRight && sys->staticBottom && sys->staticBack)
+ ? True : False );
- sys->staticLeftFront = Dictionary_GetBool_WithDefault( sysDict, "staticLeftFront", sys->staticLeft && sys->staticFront );
- sys->staticRightFront = Dictionary_GetBool_WithDefault( sysDict, "staticRightFront", sys->staticRight && sys->staticFront );
- sys->staticLeftBack = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBack", sys->staticLeft && sys->staticBack );
- sys->staticRightBack = Dictionary_GetBool_WithDefault( sysDict, "staticRightBack", sys->staticRight && sys->staticBack );
+ sys->staticLeftFront = Dictionary_GetBool_WithDefault( sysDict, "staticLeftFront", (sys->staticLeft && sys->staticFront)
+ ? True : False );
+ sys->staticRightFront = Dictionary_GetBool_WithDefault( sysDict, "staticRightFront", (sys->staticRight && sys->staticFront)
+ ? True : False );
+ sys->staticLeftBack = Dictionary_GetBool_WithDefault( sysDict, "staticLeftBack", (sys->staticLeft && sys->staticBack)
+ ? True : False );
+ sys->staticRightBack = Dictionary_GetBool_WithDefault( sysDict, "staticRightBack", (sys->staticRight && sys->staticBack)
+ ? True : False );
- sys->staticTopFront = Dictionary_GetBool_WithDefault( sysDict, "staticTopFront", sys->staticTop && sys->staticFront );
- sys->staticBottomFront = Dictionary_GetBool_WithDefault( sysDict, "staticBottomFront", sys->staticBottom && sys->staticFront );
- sys->staticTopBack = Dictionary_GetBool_WithDefault( sysDict, "staticTopBack", sys->staticTop && sys->staticBack );
- sys->staticBottomBack = Dictionary_GetBool_WithDefault( sysDict, "staticBottomBack", sys->staticBottom && sys->staticBack );
+ sys->staticTopFront = Dictionary_GetBool_WithDefault( sysDict, "staticTopFront", (sys->staticTop && sys->staticFront)
+ ? True : False );
+ sys->staticBottomFront = Dictionary_GetBool_WithDefault( sysDict, "staticBottomFront", (sys->staticBottom && sys->staticFront)
+ ? True : False );
+ sys->staticTopBack = Dictionary_GetBool_WithDefault( sysDict, "staticTopBack", (sys->staticTop && sys->staticBack)
+ ? True : False );
+ sys->staticBottomBack = Dictionary_GetBool_WithDefault( sysDict, "staticBottomBack", (sys->staticBottom && sys->staticBack)
+ ? True : False );
sys->floatLeftTop = Dictionary_GetBool_WithDefault( sysDict, "floatLeftTop", False );
sys->floatRightTop = Dictionary_GetBool_WithDefault( sysDict, "floatRightTop", False );
sys->staticSides =
- sys->staticLeft
- || sys->staticRight
- || sys->staticTop
- || sys->staticBottom
- || sys->staticFront
- || sys->staticBack
- || sys->staticLeftTop
- || sys->staticRightTop
- || sys->staticLeftTopFront
- || sys->staticRightTopFront
- || sys->staticLeftTopBack
- || sys->staticRightTopBack
- || sys->staticLeftBottom
- || sys->staticRightBottom
- || sys->staticLeftBottomFront
- || sys->staticRightBottomFront
- || sys->staticLeftBottomBack
- || sys->staticRightBottomBack
- || sys->staticLeftFront
- || sys->staticRightFront
- || sys->staticLeftBack
- || sys->staticRightBack
- || sys->staticTopFront
- || sys->staticBottomFront
- || sys->staticTopBack
- || sys->staticBottomBack;
+ (sys->staticLeft
+ || sys->staticRight
+ || sys->staticTop
+ || sys->staticBottom
+ || sys->staticFront
+ || sys->staticBack
+ || sys->staticLeftTop
+ || sys->staticRightTop
+ || sys->staticLeftTopFront
+ || sys->staticRightTopFront
+ || sys->staticLeftTopBack
+ || sys->staticRightTopBack
+ || sys->staticLeftBottom
+ || sys->staticRightBottom
+ || sys->staticLeftBottomFront
+ || sys->staticRightBottomFront
+ || sys->staticLeftBottomBack
+ || sys->staticRightBottomBack
+ || sys->staticLeftFront
+ || sys->staticRightFront
+ || sys->staticLeftBack
+ || sys->staticRightBack
+ || sys->staticTopFront
+ || sys->staticBottomFront
+ || sys->staticTopBack
+ || sys->staticBottomBack)
+ ? True : False;
if(sys->staticRight && sys->wrapTop
@@ -255,7 +276,7 @@ void _Underworld_EulerDeform_Build( void
Dictionary_GetDouble( uwCtx->dictionary, "minX");
/* Read the list of variables to interpolate. */
- varLst = Dictionary_Entry_Value_GetMember( Dictionary_Entry_Value_GetElement( sysLst, (Dictionary_Entry_Key)sys_i ), "fields" );
+ varLst = Dictionary_Entry_Value_GetMember( Dictionary_Entry_Value_GetElement( sysLst, sys_i ), "fields" );
if( varLst ) {
unsigned var_i;
@@ -302,13 +323,13 @@ void _Underworld_EulerDeform_Build( void
if( edCtx->nSystems > 0 ) {
/* Insert the sync step. */
- TimeIntegrator_PrependSetupEP( edCtx->timeIntegrator, "EulerDeform_IntegrationSetup", EulerDeform_IntegrationSetup, "EulerDeform", edCtx );
+ TimeIntegrator_PrependSetupEP( edCtx->timeIntegrator, "EulerDeform_IntegrationSetup", (void*)EulerDeform_IntegrationSetup, "EulerDeform", edCtx );
}
/* Insert the remesh step. Note that this should look for the surface process
plugin's time integrator finish routine and ensure we enter the remesh step
after that one but before the particle updating routines. */
- TimeIntegrator_PrependFinishEP( edCtx->timeIntegrator, "EulerDeform_Execute", EulerDeform_Remesh, "EulerDeform", edCtx );
+ TimeIntegrator_PrependFinishEP( edCtx->timeIntegrator, "EulerDeform_Execute", (void*)EulerDeform_Remesh, "EulerDeform", edCtx );
}
@@ -538,10 +559,10 @@ Variable* EulerDeform_RegisterLocalNodeC
FeMesh* self = (FeMesh*)sys->mesh;
Variable_Register* variable_Register = (Variable_Register*) _variable_Register;
Variable* variable;
- Name variableName;
- Name variableNameX;
- Name variableNameY;
- Name variableNameZ;
+ char* variableName;
+ char* variableNameX;
+ char* variableNameY;
+ char* variableNameZ;
/* Allocate advection array. */
sys->verts = AllocArray( double, Mesh_GetLocalSize( self, MT_VERTEX ) * Mesh_GetDimSize( self ) );
@@ -1139,7 +1160,7 @@ Bool _EulerDeform_FindBarycenter1D( cons
bcs[1] = (pnt - crds[0])/(crds[1] - crds[0]);
bcs[0] = 1.0 - bcs[1];
- return (bcs[0] >= 0.0 && bcs[0] <= 1.0 && bcs[1] >= 0.0 && bcs[1] <= 1.0);
+ return (bcs[0] >= 0.0 && bcs[0] <= 1.0 && bcs[1] >= 0.0 && bcs[1] <= 1.0) ? True : False;
}
diff -r d795d40fd164 -r 038180046f6f plugins/EulerDeform/EulerDeform.h
--- a/plugins/EulerDeform/EulerDeform.h Fri May 06 14:03:37 2011 -0700
+++ b/plugins/EulerDeform/EulerDeform.h Wed May 11 13:27:52 2011 -0700
@@ -26,7 +26,7 @@
#ifndef __Underworld_plugins_EulerDeform_EulerDeform_h__
#define __Underworld_plugins_EulerDeform_EulerDeform_h__
- extern const char* EULERDEFORM_PLUGIN_TAG;
+ extern Name EULERDEFORM_PLUGIN_TAG;
Index Underworld_EulerDeform_Register( PluginsManager* pluginsMgr );
diff -r d795d40fd164 -r 038180046f6f plugins/HRS_Erosion/HRS_Erosion.c
--- a/plugins/HRS_Erosion/HRS_Erosion.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/HRS_Erosion/HRS_Erosion.c Wed May 11 13:27:52 2011 -0700
@@ -122,8 +122,8 @@ void Underworld_HRS_Erosion_Execute( Tim
RegularMeshUtils_Node_1DTo3D
( mesh, Mesh_DomainToGlobal( mesh, MT_VERTEX, nNodes-1 ), ijk_right );
- on_top=(ijk_right[1]==grid->sizes[1]-1);
- on_right=(ijk_right[0]==grid->sizes[0]-1);
+ on_top=(ijk_right[1]==grid->sizes[1]-1) ? True : False;
+ on_right=(ijk_right[0]==grid->sizes[0]-1) ? True : False;
if(on_top && on_right)
{
x_right=mesh->verts[nNodes-1][0];
@@ -331,7 +331,7 @@ void _Underworld_HRS_Erosion_AssignFromX
Underworld_HRS_Erosion_Type,
sizeof(Underworld_HRS_Erosion_Context) );
- spCtx = ExtensionManager_Get( uwCtx->extensionMgr, uwCtx,
+ spCtx = (Underworld_HRS_Erosion_Context*)ExtensionManager_Get( uwCtx->extensionMgr, uwCtx,
Underworld_HRS_Erosion_ContextHandle );
memset( spCtx, 0, sizeof(Underworld_HRS_Erosion_Context) );
spCtx->ctx = (AbstractContext*)uwCtx;
@@ -376,7 +376,7 @@ void _Underworld_HRS_Erosion_Build( void
assert( UnderworldCtx );
/* Get the context. */
- spCtx = ExtensionManager_Get( UnderworldCtx->extensionMgr, UnderworldCtx, Underworld_HRS_Erosion_ContextHandle );
+ spCtx = (Underworld_HRS_Erosion_Context*)ExtensionManager_Get( UnderworldCtx->extensionMgr, UnderworldCtx, Underworld_HRS_Erosion_ContextHandle );
if( !spCtx->mesh )
return;
@@ -386,7 +386,7 @@ void _Underworld_HRS_Erosion_Build( void
values. */
TimeIntegrator_AppendSetupEP( spCtx->timeIntegrator,
"Underworld_HRS_Erosion_Execute",
- Underworld_HRS_Erosion_Execute,
+ (void*)Underworld_HRS_Erosion_Execute,
"HRS_Erosion",
spCtx );
}
diff -r d795d40fd164 -r 038180046f6f plugins/IncompressibleExtensionBC/IncompressibleExtensionBC.c
--- a/plugins/IncompressibleExtensionBC/IncompressibleExtensionBC.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/IncompressibleExtensionBC/IncompressibleExtensionBC.c Wed May 11 13:27:52 2011 -0700
@@ -260,7 +260,7 @@ void Underworld_IncompressibleExtensionB
numNodes = FeMesh_GetNodeLocalSize(mesh);
for(ii = 0; ii < numNodes; ii++) {
- Grid_Lift(nodeGrid, FeMesh_NodeDomainToGlobal(mesh, ii), nodeInds);
+ Grid_Lift(nodeGrid, FeMesh_NodeDomainToGlobal(mesh, ii), (unsigned*)nodeInds);
Mesh_GetVertex(mesh, ii)[0] = minCrd[0] + ((double)nodeInds[0])*nodeWidth[0];
Mesh_GetVertex(mesh, ii)[1] = minCrd[1] + ((double)nodeInds[1])*nodeWidth[1];
}
@@ -279,10 +279,10 @@ void Underworld_IncompressibleExtensionB
numNodes = FeMesh_GetNodeLocalSize(pmesh);
for(ii = 0; ii < numNodes; ii++) {
- Grid_Lift(pnodeGrid, FeMesh_NodeDomainToGlobal(pmesh, ii), nodeInds);
+ Grid_Lift(pnodeGrid, FeMesh_NodeDomainToGlobal(pmesh, ii), (unsigned*)nodeInds);
nodeInds[0] *= 2;
nodeInds[1] *= 2;
- insist(FeMesh_NodeGlobalToDomain(mesh, Grid_Project(nodeGrid, nodeInds), &lind), != 0);
+ insist(FeMesh_NodeGlobalToDomain(mesh, Grid_Project(nodeGrid, (unsigned*)nodeInds), (unsigned*)(&lind)), != 0);
memcpy(Mesh_GetVertex(pmesh, ii), Mesh_GetVertex(mesh, lind), 2*sizeof(double));
}
}
@@ -317,7 +317,7 @@ void _Underworld_IncompressibleExtension
if( Stg_ComponentFactory_PluginGetBool( cf, self, (Dictionary_Entry_Key)"Remesh", False ) ) {
TimeIntegrator_PrependFinishEP(
- timeIntegrator, "Underworld_IncompressibleExtensionBC_Remesh", Underworld_IncompressibleExtensionBC_Remesh,
+ timeIntegrator, "Underworld_IncompressibleExtensionBC_Remesh", (void*)Underworld_IncompressibleExtensionBC_Remesh,
CURR_MODULE_NAME, self );
}
}
diff -r d795d40fd164 -r 038180046f6f plugins/MeshAdvectionCorrection/MeshAdvectionCorrection.c
--- a/plugins/MeshAdvectionCorrection/MeshAdvectionCorrection.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/MeshAdvectionCorrection/MeshAdvectionCorrection.c Wed May 11 13:27:52 2011 -0700
@@ -168,7 +168,7 @@ void MeshAdvectionCorrection( void* sle,
"artificial nodal velocities" );
/* get the plugin from the context */
- plugin = ExtensionManager_Get(
+ plugin = (Underworld_MeshAdvectionCorrection_ContextExt*)ExtensionManager_Get(
context->extensionMgr,
context,
Underworld_MeshAdvectionCorrection_ContextExtHandle );
@@ -203,17 +203,17 @@ void _Underworld_MeshAdvectionCorrection
AdvectionDiffusionSLE* energySLE = (AdvectionDiffusionSLE* ) Stg_ComponentFactory_ConstructByName( cf, (Name)"EnergyEqn", UnderworldContext, True, data );
Journal_DFirewall(
- (Bool )context,
+ context!=NULL,
Journal_Register( Error_Type, (Name)Underworld_MeshAdvectionCorrection_Type ),
"No context found\n" );
Journal_DFirewall(
- (Bool)energySLE,
+ energySLE!=NULL,
Journal_Register( Error_Type, (Name)Underworld_MeshAdvectionCorrection_Type ),
"The required energy SLE component has not been created or placed on the context.\n");
/* Add the extension to the context */
Underworld_MeshAdvectionCorrection_ContextExtHandle = ExtensionManager_Add( context->extensionMgr, (Name)Underworld_MeshAdvectionCorrection_Type, sizeof( Underworld_MeshAdvectionCorrection_ContextExt ) );
- plugin = ExtensionManager_Get(
+ plugin = (Underworld_MeshAdvectionCorrection_ContextExt*)ExtensionManager_Get(
context->extensionMgr,
context,
Underworld_MeshAdvectionCorrection_ContextExtHandle );
diff -r d795d40fd164 -r 038180046f6f plugins/Output/VTKOutput/VTKOutput.c
--- a/plugins/Output/VTKOutput/VTKOutput.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/Output/VTKOutput/VTKOutput.c Wed May 11 13:27:52 2011 -0700
@@ -162,7 +162,7 @@ void VTKOutput_particles(Swarm* swarm,
YieldRheology* rheology;
FILE *fp, *pfp;
- Name filename;
+ char* filename;
/* Open the processor specific output file */
Stg_asprintf(&filename,"%s/%s.%d.%05d.vtu",outputPath,swarm->name,myRank,
@@ -295,7 +295,7 @@ void VTKOutput_particles(Swarm* swarm,
StoreVisc* self = (StoreVisc*) rheology;
StoreVisc_ParticleExt* particleExt;
particleExt=
- ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
+ (StoreVisc_ParticleExt*)ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
viscosity=particleExt->effVisc;
}
/* Get stress */
@@ -304,7 +304,7 @@ void VTKOutput_particles(Swarm* swarm,
StoreStress* self = (StoreStress*) rheology;
StoreStress_ParticleExt* particleExt;
particleExt=
- ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
+ (StoreStress_ParticleExt*)ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
stress[0]=particleExt->stress[0];
stress[1]=particleExt->stress[1];
stress[2]=particleExt->stress[2];
@@ -509,7 +509,7 @@ void VTKOutput_fields(void *context, int
int lower[3], upper[3], p_lower[3], p_upper[3];
HydrostaticTerm *hydrostaticTerm;
- Name field_filename;
+ char* field_filename;
FILE *field_fp, *pfield_fp;
Dictionary_Entry_Value* field_list;
diff -r d795d40fd164 -r 038180046f6f plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.c
--- a/plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.c Wed May 11 13:27:52 2011 -0700
@@ -110,7 +110,7 @@ void _Underworld_Ra_Scaling_AssignFromXM
if ( checkScaling ) {
EntryPoint_Append( Context_GetEntryPoint( context, AbstractContext_EP_Build ),
"Underworld CheckScalings",
- _Ra_CheckScalings_Func,
+ (void*)_Ra_CheckScalings_Func,
Underworld_Ra_Scaling_Type );
}
}
diff -r d795d40fd164 -r 038180046f6f plugins/SurfaceProcess/SurfaceProcess.c
--- a/plugins/SurfaceProcess/SurfaceProcess.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/SurfaceProcess/SurfaceProcess.c Wed May 11 13:27:52 2011 -0700
@@ -207,7 +207,7 @@ void _Underworld_SurfaceProcess_AssignFr
Underworld_SurfaceProcess_Type,
sizeof(Underworld_SurfaceProcess_Context) );
- spCtx = ExtensionManager_Get( uwCtx->extensionMgr, uwCtx,
+ spCtx = (Underworld_SurfaceProcess_Context*)ExtensionManager_Get( uwCtx->extensionMgr, uwCtx,
Underworld_SurfaceProcess_ContextHandle );
memset( spCtx, 0, sizeof(Underworld_SurfaceProcess_Context) );
spCtx->ctx = (AbstractContext*)uwCtx;
@@ -244,7 +244,7 @@ void _Underworld_SurfaceProcess_Build( v
assert( UnderworldCtx );
/* Get the context. */
- spCtx = ExtensionManager_Get( UnderworldCtx->extensionMgr, UnderworldCtx, Underworld_SurfaceProcess_ContextHandle );
+ spCtx = (Underworld_SurfaceProcess_Context*)ExtensionManager_Get( UnderworldCtx->extensionMgr, UnderworldCtx, Underworld_SurfaceProcess_ContextHandle );
if( !spCtx->mesh )
return;
@@ -254,7 +254,7 @@ void _Underworld_SurfaceProcess_Build( v
values. */
TimeIntegrator_AppendSetupEP( spCtx->timeIntegrator,
"Underworld_SurfaceProcess_Execute",
- Underworld_SurfaceProcess_Execute,
+ (void*)Underworld_SurfaceProcess_Execute,
"SurfaceProcess",
spCtx );
}
diff -r d795d40fd164 -r 038180046f6f plugins/VariableConditions/ShapeFemIC/ShapeFemIC.c
--- a/plugins/VariableConditions/ShapeFemIC/ShapeFemIC.c Fri May 06 14:03:37 2011 -0700
+++ b/plugins/VariableConditions/ShapeFemIC/ShapeFemIC.c Wed May 11 13:27:52 2011 -0700
@@ -113,7 +113,7 @@ void Underworld_LinearShapeIC( Node_Loca
/* Get the shape */
shape = (Stg_Shape* ) LiveComponentRegister_Get( context->CF->LCRegister, (Name)shapeName );
- Journal_Firewall( (Bool ) shape,
+ Journal_Firewall( shape!=NULL,
Journal_Register( Error_Type, (Name)Underworld_ShapeFemIC_Type ),
"Shape %s not found.\n", shapeName );
More information about the CIG-COMMITS
mailing list