CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some compiler warnings

Browse Source
This commit is contained in:
falgout 2012-09-13 15:10:12 +00:00
parent fb4f84a511
commit 49ff201c4e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx
View File

@ -2361,7 +2361,8 @@ This should ultimately be taken out even for newer ale3d implementation
printf("putNodalFieldData WARNING : \n");
printf(" set nodeNumbers = NULL, set numNodes = 0.\n");
}
MLI_NodalCoord_ = new double[localEndRow_-localStartRow_+1];
nRows = localEndRow_ - localStartRow_ + 1;
MLI_NodalCoord_ = new double[nRows];
for (i=0; i<nRows; i++) MLI_NodalCoord_[i] = data[i];
}
}
@ -2674,7 +2675,7 @@ int HYPRE_LinSysCore::enforceEssentialBC(int* globalEqn, double* alpha,
//**/================================================================
//**/ The following is for multiple right hand side (Mar 2009)
if (mRHSFlag_ == 1 && currentRHS_ != 0 & mRHSNumGEqns_ > 0)
if (mRHSFlag_ == 1 && currentRHS_ != 0 && mRHSNumGEqns_ > 0)
{
for( i = 0; i < leng; i++ )
{
@ -2918,7 +2919,7 @@ int HYPRE_LinSysCore::enforceRemoteEssBCs(int numEqns, int* globalEqns,
//============================================================
//**/ The following is for multiple right hand side (Mar 2009)
if (mRHSFlag_ == 1 && currentRHS_ != 0 & mRHSNumGEqns_ > 0)
if (mRHSFlag_ == 1 && currentRHS_ != 0 && mRHSNumGEqns_ > 0)
{
for( i = 0; i < numEqns; i++ )
{

2
FEI_mv/fei-hypre/HYPRE_LinSysCore.h
View File

@ -54,7 +54,7 @@ enum HYpreconID {HYIDENTITY,HYDIAGONAL,HYPILUT,HYPARASAILS,HYBOOMERAMG,HYML,
HYDDILUT,HYPOLY,HYDDICT,HYSCHWARZ,HYEUCLID,HYBLOCK,HYMLI,
HYUZAWA,HYMLMAXWELL,HYAMS,HYSYSPDE,HYDSLU};
#define HYFEI_HIGHMASK 2147483647-255
#define HYFEI_HIGHMASK (2147483647-255)
#define HYFEI_SPECIALMASK 255
#define HYFEI_SLIDEREDUCE1 256
#define HYFEI_SLIDEREDUCE2 512

2
FEI_mv/femli/amgs/mli_amgsa_coarsen1.cxx
View File

@ -218,7 +218,7 @@ double MLI_Method_AMGSA::genP(MLI_Matrix *mli_Amat,
* create global P
*-----------------------------------------------------------------*/
if ( initAggr == NULL & numSmoothVec_ == 0 )
if ( (initAggr == NULL) & (numSmoothVec_ == 0) )
{
if ( GGlobalNRows <= minAggrSize_*numProcs )
{