[cig-commits] commit: Fix some compiler warnings and make an array big enough to fit all 27 nodes of a Q2 3D element

[Mercurial]

changeset:   799:1f51209c8647
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Sep 29 15:08:56 2011 -0700
files:       Assembly/src/ThermalBuoyancyForceTerm.cxx SLE/SystemSetup/src/FiniteElementContext.cxx
description:
Fix some compiler warnings and make an array big enough to fit all 27 nodes of a Q2 3D element


diff -r 44815e34ebed -r 1f51209c8647 Assembly/src/ThermalBuoyancyForceTerm.cxx
--- a/Assembly/src/ThermalBuoyancyForceTerm.cxx	Tue Sep 27 15:57:14 2011 -0700
+++ b/Assembly/src/ThermalBuoyancyForceTerm.cxx	Thu Sep 29 15:08:56 2011 -0700
@@ -184,7 +184,6 @@ void _ThermalBuoyancyForceTerm_AssembleE
 	IntegrationPoint*				particle;
 	FeVariable*						temperatureField;
 	FeMesh*							mesh;
-	FeMesh*							temperatureMesh;
 	double*							xi;
 	Particle_InCellIndex			cParticle_I;
 	Particle_InCellIndex			cellParticleCount;
@@ -195,7 +194,6 @@ void _ThermalBuoyancyForceTerm_AssembleE
 	Cell_Index						cell_I;
 	double							detJac;
 	double							factor;
-	/*double							Ni[8];*/
 	double							Ni[27];
 	double							force;
 	double							rayleighNumber;
@@ -204,7 +202,6 @@ void _ThermalBuoyancyForceTerm_AssembleE
 	/* Get context extension */
 	rayleighNumber   = self->rayleighNumber;
 	temperatureField = self->temperatureField;
-	temperatureMesh  = temperatureField->feMesh;
 
 	/* Since we are integrating over the velocity mesh - we want the velocity mesh here and not the temperature mesh */
 	mesh             = forceVector->feVariable->feMesh;
diff -r 44815e34ebed -r 1f51209c8647 SLE/SystemSetup/src/FiniteElementContext.cxx
--- a/SLE/SystemSetup/src/FiniteElementContext.cxx	Tue Sep 27 15:57:14 2011 -0700
+++ b/SLE/SystemSetup/src/FiniteElementContext.cxx	Thu Sep 29 15:08:56 2011 -0700
@@ -453,7 +453,6 @@ void _FiniteElementContext_SaveSwarms( v
 
 
 void _FiniteElementContext_SaveMesh( void* context ) {
-   FiniteElementContext*   self;
 	Stream*                 info = Journal_Register( Info_Type, (Name)"Context" );
    unsigned                componentCount = LiveComponentRegister_GetCount(stgLiveComponentRegister );
    unsigned                compI;
@@ -462,7 +461,6 @@ void _FiniteElementContext_SaveMesh( voi
    
 	Journal_Printf( info, "In %s(): about to save the mesh to disk:\n", __func__ );
 
-	self = (FiniteElementContext*) context;
 
    /** search for entire live component register for feMesh types  **/
    for( compI = 0 ; compI < componentCount ; compI++){
@@ -569,7 +567,7 @@ void _FiniteElementContext_DumpMeshHDF5(
    Node_LocalIndex         lNode_I = 0;
    Node_GlobalIndex        gNode_I = 0;
    double*                 coord;
-   int                     buf_int[5];
+   int                     buf_int[27];
    MPI_Status              status;
    int                     confirmation = 0;
    Stream*                 errorStr = Journal_Register( Error_Type, (Name)self->type );