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

Added WITH_ELECTROLYTES in several places. Haven't checked to see whether

Browse source 
the code compiles with Electrolytes off yet, however.
This commit is contained in:
Harry Moffat 2008-01-02 17:01:05 +00:00
parent 735a2a3652
commit 889257b89c
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cantera/src/equil/MultiPhaseEquil.cpp
View file

@ -1,6 +1,15 @@
/**
* @file MultiPhaseEquil.cpp
*/
/*
* $Id$
*/
#include "MultiPhaseEquil.h"
#include "MultiPhase.h"
#ifdef WITH_ELECTROLYTES
#include "MolalityVPSSTP.h"
#endif
#include "sort.h"
#include "global.h"
@ -946,10 +955,11 @@ namespace Cantera {
}
VolPhaseVolumes *= TMolesPhase;
vol += VolPhaseVolumes;
if (actConvention == 1) {
MolalityVPSSTP *mTP = static_cast<MolalityVPSSTP *>(tp);
tp->getChemPotentials(DATA_PTR(mu));
if (actConvention == 1) {
#ifdef WITH_ELECTROLYTES
MolalityVPSSTP *mTP = static_cast<MolalityVPSSTP *>(tp);
mTP->getMolalities(DATA_PTR(molalities));
#endif
tp->getChemPotentials(DATA_PTR(mu));
if (iphase == 0) {

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

@ -18,15 +18,23 @@
#ifdef CANTERA_SRC_TREE
#include "speciesThermoTypes.h"
#ifdef WITH_IDEAL_SOLUTIONS
#include "IdealSolidSolnPhase.h"
#endif
#ifdef WITH_ELECTROLYTES
#include "IdealMolalSoln.h"
#endif
#include "ChemEquil.h"
#else
#include "cantera/Cantera.h"
#include "cantera/thermo.h"
#include "cantera/kernel/speciesThermoTypes.h"
#ifdef WITH_IDEAL_SOLUTIONS
#include "cantera/kernel/IdealSolidSolnPhase.h"
#endif
#ifdef WITH_ELECTROLYTES
#include "cantera/kernel/IdealMolalSoln.h"
#endif
#include "cantera/kernel/ChemEquil.h"
#endif
@ -808,9 +816,10 @@ namespace Cantera {
if (actConvention == 1) {
#ifdef WITH_ELECTROLYTES
MolalityVPSSTP *mTP = static_cast<MolalityVPSSTP *>(tp);
tp->getChemPotentials(VCS_DATA_PTR(mu));
mTP->getMolalities(VCS_DATA_PTR(molalities));
#endif
tp->getChemPotentials(VCS_DATA_PTR(mu));
if (iphase == 0) {