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

Moved the getActivities and getActivityCoefficients() functions

Browse source 
to the activities member group.
This commit is contained in:
Harry Moffat 2005-10-24 17:03:13 +00:00
parent a81572e920
commit 60eb2c2968
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Cantera/src/ThermoPhase.h
View file

@ -361,6 +361,24 @@ namespace Cantera {
virtual void getUnitsStandardConc(double *uA, int k = 0,
int sizeUA = 6);
/*
* Return a vector of activities.
*/
void getActivities(doublereal* a);
/**
* Get the array of non-dimensional molar-based
* activity coefficients at
* the current solution temperature, pressure, and
* solution concentration.
*/
virtual void getActivityCoefficients(doublereal* ac) const {
if (m_kk == 1) {
ac[0] = 1.0;
} else {
err("getActivityCoefficients");
}
}
//@}
/// @name Partial Molar Properties of the Solution
@ -400,25 +418,6 @@ namespace Cantera {
}
}
/*
* Return a vector of activities.
*/
void getActivities(doublereal* a);
/**
* Get the array of non-dimensional molar-based
* activity coefficients at
* the current solution temperature, pressure, and
* solution concentration.
*/
virtual void getActivityCoefficients(doublereal* ac) const {
if (m_kk == 1) {
ac[0] = 1.0;
} else {
err("getActivityCoefficients");
}
}
/**
* Get the species partial molar enthalpies. Units: J/kmol.
*/