Fix a couple of variable shadowing warnings from a Sandia intel 17 bu…

…ild.
NaluCFD · Sep 29, 2017 · 9de0ed2 · 9de0ed2
1 parent bad1a68
commit 9de0ed2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/AssembleMomentumNonConformalSolverAlgorithm.C b/src/AssembleMomentumNonConformalSolverAlgorithm.C
@@ -511,10 +511,10 @@ AssembleMomentumNonConformalSolverAlgorithm::execute()
             for ( int j = 0; j < nDim; ++j ) {
               const double nxj = p_cNx[j];
               const double dndxj = p_c_dndx[offSetDnDx+j];
-              for ( int i = 0; i < nDim; ++i ) {
-                const double dndxi = p_c_dndx[offSetDnDx+i];
+              for ( int kk = 0; kk < nDim; ++kk ) {
+                const double dndxi = p_c_dndx[offSetDnDx+kk];
                 // -mu*dui/dxj*Aj (divU neglected)
-                p_lhs[rowR+icNdim+i] += -currentDiffFluxCoeffBip*dndxj*nxj*c_amag/2.0; 
+                p_lhs[rowR+icNdim+kk] += -currentDiffFluxCoeffBip*dndxj*nxj*c_amag/2.0; 
                 // -mu*duj/dxi*Aj
                 p_lhs[rowR+icNdim+j] += -currentDiffFluxCoeffBip*dndxi*nxj*c_amag/2.0;
               }
@@ -536,10 +536,10 @@ AssembleMomentumNonConformalSolverAlgorithm::execute()
             for ( int j = 0; j < nDim; ++j ) {
               const double nxj = p_oNx[j];
               const double dndxj = p_o_dndx[offSetDnDx+j];
-              for ( int i = 0; i < nDim; ++i ) {
-                const double dndxi = p_o_dndx[offSetDnDx+i];
+              for ( int kk = 0; kk < nDim; ++kk ) {
+                const double dndxi = p_o_dndx[offSetDnDx+kk];
                 // -mu*dui/dxj*Aj (divU neglected)
-                p_lhs[rowR+icNdim+i] -= -currentDiffFluxCoeffBip*dndxj*nxj*c_amag/2.0;                
+                p_lhs[rowR+icNdim+kk] -= -currentDiffFluxCoeffBip*dndxj*nxj*c_amag/2.0;                
                 // -mu*duj/dxi*Aj
                 p_lhs[rowR+icNdim+j] -= -currentDiffFluxCoeffBip*dndxi*nxj*c_amag/2.0;
               }

diff --git a/src/LowMachEquationSystem.C b/src/LowMachEquationSystem.C
@@ -1718,11 +1718,10 @@ MomentumEquationSystem::register_wall_bc(
       ConstantAuxFunction *theHeatFluxAuxFunc = new ConstantAuxFunction(0, 1, userSpec);
 
       // bc data alg
-      AuxFunctionAlgorithm *auxAlg
-	= new AuxFunctionAlgorithm(realm_, part,
+      bcDataAlg_.push_back( new AuxFunctionAlgorithm(realm_, part,
 				   theHeatFluxBcField, theHeatFluxAuxFunc,
-				   stk::topology::NODE_RANK);
-      bcDataAlg_.push_back(auxAlg);
+				   stk::topology::NODE_RANK)
+      );
 
       const AlgorithmType wfAlgType = WALL_ABL;
 

diff --git a/src/nso/MomentumNSOElemSuppAlgDep.C b/src/nso/MomentumNSOElemSuppAlgDep.C
@@ -293,7 +293,6 @@ MomentumNSOElemSuppAlgDep::elem_execute(
       }
 
       // determine scs values of interest
-      const int offSet = ip*nodesPerElement;
       for ( int ic = 0; ic < nodesPerElement; ++ic ) {
 
         const int icNdim = ic*nDim_;

diff --git a/src/nso/MomentumNSOGradElemSuppAlg.C b/src/nso/MomentumNSOGradElemSuppAlg.C
@@ -239,7 +239,6 @@ MomentumNSOGradElemSuppAlg::elem_execute(
       }
 
       // determine scs values of interest
-      const int offSet = ip*nodesPerElement;
       for ( int ic = 0; ic < nodesPerElement; ++ic ) {
 
         const int icNdim = ic*nDim_;