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

[Thermo] ThermoPhase::modifyOneHf298SS always invalidates cached data

Browse source
This commit is contained in:
Ray Speth 2016-04-18 22:20:06 -04:00
parent 3566542c0b
commit 51b0e46277
6 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -551,6 +551,8 @@ protected:
};
protected:
virtual void invalidateCache();
//! Current value of the pressure
/*!
* Because the pressure is now a calculation, we store the result of the

2
include/cantera/thermo/ThermoPhase.h
View file

@ -175,7 +175,7 @@ public:
*/
virtual void modifyOneHf298SS(const size_t k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
invalidateCache();
}
//! Maximum temperature for which the thermodynamic data for the species

2
include/cantera/thermo/VPStandardStateTP.h
View file

@ -274,6 +274,8 @@ public:
const PDSS* providePDSS(size_t k) const;
protected:
virtual void invalidateCache();
//! Current value of the pressure - state variable
/*!
* Because we are now using the pressure as a state variable, we need to

2
src/thermo/LatticeSolidPhase.cpp
View file

@ -455,7 +455,7 @@ void LatticeSolidPhase::modifyOneHf298SS(const size_t k, const doublereal Hf298N
l_spthermo.modifyOneHf298(kk, Hf298New);
}
}
m_tlast += 0.0001234;
invalidateCache();
_updateThermo();
}

8
src/thermo/MixtureFugacityTP.cpp
View file

@ -114,7 +114,7 @@ void MixtureFugacityTP::getEnthalpy_RT(doublereal* hrt) const
void MixtureFugacityTP::modifyOneHf298SS(const size_t k, const doublereal Hf298New)
{
m_spthermo->modifyOneHf298(k, Hf298New);
m_Tlast_ref += 0.0001234;
invalidateCache();
}
void MixtureFugacityTP::getEntropy_R(doublereal* sr) const
@ -878,4 +878,10 @@ void MixtureFugacityTP::_updateReferenceStateThermo() const
}
}
void MixtureFugacityTP::invalidateCache()
{
ThermoPhase::invalidateCache();
m_Tlast_ref += 0.001234;
}
}

8
src/thermo/VPStandardStateTP.cpp
View file

@ -132,7 +132,7 @@ void VPStandardStateTP::getEnthalpy_RT(doublereal* hrt) const
void VPStandardStateTP::modifyOneHf298SS(const size_t k, const doublereal Hf298New)
{
m_spthermo->modifyOneHf298(k, Hf298New);
m_Tlast_ss += 0.0001234;
invalidateCache();
}
void VPStandardStateTP::getEntropy_R(doublereal* srt) const
@ -302,6 +302,12 @@ const PDSS* VPStandardStateTP::providePDSS(size_t k) const
return m_PDSS_storage[k];
}
void VPStandardStateTP::invalidateCache()
{
ThermoPhase::invalidateCache();
m_Tlast_ss += 0.0001234;
}
void VPStandardStateTP::initThermoXML(XML_Node& phaseNode, const std::string& id)
{
for (size_t k = 0; k < m_kk; k++) {