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

Fully qualified ThermoPhase. For some reason it now needs to be

Browse source 
fully qualified.
This commit is contained in:
Harry Moffat 2008-02-04 15:50:56 +00:00
parent 839f947258
commit 78d2c16d59
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Cantera/src/equil/vcs_MultiPhaseEquil.cpp
View file

@ -24,6 +24,7 @@
#include "ct_defs.h" #include "ct_defs.h"
#include "mix_defs.h" #include "mix_defs.h"
#include "clockWC.h" #include "clockWC.h"
#include "ThermoPhase.h"
#include "speciesThermoTypes.h" #include "speciesThermoTypes.h"
#ifdef WITH_IDEAL_SOLUTIONS #ifdef WITH_IDEAL_SOLUTIONS
#include "IdealSolidSolnPhase.h" #include "IdealSolidSolnPhase.h"
@ -643,7 +644,7 @@ namespace VCSnonideal {
int kGlob = 0; int kGlob = 0;
for (int ip = 0; ip < m_vprob->NPhase; ip++) { for (int ip = 0; ip < m_vprob->NPhase; ip++) {
double phaseMole = 0.0; double phaseMole = 0.0;
ThermoPhase &tref = m_mix->phase(ip); Cantera::ThermoPhase &tref = m_mix->phase(ip);
int nspPhase = tref.nSpecies(); int nspPhase = tref.nSpecies();
for (int k = 0; k < nspPhase; k++, kGlob++) { for (int k = 0; k < nspPhase; k++, kGlob++) {
phaseMole += m_vprob->w[kGlob]; phaseMole += m_vprob->w[kGlob];
@ -756,7 +757,7 @@ namespace VCSnonideal {
vol = 0.0; vol = 0.0;
for (int iphase = 0; iphase < nphase; iphase++) { for (int iphase = 0; iphase < nphase; iphase++) {
istart = m_mix->speciesIndex(0, iphase); istart = m_mix->speciesIndex(0, iphase);
ThermoPhase &tref = m_mix->phase(iphase); Cantera::ThermoPhase &tref = m_mix->phase(iphase);
nSpecies = tref.nSpecies(); nSpecies = tref.nSpecies();
VolPM.resize(nSpecies, 0.0); VolPM.resize(nSpecies, 0.0);
tref.getPartialMolarVolumes(VCS_DATA_PTR(VolPM)); tref.getPartialMolarVolumes(VCS_DATA_PTR(VolPM));
@ -781,8 +782,8 @@ namespace VCSnonideal {
for (int iphase = 0; iphase < nphase; iphase++) { for (int iphase = 0; iphase < nphase; iphase++) {
istart = m_mix->speciesIndex(0, iphase); istart = m_mix->speciesIndex(0, iphase);
ThermoPhase &tref = m_mix->phase(iphase); Cantera::ThermoPhase &tref = m_mix->phase(iphase);
ThermoPhase *tp = &tref; Cantera::ThermoPhase *tp = &tref;
string phaseName = tref.name(); string phaseName = tref.name();
vcs_VolPhase *volP = m_vprob->VPhaseList[iphase]; vcs_VolPhase *volP = m_vprob->VPhaseList[iphase];
double TMolesPhase = volP->TotalMoles(); double TMolesPhase = volP->TotalMoles();
@ -888,7 +889,7 @@ namespace VCSnonideal {
* This function decides whether a phase has charged species * This function decides whether a phase has charged species
* or not. * or not.
*/ */
static bool hasChargedSpecies(ThermoPhase *tPhase) { static bool hasChargedSpecies(Cantera::ThermoPhase *tPhase) {
int nSpPhase = tPhase->nSpecies(); int nSpPhase = tPhase->nSpecies();
for (int k = 0; k < nSpPhase; k++) { for (int k = 0; k < nSpPhase; k++) {
if (tPhase->charge(k) != 0.0) { if (tPhase->charge(k) != 0.0) {
@ -907,7 +908,7 @@ namespace VCSnonideal {
* phase. It does this by searching for charged species. If it * phase. It does this by searching for charged species. If it
* finds one, and if the phase needs one, then it returns true. * finds one, and if the phase needs one, then it returns true.
*/ */
static bool chargeNeutralityElement(ThermoPhase *tPhase) { static bool chargeNeutralityElement(Cantera::ThermoPhase *tPhase) {
int hasCharge = hasChargedSpecies(tPhase); int hasCharge = hasChargedSpecies(tPhase);
if (tPhase->chargeNeutralityNecessary()) { if (tPhase->chargeNeutralityNecessary()) {
if (hasCharge) { if (hasCharge) {
@ -922,7 +923,7 @@ namespace VCSnonideal {
* *
* *
*/ */
static int setUpElements(vcs_VolPhase *VolPhase, ThermoPhase *tPhase) { static int setUpElements(vcs_VolPhase *VolPhase, Cantera::ThermoPhase *tPhase) {
int e, k, eT; int e, k, eT;
string ename; string ename;
int eFound = -2; int eFound = -2;
@ -1095,7 +1096,7 @@ namespace VCSnonideal {
vprob->Vol = mphase->volume(); vprob->Vol = mphase->volume();
vprob->Title = "MultiPhase Object"; vprob->Title = "MultiPhase Object";
ThermoPhase *tPhase = 0; Cantera::ThermoPhase *tPhase = 0;
int iSurPhase = -1; int iSurPhase = -1;
int gasPhase; int gasPhase;
@ -1473,7 +1474,7 @@ namespace VCSnonideal {
vprob->T = mphase->temperature(); vprob->T = mphase->temperature();
vprob->Pres = mphase->pressure(); vprob->Pres = mphase->pressure();
vprob->Vol = mphase->volume(); vprob->Vol = mphase->volume();
ThermoPhase *tPhase = 0; Cantera::ThermoPhase *tPhase = 0;
for (int iphase = 0; iphase < totNumPhases; iphase++) { for (int iphase = 0; iphase < totNumPhases; iphase++) {
tPhase = &(mphase->phase(iphase)); tPhase = &(mphase->phase(iphase));