[cig-commits] commit: Fix compiler warnings.
Mercurial
hg at geodynamics.org
Thu Mar 15 12:46:37 PDT 2012
changeset: 642:c691aa765e36
user: Walter Landry <wlandry at caltech.edu>
date: Thu Mar 15 12:45:27 2012 -0700
files: Geometry/src/Dimension.cxx Mesh/src/MeshVariable.cxx Mesh/src/Mesh_CentroidType.cxx Mesh/src/Mesh_HexType.cxx Mesh/src/Mesh_RegularAlgorithms.cxx Mesh/src/Remesher.cxx Swarm/src/FileParticleLayout.cxx Swarm/src/ParticleCommHandler.cxx Swarm/src/SwarmDump.cxx Swarm/src/SwarmShapeVC.cxx Swarm/tests/ShadowSyncSuite.cxx Swarm/tests/SingleAttractorSuite.cxx Swarm/tests/SwarmDumpAndLoadSuite.cxx Swarm/tests/SwarmOutputSuite.cxx Utils/src/RegularRemesherCmpt.cxx
description:
Fix compiler warnings.
diff -r 19f6e7546170 -r c691aa765e36 Geometry/src/Dimension.cxx
--- a/Geometry/src/Dimension.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Geometry/src/Dimension.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -39,19 +39,19 @@ void Dimension_3DTo1D_3_Func( Index dim0
Index dim0Size, Index dim1Size, Index dim2Size,
Index* outputIndexPtr )
{
- Index dimSizes[3];
- dimSizes[0] = (dim0Size) ? (dim0Size) : 1;
- dimSizes[1] = (dim1Size) ? (dim1Size) : 1;
- dimSizes[2] = (dim2Size) ? (dim2Size) : 1;
-
#if DEBUG
{
- Stream* dimensionError = Journal_Register( Error_Type, (Name)"DimensionMacros" );
- Journal_Firewall( (dim0 < dimSizes[0] ), dimensionError, "Error: Given coordinate[0] value %d >= "
- "regionSize[0] %d\n", dim0, dimSizes[0] );
- Journal_Firewall( (dim1 < dimSizes[1]), dimensionError, "Error: Given coordinate[1] value %d >= "
- "regionSize[1] %d\n", dim1, dimSizes[1] );
- Journal_Firewall( (dim2 < dimSizes[2]), dimensionError, "Error: Given coordinate[2] value %d >= "
+ Index dimSizes[3];
+ dimSizes[0] = (dim0Size) ? (dim0Size) : 1;
+ dimSizes[1] = (dim1Size) ? (dim1Size) : 1;
+ dimSizes[2] = (dim2Size) ? (dim2Size) : 1;
+
+ Stream* dimensionError = Journal_Register( Error_Type, (Name)"DimensionMacros" );
+ Journal_Firewall( (dim0 < dimSizes[0] ), dimensionError, "Error: Given coordinate[0] value %d >= "
+ "regionSize[0] %d\n", dim0, dimSizes[0] );
+ Journal_Firewall( (dim1 < dimSizes[1]), dimensionError, "Error: Given coordinate[1] value %d >= "
+ "regionSize[1] %d\n", dim1, dimSizes[1] );
+ Journal_Firewall( (dim2 < dimSizes[2]), dimensionError, "Error: Given coordinate[2] value %d >= "
"regionSize[2] %d\n", dim2, dimSizes[2] );
}
#endif
diff -r 19f6e7546170 -r c691aa765e36 Mesh/src/MeshVariable.cxx
--- a/Mesh/src/MeshVariable.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Mesh/src/MeshVariable.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -129,7 +129,6 @@ void _MeshVariable_AssignFromXML( void*
Name dataTypeName = NULL;
Name rankName = NULL;
void* variableRegister = NULL;
- void* pointerRegister = NULL;
Name* names = NULL;
Stream* error = Journal_Register( Error_Type, (Name)self->type );
Mesh* mesh;
@@ -149,8 +148,7 @@ void _MeshVariable_AssignFromXML( void*
/* Grab Registers */
variableRegister = context->variable_Register;
assert( variableRegister );
- pointerRegister = context->pointer_Register;
- assert( pointerRegister );
+ assert( context->pointer_Register );
/* Construct the mesh. */
mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"mesh", Mesh, True, data );
diff -r 19f6e7546170 -r c691aa765e36 Mesh/src/Mesh_CentroidType.cxx
--- a/Mesh/src/Mesh_CentroidType.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Mesh/src/Mesh_CentroidType.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -115,9 +115,11 @@ void _Mesh_CentroidType_Print( void* cen
}
void Mesh_CentroidType_Update( void* centroidType ) {
+#ifndef NDEBUG
Mesh_CentroidType* self = (Mesh_CentroidType*)centroidType;
assert( self && Stg_CheckType( self, Mesh_CentroidType ) );
+#endif
}
Bool Mesh_CentroidType_ElementHasPoint( void* centroidType, unsigned elInd, double* point,
diff -r 19f6e7546170 -r c691aa765e36 Mesh/src/Mesh_HexType.cxx
--- a/Mesh/src/Mesh_HexType.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Mesh/src/Mesh_HexType.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -970,7 +970,6 @@ Bool Mesh_HexType_ElementHasPoint1DWithI
MeshTopology_Dim* dim, unsigned* ind )
{
Mesh* mesh;
- unsigned nInc;
const int* inc;
assert( self && Stg_CheckType( self, Mesh_HexType ) );
@@ -982,9 +981,8 @@ Bool Mesh_HexType_ElementHasPoint1DWithI
mesh = self->mesh;
Mesh_GetIncidence( mesh, MT_EDGE, elInd, MT_VERTEX, self->incArray );
- nInc = IArray_GetSize( self->incArray );
+ assert(2 == IArray_GetSize( self->incArray ));
inc = IArray_GetPtr( self->incArray );
- assert( nInc == 2 );
if( point[0] > *Mesh_GetVertex( mesh, inc[self->vertMap[0]] ) &&
point[0] < *Mesh_GetVertex( mesh, inc[self->vertMap[1]] ) )
diff -r 19f6e7546170 -r c691aa765e36 Mesh/src/Mesh_RegularAlgorithms.cxx
--- a/Mesh/src/Mesh_RegularAlgorithms.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Mesh/src/Mesh_RegularAlgorithms.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -177,11 +177,8 @@ Bool _Mesh_RegularAlgorithms_Search( voi
Bool _Mesh_RegularAlgorithms_Search( void* algorithms, void* _mesh, double* point,
MeshTopology_Dim* dim, unsigned* ind )
{
- Mesh_RegularAlgorithms* self = (Mesh_RegularAlgorithms*)algorithms;
- Mesh* mesh = (Mesh*)_mesh;
-
- assert( self );
- assert( mesh );
+ assert( (Mesh_RegularAlgorithms*)algorithms );
+ assert( (Mesh*)_mesh );
assert( dim );
assert( ind );
@@ -234,11 +231,8 @@ double _Mesh_RegularAlgorithms_GetMinimu
}
void _Mesh_RegularAlgorithms_GetLocalCoordRange( void* algorithms, void* _mesh, double* min, double* max ) {
- Mesh_RegularAlgorithms* self = (Mesh_RegularAlgorithms*)algorithms;
- Mesh* mesh = (Mesh*)_mesh;
-
- assert( self );
- assert( mesh );
+ assert( (Mesh_RegularAlgorithms*)algorithms );
+ assert( (Mesh*)_mesh );
assert( min );
assert( max );
@@ -247,11 +241,8 @@ void _Mesh_RegularAlgorithms_GetLocalCoo
}
void _Mesh_RegularAlgorithms_GetDomainCoordRange( void* algorithms, void* _mesh, double* min, double* max ) {
- Mesh_RegularAlgorithms* self = (Mesh_RegularAlgorithms*)algorithms;
- Mesh* mesh = (Mesh*)_mesh;
-
- assert( self );
- assert( mesh );
+ assert( (Mesh_RegularAlgorithms*)algorithms );
+ assert( (Mesh*)_mesh );
assert( min );
assert( max );
@@ -260,11 +251,8 @@ void _Mesh_RegularAlgorithms_GetDomainCo
}
void _Mesh_RegularAlgorithms_GetGlobalCoordRange( void* algorithms, void* _mesh, double* min, double* max ) {
- Mesh_RegularAlgorithms* self = (Mesh_RegularAlgorithms*)algorithms;
- Mesh* mesh = (Mesh*)_mesh;
-
- assert( self );
- assert( mesh );
+ assert( (Mesh_RegularAlgorithms*)algorithms );
+ assert( (Mesh*)_mesh );
assert( min );
assert( max );
diff -r 19f6e7546170 -r c691aa765e36 Mesh/src/Remesher.cxx
--- a/Mesh/src/Remesher.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Mesh/src/Remesher.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -156,10 +156,7 @@ void _Remesher_Initialise( void* remeshe
}
void _Remesher_Execute( void* remesher, void* data ) {
- Remesher* self = (Remesher*)remesher;
-
-
- assert( self );
+ assert( (Remesher*)remesher );
}
void _Remesher_Destroy( void* remesher, void* data ) {
diff -r 19f6e7546170 -r c691aa765e36 Swarm/src/FileParticleLayout.cxx
--- a/Swarm/src/FileParticleLayout.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/src/FileParticleLayout.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -332,9 +332,9 @@ void _FileParticleLayout_SetInitialCount
void _FileParticleLayout_InitialiseParticles( void* particleLayout, void* _swarm ) {
FileParticleLayout* self = (FileParticleLayout*)particleLayout;
- Swarm *swarm = (Swarm*)_swarm;
#ifdef READ_HDF5
+ Swarm *swarm = (Swarm*)_swarm;
SwarmVariable* swarmVar;
Index swarmVar_I;
char dataSpaceName[1024];
diff -r 19f6e7546170 -r c691aa765e36 Swarm/src/ParticleCommHandler.cxx
--- a/Swarm/src/ParticleCommHandler.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/src/ParticleCommHandler.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -152,6 +152,7 @@ void* _ParticleCommHandler_Copy( const v
// TODO: put back in.
assert(0);
+ return NULL;
}
void _ParticleCommHandler_AssignFromXML( void* pCommHandler, Stg_ComponentFactory* cf, void* data ){
diff -r 19f6e7546170 -r c691aa765e36 Swarm/src/SwarmDump.cxx
--- a/Swarm/src/SwarmDump.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/src/SwarmDump.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -213,12 +213,9 @@ void _SwarmDump_Execute( void* swarmDump
void _SwarmDump_Execute( void* swarmDump, void* data ) {
SwarmDump* self = (SwarmDump*) swarmDump;
AbstractContext* context = Stg_CheckType( data, AbstractContext );
- Particle_Index particleLocalCount;
- SizeT particleSize;
Index swarm_I;
Swarm* swarm;
Stream* debug = Journal_Register( Debug_Type, (Name)self->type );
- Processor_Index rank_I;
Journal_DPrintf( debug, "Proc %d: beginning Swarm binary checkpoint in %s():\n", self->swarmList[0]->myRank, __func__ );
Stream_Indent( debug );
@@ -231,8 +228,6 @@ void _SwarmDump_Execute( void* swarmDump
swarmSaveFileNamePart1 = Context_GetCheckPointWritePrefixString( context );
swarm = self->swarmList[ swarm_I ];
- particleLocalCount = swarm->particleLocalCount;
- particleSize = (SizeT) swarm->particleExtensionMgr->finalSize;
if ( self->newFileEachTime )
Stg_asprintf( &swarmSaveFileNamePart2, "%s/%s.%05d", swarmSaveFileNamePart1, swarm->name, context->timeStep );
@@ -249,11 +244,13 @@ void _SwarmDump_Execute( void* swarmDump
#endif
#ifdef DEBUG
- for ( rank_I = 0; rank_I < swarm->nProc; rank_I++ ) {
+ for (Processor_Index rank_I = 0; rank_I < swarm->nProc; rank_I++ ) {
if ( swarm->myRank == rank_I ) {
- Journal_DPrintf( debug, "Proc %d: for swarm \"%s\", dumping its %u particles of size %u bytes "
- "each (= %g bytes total) to file %s\n", swarm->myRank, swarm->name, particleLocalCount,
- particleSize, (float)(particleLocalCount * particleSize), swarmSaveFileName );
+ SizeT particleSize = (SizeT) swarm->particleExtensionMgr->finalSize;
+ Particle_Index particleLocalCount = swarm->particleLocalCount;
+ Journal_DPrintf( debug, "Proc %d: for swarm \"%s\", dumping its %u particles of size %u bytes "
+ "each (= %g bytes total) to file %s\n", swarm->myRank, swarm->name, particleLocalCount,
+ particleSize, (float)(particleLocalCount * particleSize), swarmSaveFileName );
}
MPI_Barrier( swarm->comm );
}
@@ -262,6 +259,8 @@ void _SwarmDump_Execute( void* swarmDump
#ifdef WRITE_HDF5
SwarmDump_DumpToHDF5( self, swarm, swarmSaveFileName );
#else
+ SizeT particleSize = (SizeT) swarm->particleExtensionMgr->finalSize;
+ Particle_Index particleLocalCount = swarm->particleLocalCount;
BinaryStream_WriteAllProcessors( swarmSaveFileName, swarm->particles, particleSize, (SizeT) particleLocalCount, swarm->comm );
#endif
Memory_Free( swarmSaveFileName );
diff -r 19f6e7546170 -r c691aa765e36 Swarm/src/SwarmShapeVC.cxx
--- a/Swarm/src/SwarmShapeVC.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/src/SwarmShapeVC.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -318,8 +318,9 @@ void _SwarmShapeVC_Build( void* variabl
/****************** VariableCondition Virtual Functions ******************/
void _SwarmShapeVC_BuildSelf( void* variableCondition, void* data /* for build phase */ ) {
SwarmShapeVC* self = (SwarmShapeVC*)variableCondition;
+#ifndef NDEBUG
AbstractContext* context = (AbstractContext*) data;
-
+#endif
assert( context && Stg_Class_IsInstance( context, AbstractContext_Type ) );
/* dave - 06.08.07 */
diff -r 19f6e7546170 -r c691aa765e36 Swarm/tests/ShadowSyncSuite.cxx
--- a/Swarm/tests/ShadowSyncSuite.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/tests/ShadowSyncSuite.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -81,7 +81,6 @@ void ShadowSyncSuite_TestShadowSync( Sha
void ShadowSyncSuite_TestShadowSync( ShadowSyncSuiteData* data ) {
DomainContext* context = NULL;
Dictionary* dictionary;
- Dictionary* componentDict;
Stg_ComponentFactory* cf;
Swarm* swarm = NULL;
Particle particle;
@@ -105,8 +104,7 @@ void ShadowSyncSuite_TestShadowSync( Sha
dictionary = context->dictionary;
Journal_ReadFromDictionary( dictionary );
Dictionary_Add( dictionary, (Dictionary_Entry_Key)"procToWatch", Dictionary_Entry_Value_FromUnsignedInt( procToWatch ) );
- componentDict = Dictionary_GetDictionary( dictionary, "components" );
- assert( componentDict );
+ assert( Dictionary_GetDictionary( dictionary, "components" ) );
KeyCall( context, context->constructExtensionsK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->constructExtensionsK), context );
diff -r 19f6e7546170 -r c691aa765e36 Swarm/tests/SingleAttractorSuite.cxx
--- a/Swarm/tests/SingleAttractorSuite.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/tests/SingleAttractorSuite.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -79,7 +79,6 @@ void SingleAttractorSuite_Teardown( Sing
void SingleAttractorSuite_TestSingleAttractor( SingleAttractorSuiteData* data ) {
Dictionary* dictionary;
- Dictionary* componentDict;
Stg_ComponentFactory* cf;
Swarm* swarm = NULL;
Particle particle;
@@ -101,8 +100,7 @@ void SingleAttractorSuite_TestSingleAttr
dictionary = context->dictionary;
Journal_ReadFromDictionary( dictionary );
- componentDict = Dictionary_GetDictionary( dictionary, "components" );
- assert( componentDict );
+ assert( Dictionary_GetDictionary( dictionary, "components" ) );
KeyCall( context, context->constructExtensionsK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->constructExtensionsK), context );
diff -r 19f6e7546170 -r c691aa765e36 Swarm/tests/SwarmDumpAndLoadSuite.cxx
--- a/Swarm/tests/SwarmDumpAndLoadSuite.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/tests/SwarmDumpAndLoadSuite.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -70,7 +70,6 @@ void SwarmDumpAndLoadSuite_Teardown( Swa
}
void SwarmDumpAndLoadSuite_TestSwarmDumpAndLoad( SwarmDumpAndLoadSuiteData* data ) {
- int ii;
Swarm* swarm;
Swarm* newSwarm = NULL;
Swarm* swarmList[1];
@@ -80,7 +79,6 @@ void SwarmDumpAndLoadSuite_TestSwarmDump
FileParticleLayout* fileParticleLayout = NULL;
char input_file[PCU_PATH_MAX];
char output_file[PCU_PATH_MAX];
- char filenameTemp[PCU_PATH_MAX];
double diffSumX, diffSumY, diffSumZ;
double totSumX, totSumY, totSumZ;
double gdiffSumX, gdiffSumY, gdiffSumZ;
@@ -172,8 +170,9 @@ void SwarmDumpAndLoadSuite_TestSwarmDump
/* remove files */
if( data->rank == 0 ){
#ifdef READ_HDF5
- for(ii = 0 ; ii < data->nProcs ; ii++){
+ for(int ii = 0 ; ii < data->nProcs ; ii++){
/* get the swarm checkpointing filename */
+ char filenameTemp[PCU_PATH_MAX];
if(data->nProcs == 1)
sprintf( filenameTemp, "%s.h5", output_file );
else
diff -r 19f6e7546170 -r c691aa765e36 Swarm/tests/SwarmOutputSuite.cxx
--- a/Swarm/tests/SwarmOutputSuite.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Swarm/tests/SwarmOutputSuite.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -96,7 +96,6 @@ void SwarmOutputSuite_TestSwarmOutput( S
if( data->rank == procToWatch ) {
Dictionary* dictionary;
- Dictionary* componentDict;
Stg_ComponentFactory* cf;
DomainContext* context;
char input_file[PCU_PATH_MAX];
@@ -115,8 +114,7 @@ void SwarmOutputSuite_TestSwarmOutput( S
ContextEP_Append( context, AbstractContext_EP_Dt, SwarmOutputSuite_Dt );
ContextEP_Append( context, AbstractContext_EP_Step, SwarmOutputSuite_MoveParticles );
- componentDict = Dictionary_GetDictionary( dictionary, "components" );
- assert( componentDict );
+ assert( Dictionary_GetDictionary( dictionary, "components" ) );
AbstractContext_Dump( context );
Stg_Component_Execute( context, 0, False );
diff -r 19f6e7546170 -r c691aa765e36 Utils/src/RegularRemesherCmpt.cxx
--- a/Utils/src/RegularRemesherCmpt.cxx Sat Nov 26 20:50:30 2011 -0800
+++ b/Utils/src/RegularRemesherCmpt.cxx Thu Mar 15 12:45:27 2012 -0700
@@ -191,9 +191,7 @@ void _RegularRemesherCmpt_Build( void* r
void _RegularRemesherCmpt_Initialise( void* remesher, void* data ) {
- RegularRemesherCmpt* self = (RegularRemesherCmpt*)remesher;
-
- assert( self );
+ assert( (RegularRemesherCmpt*)remesher );
}
More information about the CIG-COMMITS
mailing list