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

Remove some unused variables

Browse source
This commit is contained in:
Ray Speth 2016-08-01 10:56:06 -04:00
parent dd7a374914
commit 340c1bf60a
6 changed files with 6 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cantera/kinetics/InterfaceKinetics.h
View file

@ -574,9 +574,6 @@ protected:
*/
vector_fp m_ProdStanConcReac;
doublereal m_logp0;
doublereal m_logc0;
bool m_ROP_ok;
//! Current temperature of the data

3
include/cantera/thermo/IdealGasPhase.h
View file

@ -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;

3
include/cantera/thermo/MixtureFugacityTP.h
View file

@ -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;

4
src/kinetics/InterfaceKinetics.cpp
View file

@ -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;

14
src/thermo/IdealGasPhase.cpp
View file

@ -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());
}
}
}

8
src/thermo/MixtureFugacityTP.cpp
View file

@ -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));
}
}