diff --git a/Cantera/src/equil/MultiPhaseEquil.cpp b/Cantera/src/equil/MultiPhaseEquil.cpp index 86ddcb6f3..fdddec117 100644 --- a/Cantera/src/equil/MultiPhaseEquil.cpp +++ b/Cantera/src/equil/MultiPhaseEquil.cpp @@ -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(tp); - tp->getChemPotentials(DATA_PTR(mu)); + if (actConvention == 1) { +#ifdef WITH_ELECTROLYTES + MolalityVPSSTP *mTP = static_cast(tp); mTP->getMolalities(DATA_PTR(molalities)); +#endif tp->getChemPotentials(DATA_PTR(mu)); if (iphase == 0) { diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp index 5475a7dbf..42761f874 100644 --- a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp +++ b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp @@ -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(tp); - tp->getChemPotentials(VCS_DATA_PTR(mu)); mTP->getMolalities(VCS_DATA_PTR(molalities)); +#endif tp->getChemPotentials(VCS_DATA_PTR(mu)); if (iphase == 0) {