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

Change ThermoPhase::setStateTPX and setStateTPY functions to call

Browse source 
setStateTP instead of setTemperature and setPressure. Main motivation
is that the IonsFromNeutralVPSSTP child class has setTemperature and
setPressure functions that call setStateTP so this reduces duplicate
work in that case.
This commit is contained in:
Victor Brunini 2012-12-13 22:16:00 +00:00
parent 749f988e52
commit a4ea58f7cc
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/thermo/ThermoPhase.cpp
View file

@ -174,39 +174,34 @@ void ThermoPhase::getLnActivityCoefficients(doublereal* lnac) const
void ThermoPhase::setState_TPX(doublereal t, doublereal p, const doublereal* x)
{
setMoleFractions(x);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================
void ThermoPhase::setState_TPX(doublereal t, doublereal p, compositionMap& x)
{
setMoleFractionsByName(x);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================
void ThermoPhase::setState_TPX(doublereal t, doublereal p, const std::string& x)
{
compositionMap xx = parseCompString(x, speciesNames());
setMoleFractionsByName(xx);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================
void ThermoPhase::setState_TPY(doublereal t, doublereal p,
const doublereal* y)
{
setMassFractions(y);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================
void ThermoPhase::setState_TPY(doublereal t, doublereal p,
compositionMap& y)
{
setMassFractionsByName(y);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================
void ThermoPhase::setState_TPY(doublereal t, doublereal p,
@ -214,8 +209,7 @@ void ThermoPhase::setState_TPY(doublereal t, doublereal p,
{
compositionMap yy = parseCompString(y, speciesNames());
setMassFractionsByName(yy);
setTemperature(t);
setPressure(p);
setState_TP(t,p);
}
//=================================================================================================================