From 340c1bf60a747f944927f37ec05810ff34092bd7 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 1 Aug 2016 10:56:06 -0400 Subject: [PATCH] Remove some unused variables --- include/cantera/kinetics/InterfaceKinetics.h | 3 --- include/cantera/thermo/IdealGasPhase.h | 3 --- include/cantera/thermo/MixtureFugacityTP.h | 3 --- src/kinetics/InterfaceKinetics.cpp | 4 ---- src/thermo/IdealGasPhase.cpp | 14 ++++---------- src/thermo/MixtureFugacityTP.cpp | 8 ++------ 6 files changed, 6 insertions(+), 29 deletions(-) diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 6b7802c7a..671217cd5 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -574,9 +574,6 @@ protected: */ vector_fp m_ProdStanConcReac; - doublereal m_logp0; - doublereal m_logc0; - bool m_ROP_ok; //! Current temperature of the data diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index 759346756..6b274004f 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -612,9 +612,6 @@ protected: */ doublereal m_p0; - //! Temporary storage for log of p/RT - mutable doublereal m_logc0; - //! Temporary storage for dimensionless reference state enthalpies mutable vector_fp m_h0_RT; diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index c2f1fd809..795b2ffa4 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -587,9 +587,6 @@ protected: //! properties were calculated at. mutable doublereal m_Tlast_ref; - //! Temporary storage for log of p/rt - mutable doublereal m_logc0; - //! Temporary storage for dimensionless reference state enthalpies mutable vector_fp m_h0_RT; diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index 716c8ef0f..bc3ee94c4 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -20,8 +20,6 @@ InterfaceKinetics::InterfaceKinetics(thermo_t* thermo) : m_redo_rates(false), m_surf(0), m_integrator(0), - m_logp0(0.0), - m_logc0(0.0), m_ROP_ok(false), m_temp(0.0), m_logtemp(0.0), @@ -80,8 +78,6 @@ InterfaceKinetics& InterfaceKinetics::operator=(const InterfaceKinetics& right) m_deltaG0 = right.m_deltaG0; m_deltaG = right.m_deltaG; m_ProdStanConcReac = right.m_ProdStanConcReac; - m_logp0 = right.m_logp0; - m_logc0 = right.m_logc0; m_ROP_ok = right.m_ROP_ok; m_temp = right.m_temp; m_logtemp = right.m_logtemp; diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index 96a0a48ca..6c4375b97 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -15,28 +15,24 @@ namespace Cantera { IdealGasPhase::IdealGasPhase() : - m_p0(-1.0), - m_logc0(0.0) + m_p0(-1.0) { } IdealGasPhase::IdealGasPhase(const std::string& inputFile, const std::string& id_) : - m_p0(-1.0), - m_logc0(0.0) + m_p0(-1.0) { initThermoFile(inputFile, id_); } IdealGasPhase::IdealGasPhase(XML_Node& phaseRef, const std::string& id_) : - m_p0(-1.0), - m_logc0(0.0) + m_p0(-1.0) { importPhase(phaseRef, this); } IdealGasPhase::IdealGasPhase(const IdealGasPhase& right) : - m_p0(right.m_p0), - m_logc0(right.m_logc0) + m_p0(right.m_p0) { // Use the assignment operator to do the brunt of the work for the copy // constructor. @@ -48,7 +44,6 @@ IdealGasPhase& IdealGasPhase::operator=(const IdealGasPhase& right) if (&right != this) { ThermoPhase::operator=(right); m_p0 = right.m_p0; - m_logc0 = right.m_logc0; m_h0_RT = right.m_h0_RT; m_cp0_R = right.m_cp0_R; m_g0_RT = right.m_g0_RT; @@ -321,7 +316,6 @@ void IdealGasPhase::_updateThermo() const for (size_t k = 0; k < m_kk; k++) { m_g0_RT[k] = m_h0_RT[k] - m_s0_R[k]; } - m_logc0 = log(m_p0 / RT()); } } } diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index dd377897e..1c56a9428 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -23,8 +23,7 @@ MixtureFugacityTP::MixtureFugacityTP() : m_Pcurrent(-1.0), iState_(FLUID_GAS), forcedState_(FLUID_UNDEFINED), - m_Tlast_ref(-1.0), - m_logc0(0.0) + m_Tlast_ref(-1.0) { } @@ -32,8 +31,7 @@ MixtureFugacityTP::MixtureFugacityTP(const MixtureFugacityTP& b) : m_Pcurrent(-1.0), iState_(FLUID_GAS), forcedState_(FLUID_UNDEFINED), - m_Tlast_ref(-1.0), - m_logc0(0.0) + m_Tlast_ref(-1.0) { MixtureFugacityTP::operator=(b); } @@ -50,7 +48,6 @@ MixtureFugacityTP& MixtureFugacityTP::operator=(const MixtureFugacityTP& b) iState_ = b.iState_; forcedState_ = b.forcedState_; m_Tlast_ref = b.m_Tlast_ref; - m_logc0 = b.m_logc0; m_h0_RT = b.m_h0_RT; m_cp0_R = b.m_cp0_R; m_g0_RT = b.m_g0_RT; @@ -868,7 +865,6 @@ void MixtureFugacityTP::_updateReferenceStateThermo() const if (pref <= 0.0) { throw CanteraError("MixtureFugacityTP::_updateReferenceStateThermo()", "neg ref pressure"); } - m_logc0 = log(pref/(GasConstant * Tnow)); } }