From f2bf17e1b74b0cad48ea7f2b9f3436e7ba2bfc7b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 17 Jan 2012 04:11:40 +0000 Subject: [PATCH] Fixed some problems with the tests caused by the int to size_t conversion --- Cantera/src/converters/CKParser.cpp | 8 ++++---- Cantera/src/equil/vcs_DoubleStarStar.h | 2 +- Cantera/src/equil/vcs_IntStarStar.h | 2 +- Cantera/src/equil/vcs_MultiPhaseEquil.cpp | 2 +- Cantera/src/equil/vcs_VolPhase.cpp | 2 +- Cantera/src/equil/vcs_solve_TP.cpp | 2 +- Cantera/src/kinetics/Kinetics.cpp | 2 +- Cantera/src/kinetics/importKinetics.cpp | 2 +- Cantera/src/thermo/GeneralSpeciesThermo.cpp | 4 ++-- test_problems/ChemEquil_red1/basopt_red1.cpp | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cantera/src/converters/CKParser.cpp b/Cantera/src/converters/CKParser.cpp index 07d6addec..aa0771ada 100755 --- a/Cantera/src/converters/CKParser.cpp +++ b/Cantera/src/converters/CKParser.cpp @@ -1038,7 +1038,7 @@ next: } } - else if (eqloc >= 0 && eqloc < int(s.size())) { + else if (eqloc != string::npos && eqloc < s.size()) { if (nRxns > 0) { rxn.number = nRxns; reactions.push_back(rxn); @@ -1062,17 +1062,17 @@ next: // irreversible, and separate it into strings for // each side. - if (eqloc = int(s.find("<=>")), eqloc >= 0) { + if (eqloc = s.find("<=>"), eqloc != string::npos) { rxn.isReversible = true; sleft = s.substr(0, eqloc); sright = s.substr(eqloc+3,1000); } - else if (eqloc = int(s.find("=>")), eqloc >= 0) { + else if (eqloc = s.find("=>"), eqloc != string::npos) { rxn.isReversible = false; sleft = s.substr(0, eqloc); sright = s.substr(eqloc+2,1000); } - else if (eqloc = int(s.find("=")), eqloc >= 0) { + else if (eqloc = s.find("="), eqloc != string::npos) { rxn.isReversible = true; sleft = s.substr(0, eqloc); sright = s.substr(eqloc+1,1000); diff --git a/Cantera/src/equil/vcs_DoubleStarStar.h b/Cantera/src/equil/vcs_DoubleStarStar.h index b5e310689..95ce5aa7e 100644 --- a/Cantera/src/equil/vcs_DoubleStarStar.h +++ b/Cantera/src/equil/vcs_DoubleStarStar.h @@ -9,7 +9,7 @@ #include namespace VCSnonideal { - + using std::size_t; //! A class for 2D double arrays storred in column-major //! (Fortran-compatible) form. /*! diff --git a/Cantera/src/equil/vcs_IntStarStar.h b/Cantera/src/equil/vcs_IntStarStar.h index 75939e7c5..f9f259384 100644 --- a/Cantera/src/equil/vcs_IntStarStar.h +++ b/Cantera/src/equil/vcs_IntStarStar.h @@ -9,7 +9,7 @@ #include namespace VCSnonideal { - + using std::size_t; //! A class for 2D int arrays storred in column-major //! (Fortran-compatible) form. /*! diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp index e8c4b4aa3..1fca7bc68 100644 --- a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp +++ b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp @@ -1336,7 +1336,7 @@ namespace VCSnonideal { kT++; } - if (volPhase->phiVarIndex() >= 0) { + if (volPhase->phiVarIndex() != -1) { size_t kphi = volPhase->phiVarIndex(); size_t kglob = volPhase->spGlobalIndexVCS(kphi); vprob->w[kglob] = tPhase->electricPotential(); diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp index 794d04d68..35301dd03 100644 --- a/Cantera/src/equil/vcs_VolPhase.cpp +++ b/Cantera/src/equil/vcs_VolPhase.cpp @@ -1569,7 +1569,7 @@ namespace VCSnonideal { fm[e][k] = tPhase->nAtoms(k, eT); e++; } - if (eFound >= 0) { + if (eFound != -2) { fm[eFound][k] = - tPhase->charge(k); } } diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index 7b29927df..065d51fdd 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -3623,7 +3623,7 @@ namespace VCSnonideal { } size_t iph = m_phaseID[kspec]; - size_t irxn = kspec - m_numComponents; + int irxn = int(kspec) - int(m_numComponents); vcs_VolPhase *VPhase = m_VolPhaseList[iph]; int phaseExist = VPhase->exists(); diff --git a/Cantera/src/kinetics/Kinetics.cpp b/Cantera/src/kinetics/Kinetics.cpp index 9c5512a29..3fdd84e32 100644 --- a/Cantera/src/kinetics/Kinetics.cpp +++ b/Cantera/src/kinetics/Kinetics.cpp @@ -194,7 +194,7 @@ namespace Cantera { * ThermoPhase object to find a match. */ k = thermo(n).speciesIndex(nm); - if (k >= 0) return k + m_start[n]; + if (k != -1) return k + m_start[n]; } } return -2; diff --git a/Cantera/src/kinetics/importKinetics.cpp b/Cantera/src/kinetics/importKinetics.cpp index f6a12c60d..a1cfc9e09 100644 --- a/Cantera/src/kinetics/importKinetics.cpp +++ b/Cantera/src/kinetics/importKinetics.cpp @@ -1107,7 +1107,7 @@ namespace Cantera { // if no phase with this id has been added to //the kinetics manager yet, then add this one - if (kin.phaseIndex(phase_id) < 0) { + if (kin.phaseIndex(phase_id) == -1) { kin.addPhase(*th[m]); } } diff --git a/Cantera/src/thermo/GeneralSpeciesThermo.cpp b/Cantera/src/thermo/GeneralSpeciesThermo.cpp index 94ed8a745..65d852a8d 100644 --- a/Cantera/src/thermo/GeneralSpeciesThermo.cpp +++ b/Cantera/src/thermo/GeneralSpeciesThermo.cpp @@ -114,7 +114,7 @@ namespace Cantera { * Resize the arrays if necessary, filling the empty * slots with the zero pointer. */ - if (index > m_kk - 1) { + if (index >= m_kk) { m_sp.resize(index+1, 0); m_kk = index+1; } @@ -188,7 +188,7 @@ namespace Cantera { "zero pointer"); } size_t index = stit_ptr->speciesIndex(); - if (index > m_kk - 1) { + if (index >= m_kk) { m_sp.resize(index+1, 0); m_kk = index+1; } diff --git a/test_problems/ChemEquil_red1/basopt_red1.cpp b/test_problems/ChemEquil_red1/basopt_red1.cpp index 4143020f8..0f9653117 100644 --- a/test_problems/ChemEquil_red1/basopt_red1.cpp +++ b/test_problems/ChemEquil_red1/basopt_red1.cpp @@ -27,8 +27,8 @@ int main(int argc, char **argv) { mphase.addPhase(&g, 10.0); mphase.init(); int usedZeroedSpecies = 0; - vector_int orderVectorSpecies; - vector_int orderVectorElements; + std::vector orderVectorSpecies; + std::vector orderVectorElements; bool doFormMatrix = true; vector_fp formRxnMatrix;