research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminated some local variable shadowing

Browse source
This commit is contained in:
Ray Speth 2013-02-14 01:03:13 +00:00
parent 8a17523715
commit 70b08a6891
7 changed files with 52 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/thermo/DebyeHuckel.cpp
View file

@ -931,7 +931,6 @@ initThermoXML(XML_Node& phaseNode, const std::string& id)
if (acNode.hasChild("ionicRadius")) {
XML_Node& irNode = acNode.child("ionicRadius");
std::string Aunits = "";
double Afactor = 1.0;
if (irNode.hasAttrib("units")) {
std::string Aunits = irNode.attrib("units");

82
src/thermo/HMWSoln.cpp
View file

@ -1953,7 +1953,7 @@ s_updatePitzer_lnMolalityActCoeff() const
double sum_m_phi_minus_1, osmotic_coef, lnwateract;
int z1, z2;
size_t n, i, j, k, m, counterIJ, counterIJ2;
size_t n, i, j, m, counterIJ, counterIJ2;
#ifdef DEBUG_MODE
if (m_debugCalc) {
@ -2358,7 +2358,7 @@ s_updatePitzer_lnMolalityActCoeff() const
* non-duplicate sum over double anions, j, k, with
* respect to the cation, i.
*/
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all anions
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -2392,7 +2392,7 @@ s_updatePitzer_lnMolalityActCoeff() const
}
#endif
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
// two inner sums over anions
@ -2528,7 +2528,7 @@ s_updatePitzer_lnMolalityActCoeff() const
}
#endif
if (j < m_kk-1) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all cations
if (charge(k) > 0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -2564,7 +2564,7 @@ s_updatePitzer_lnMolalityActCoeff() const
}
#endif
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) > 0.0) {
// two inner sums over cations
n = k + j * m_kk + i * m_kk * m_kk;
@ -2677,7 +2677,7 @@ s_updatePitzer_lnMolalityActCoeff() const
* Zeta term -> we piggyback on the psi term
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
sum3 = sum3 + molality[j]*molality[k]*psi_ijk[n];
@ -2747,7 +2747,7 @@ s_updatePitzer_lnMolalityActCoeff() const
* Loop Over Cations
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
/*
* Find the counterIJ for the symmetric j,k binary interaction
@ -2760,7 +2760,7 @@ s_updatePitzer_lnMolalityActCoeff() const
}
}
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == (m_kk-1)) {
// we should never reach this step
printf("logic error 1 in Step 9 of hmw_act");
@ -2790,7 +2790,7 @@ s_updatePitzer_lnMolalityActCoeff() const
* Loop Over Anions
*/
if (charge(j) < 0) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == m_kk-1) {
// we should never reach this step
printf("logic error 2 in Step 9 of hmw_act");
@ -2820,7 +2820,7 @@ s_updatePitzer_lnMolalityActCoeff() const
* Loop Over Neutral Species
*/
if (charge(j) == 0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
sum4 = sum4 + molality[j]*molality[k]*m_Lambda_nj(j,k);
}
@ -3006,7 +3006,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
double sum_m_phi_minus_1, d_osmotic_coef_dT, d_lnwateract_dT;
int z1, z2;
size_t n, i, j, k, m, counterIJ, counterIJ2;
size_t n, i, j, m, counterIJ, counterIJ2;
#ifdef DEBUG_MODE
if (m_debugCalc) {
@ -3373,7 +3373,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
* non-duplicate sum over double anions, j, k, with
* respect to the cation, i.
*/
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all anions
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -3389,7 +3389,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_L[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
// two inner sums over anions
@ -3471,7 +3471,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
sum1 = sum1 + molality[j]*
(2.0*BMX_L[counterIJ] + molarcharge*CMX_L[counterIJ]);
if (j < m_kk-1) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all cations
if (charge(k) > 0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -3489,7 +3489,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_L[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) > 0.0) {
// two inner sums over cations
n = k + j * m_kk + i * m_kk * m_kk;
@ -3552,7 +3552,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
* Zeta term -> we piggyback on the psi term
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
sum3 = sum3 + molality[j]*molality[k]*psi_ijk_L[n];
@ -3604,7 +3604,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
* Loop Over Cations
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
/*
* Find the counterIJ for the symmetric j,k binary interaction
@ -3617,7 +3617,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
}
}
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == (m_kk-1)) {
// we should never reach this step
printf("logic error 1 in Step 9 of hmw_act");
@ -3647,7 +3647,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
* Loop Over Anions
*/
if (charge(j) < 0) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == m_kk-1) {
// we should never reach this step
printf("logic error 2 in Step 9 of hmw_act");
@ -3677,7 +3677,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
* Loop Over Neutral Species
*/
if (charge(j) == 0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
sum4 = sum4 + molality[j]*molality[k]*m_Lambda_nj_L(j,k);
}
@ -3847,7 +3847,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
double sum_m_phi_minus_1, d2_osmotic_coef_dT2, d2_lnwateract_dT2;
int z1, z2;
size_t n, i, j, k, m, counterIJ, counterIJ2;
size_t n, i, j, m, counterIJ, counterIJ2;
#ifdef DEBUG_MODE
if (m_debugCalc) {
@ -4225,7 +4225,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
* non-duplicate sum over double anions, j, k, with
* respect to the cation, i.
*/
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all anions
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -4241,7 +4241,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_LL[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
// two inner sums over anions
@ -4323,7 +4323,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
sum1 = sum1 + molality[j]*
(2.0*BMX_LL[counterIJ] + molarcharge*CMX_LL[counterIJ]);
if (j < m_kk-1) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all cations
if (charge(k) > 0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -4341,7 +4341,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_LL[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) > 0.0) {
// two inner sums over cations
n = k + j * m_kk + i * m_kk * m_kk;
@ -4406,7 +4406,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
* Zeta term -> we piggyback on the psi term
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
sum3 = sum3 + molality[j]*molality[k]*psi_ijk_LL[n];
@ -4457,7 +4457,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
* Loop Over Cations
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
/*
* Find the counterIJ for the symmetric j,k binary interaction
@ -4470,7 +4470,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
}
}
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == (m_kk-1)) {
// we should never reach this step
printf("logic error 1 in Step 9 of hmw_act");
@ -4500,7 +4500,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
* Loop Over Anions
*/
if (charge(j) < 0) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == m_kk-1) {
// we should never reach this step
printf("logic error 2 in Step 9 of hmw_act");
@ -4530,7 +4530,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const
* Loop Over Neutral Species
*/
if (charge(j) == 0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
sum4 = sum4 + molality[j]*molality[k]*m_Lambda_nj_LL(j,k);
}
@ -4687,7 +4687,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
double sum_m_phi_minus_1, d_osmotic_coef_dP, d_lnwateract_dP;
int z1, z2;
size_t n, i, j, k, m, counterIJ, counterIJ2;
size_t n, i, j, m, counterIJ, counterIJ2;
double currTemp = temperature();
double currPres = pressure();
@ -4876,7 +4876,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
printf(" %-16s %-16s %11.7f %11.7f %11.7f \n",
sni.c_str(), snj.c_str(),
BMX_P[counterIJ], BprimeMX_P[counterIJ], BphiMX_P[counterIJ]);
}
}(k =
#endif
}
}
@ -5058,7 +5058,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
* non-duplicate sum over double anions, j, k, with
* respect to the cation, i.
*/
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all anions
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -5074,7 +5074,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_P[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
// two inner sums over anions
@ -5157,7 +5157,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
sum1 = sum1 + molality[j]*
(2.0*BMX_P[counterIJ] + molarcharge*CMX_P[counterIJ]);
if (j < m_kk-1) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
// an inner sum over all cations
if (charge(k) > 0) {
n = k + j * m_kk + i * m_kk * m_kk;
@ -5175,7 +5175,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
if (j != i) {
sum2 = sum2 + molality[j]*(2.0*Phi_P[counterIJ]);
}
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) > 0.0) {
// two inner sums over cations
n = k + j * m_kk + i * m_kk * m_kk;
@ -5239,7 +5239,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
* Zeta term -> we piggyback on the psi term
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
n = k + j * m_kk + i * m_kk * m_kk;
sum3 = sum3 + molality[j]*molality[k]*psi_ijk_P[n];
@ -5290,7 +5290,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
* Loop Over Cations
*/
if (charge(j) > 0.0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
/*
* Find the counterIJ for the symmetric j,k binary interaction
@ -5303,7 +5303,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
}
}
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == (m_kk-1)) {
// we should never reach this step
printf("logic error 1 in Step 9 of hmw_act");
@ -5334,7 +5334,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
* Loop Over Anions
*/
if (charge(j) < 0) {
for (k = j+1; k < m_kk; k++) {
for (size_t k = j+1; k < m_kk; k++) {
if (j == m_kk-1) {
// we should never reach this step
printf("logic error 2 in Step 9 of hmw_act");
@ -5364,7 +5364,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
* Loop Over Neutral Species
*/
if (charge(j) == 0) {
for (k = 1; k < m_kk; k++) {
for (size_t k = 1; k < m_kk; k++) {
if (charge(k) < 0.0) {
sum4 = sum4 + molality[j]*molality[k]*m_Lambda_nj_P(j,k);
}

1
src/thermo/HMWSoln_input.cpp
View file

@ -1434,7 +1434,6 @@ initThermoXML(XML_Node& phaseNode, const std::string& id)
if (acNode.hasChild("ionicRadius")) {
XML_Node& irNode = acNode.child("ionicRadius");
string Aunits = "";
double Afactor = 1.0;
if (irNode.hasAttrib("units")) {
string Aunits = irNode.attrib("units");

3
src/thermo/IdealMolalSoln.cpp
View file

@ -446,12 +446,11 @@ void IdealMolalSoln::getPartialMolarEntropies(doublereal* sbar) const
{
getEntropy_R(sbar);
doublereal R = GasConstant;
doublereal mm;
calcMolalities();
if (IMS_typeCutoff_ == 0) {
for (size_t k = 0; k < m_kk; k++) {
if (k != m_indexSolvent) {
mm = std::max(SmallNumber, m_molalities[k]);
doublereal mm = std::max(SmallNumber, m_molalities[k]);
sbar[k] -= R * log(mm);
}
}

16
src/thermo/IonsFromNeutralVPSSTP.cpp
View file

@ -990,8 +990,6 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
neutralMoleculePhase_ = newPhase(*neut_ptr);
}
size_t k;
/*
* variables that need to be populated
*
@ -1001,7 +999,7 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
numCationSpecies_ = 0;
cationList_.clear();
for (k = 0; k < m_kk; k++) {
for (size_t k = 0; k < m_kk; k++) {
if (charge(k) > 0) {
cationList_.push_back(k);
numCationSpecies_++;
@ -1010,7 +1008,7 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
numAnionSpecies_ = 0;
anionList_.clear();
for (k = 0; k < m_kk; k++) {
for (size_t k = 0; k < m_kk; k++) {
if (charge(k) < 0) {
anionList_.push_back(k);
numAnionSpecies_++;
@ -1019,7 +1017,7 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
numPassThroughSpecies_= 0;
passThroughList_.clear();
for (k = 0; k < m_kk; k++) {
for (size_t k = 0; k < m_kk; k++) {
if (charge(k) == 0) {
passThroughList_.push_back(k);
numPassThroughSpecies_++;
@ -1028,7 +1026,7 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
PDSS_IonsFromNeutral* speciesSS = 0;
indexSpecialSpecies_ = npos;
for (k = 0; k < m_kk; k++) {
for (size_t k = 0; k < m_kk; k++) {
speciesSS = dynamic_cast<PDSS_IonsFromNeutral*>(providePDSS(k));
if (!speciesSS) {
throw CanteraError("initThermoXML", "Dynamic cast failed");
@ -1085,12 +1083,12 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, const std::string
fm_neutralMolec_ions_[indexSpecialSpecies_ + jNeut * m_kk ] += fac;
for (k = 0; k < m_kk; k++) {
for (size_t k = 0; k < m_kk; k++) {
for (size_t m = 0; m < nElementsI; m++) {
elemVectorI[m] = nAtoms(k, m);
}
double fac = factorOverlap(elnamesVN, elemVectorN, nElementsN,
elnamesVI ,elemVectorI, nElementsI);
fac = factorOverlap(elnamesVN, elemVectorN, nElementsN,
elnamesVI ,elemVectorI, nElementsI);
if (fac > 0.0) {
for (size_t m = 0; m < nElementsN; m++) {
std::string mName = elnamesVN[m];

3
src/thermo/MetalSHEelectrons.cpp
View file

@ -221,8 +221,7 @@ void MetalSHEelectrons::getIntEnergy_RT_ref(doublereal* urt) const
{
_updateThermo();
doublereal RT = GasConstant * temperature();
doublereal PV = m_p0 / molarDensity();
urt[0] = m_h0_RT[0] - PV / RT;
urt[0] = m_h0_RT[0] - m_p0 / molarDensity() / RT;
}
/*

6
src/thermo/MineralEQ3.cpp
View file

@ -212,8 +212,7 @@ void MineralEQ3::getIntEnergy_RT(doublereal* urt) const
{
_updateThermo();
doublereal RT = GasConstant * temperature();
doublereal PV = m_p0 / molarDensity();
urt[0] = m_h0_RT[0] - PV / RT;
urt[0] = m_h0_RT[0] - m_p0 / molarDensity() / RT;
}
/*
@ -224,8 +223,7 @@ void MineralEQ3::getIntEnergy_RT_ref(doublereal* urt) const
{
_updateThermo();
doublereal RT = GasConstant * temperature();
doublereal PV = m_p0 / molarDensity();
urt[0] = m_h0_RT[0] - PV / RT;
urt[0] = m_h0_RT[0] - m_p0 / molarDensity() / RT;
}
/*