From 18bce3bc6264d3c204fe3a635139f0131a96dc7b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 22 Feb 2012 00:16:10 +0000 Subject: [PATCH] Fixed lines ending with doubled semicolon. --- src/apps/ck2cti.cpp | 2 +- src/apps/csvdiff.cpp | 2 +- src/base/ct2ctml.cpp | 6 +++--- src/equil/vcs_MultiPhaseEquil.cpp | 4 ++-- src/equil/vcs_prob.cpp | 11 +++++------ src/kinetics/InterfaceKinetics.cpp | 2 +- src/thermo/Nasa9PolyMultiTempRegion.cpp | 2 +- src/thermo/RedlichKwongMFTP.cpp | 2 +- src/thermo/ThermoPhase.cpp | 2 +- src/thermo/VPSSMgr_Water_HKFT.cpp | 2 +- src/thermo/WaterPropsIAPWSphi.cpp | 2 +- .../cathermo/stoichSubSSTP/stoichSubSSTP.cpp | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/apps/ck2cti.cpp b/src/apps/ck2cti.cpp index cb8a34a49..f8e23d4b7 100644 --- a/src/apps/ck2cti.cpp +++ b/src/apps/ck2cti.cpp @@ -91,7 +91,7 @@ int main(int argc, char** argv) if (arg == "-i") { infile = getp(i,argc,argv); } else if (arg == "-t") { - dbfile = getp(i,argc,argv);; + dbfile = getp(i,argc,argv); } else if (arg == "-tr") { trfile = getp(i,argc,argv); } else if (arg == "-id") { diff --git a/src/apps/csvdiff.cpp b/src/apps/csvdiff.cpp index 6dd1ba590..4a1af1099 100644 --- a/src/apps/csvdiff.cpp +++ b/src/apps/csvdiff.cpp @@ -816,7 +816,7 @@ int main(int argc, char* argv[]) } if (nTitleLines1 != nTitleLines2) { printf("Number of Title Lines differ: %d %d\n", nTitleLines1, nTitleLines2); - testPassed = RT_FAILED_HDR;; + testPassed = RT_FAILED_HDR; } } else { if (nTitleLines1 != nTitleLines2) { diff --git a/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp index b3adfcded..0b290669e 100644 --- a/src/base/ct2ctml.cpp +++ b/src/base/ct2ctml.cpp @@ -195,11 +195,11 @@ void ct2ctml(const char* file, const int debug) } } } catch (...) { - writelog("ct2ctml: caught something \n");; + writelog("ct2ctml: caught something \n"); } if (ierr != 0) { string msg = cmd; - writelog("ct2ctml: throw cantera error \n");; + writelog("ct2ctml: throw cantera error \n"); throw CanteraError("ct2ctml", "could not convert input file to CTML.\n " "Command line was: \n" + msg); @@ -262,7 +262,7 @@ void get_CTML_Tree(Cantera::XML_Node* rootPtr, const std::string file, const int try { ctml::ct2ctml(inname.c_str(), debug); } catch (...) { - writelog("get_CTML_Tree: caught something \n");; + writelog("get_CTML_Tree: caught something \n"); } string ffull = inname.substr(0,idot) + ".xml"; ff = "./" + getBaseName(ffull) + ".xml"; diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 9107cca66..730200a93 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -112,7 +112,7 @@ int vcs_MultiPhaseEquil::equilibrate_TV(int XY, doublereal xtarget, double V1 = 0.0; double V2 = 0.0; double P2 = 0.0; - doublereal Tlow = 0.5 * m_mix->minTemp();; + doublereal Tlow = 0.5 * m_mix->minTemp(); doublereal Thigh = 2.0 * m_mix->maxTemp(); doublereal Vnow, Verr; int printLvlSub = std::max(0, printLvl - 1); @@ -589,7 +589,7 @@ int vcs_MultiPhaseEquil::equilibrate_TP(int estimateEquil, { // Debugging level - int maxit = maxsteps;; + int maxit = maxsteps; clockWC tickTock; if (m_vprob == 0) { diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp index 6667e7f24..535762281 100644 --- a/src/equil/vcs_prob.cpp +++ b/src/equil/vcs_prob.cpp @@ -505,12 +505,11 @@ void VCS_PROB::reportCSV(const std::string& reportFile) double Temp = T; std::vector volPM(nspecies, 0.0); - std::vector activity(nspecies, 0.0);; - std::vector ac(nspecies, 0.0);; - std::vector mu(nspecies, 0.0);; - std::vector mu0(nspecies, 0.0);; - std::vector molalities(nspecies, 0.0);; - + std::vector activity(nspecies, 0.0); + std::vector ac(nspecies, 0.0); + std::vector mu(nspecies, 0.0); + std::vector mu0(nspecies, 0.0); + std::vector molalities(nspecies, 0.0); vol = 0.0; size_t iK = 0; diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index b0984319f..f7c97b43a 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -752,7 +752,7 @@ void InterfaceKinetics::updateROP() if (m_rxnPhaseIsReactant[j][rp]) { if (! m_phaseExists[rp]) { ropnet[j] = 0.0; - ropr[j] = ropf[j] = 0.0;; + ropr[j] = ropf[j] = 0.0; } } } diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index f00b26aa7..00c86d1ad 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -356,7 +356,7 @@ void Nasa9PolyMultiTempRegion::reportParameters(size_t& n, int& type, double ctmp[12]; coeffs[0] = double(m_numTempRegions); int index = 1; - size_t n_tmp = 0;; + size_t n_tmp = 0; int type_tmp = 0; double pref_tmp = 0.0; for (size_t iReg = 0; iReg < m_numTempRegions; iReg++) { diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 5bcd478f2..ca0aa4a74 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -1911,7 +1911,7 @@ int RedlichKwongMFTP::NicholsSolve(double TKelvin, double pres, doublereal a, do /* * Unfortunately, there is a heavy amount of roundoff error due to bad conditioning in this */ - double res, dresdV;; + double res, dresdV; for (int i = 0; i < nSolnValues; i++) { for (int n = 0; n < 20; n++) { res = an * Vroot[i] * Vroot[i] * Vroot[i] + bn * Vroot[i] * Vroot[i] + cn * Vroot[i] + dn; diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 2c8a156fe..036c6fc63 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -286,7 +286,7 @@ void ThermoPhase::setState_HPorUV(doublereal Htarget, doublereal p, doublereal dTtol, bool doUV) { doublereal dt; - doublereal Hmax = 0.0, Hmin = 0.0;; + doublereal Hmax = 0.0, Hmin = 0.0; doublereal v = 0.0; // Assign the specific volume or pressure and make sure it's positive diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index 247436207..d3b66649b 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -201,7 +201,7 @@ void VPSSMgr_Water_HKFT::_updateStandardStateThermo() ps->setState_TP(m_tlast, m_plast); m_cpss_R[k] = ps->cp_R(); m_sss_R[k] = ps->entropy_R(); - m_gss_RT[k] = ps->gibbs_RT();; + m_gss_RT[k] = ps->gibbs_RT(); m_hss_RT[k] = m_gss_RT[k] + m_sss_R[k]; m_Vss[k] = ps->molarVolume(); } diff --git a/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp index 0c8077372..9c8e2183b 100644 --- a/src/thermo/WaterPropsIAPWSphi.cpp +++ b/src/thermo/WaterPropsIAPWSphi.cpp @@ -820,7 +820,7 @@ doublereal WaterPropsIAPWSphi::dimdpdT(doublereal tau, doublereal delta) doublereal WaterPropsIAPWSphi::phi0_t() const { doublereal tau = TAUsave; - doublereal retn = ni0[2] + ni0[3]/tau;; + doublereal retn = ni0[2] + ni0[3]/tau; retn += (ni0[4] * gammi0[4] * (1.0/(1.0 - exp(-gammi0[4]*tau)) - 1.0)); retn += (ni0[5] * gammi0[5] * (1.0/(1.0 - exp(-gammi0[5]*tau)) - 1.0)); retn += (ni0[6] * gammi0[6] * (1.0/(1.0 - exp(-gammi0[6]*tau)) - 1.0)); diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp index b25f5cf73..488894bf4 100644 --- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp +++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp @@ -101,7 +101,7 @@ int main(int argc, char** argv) /* * ThermoUnknowns */ - double mu0_RT[20], mu[20], cp_r[20];; + double mu0_RT[20], mu[20], cp_r[20]; double enth_RT[20]; double entrop_RT[20], intE_RT[20]; double mu_NaCl, enth_NaCl, entrop_NaCl;