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

Bug fix to make sure Cantera compiles without VCSnonideal

Browse source
This commit is contained in:
Harry Moffat 2007-12-19 22:55:45 +00:00
parent 45c65a18f9
commit c82624b1ca
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cantera/src/equil/equilibrate.cpp
View file

@ -106,8 +106,7 @@ namespace Cantera {
int retn = -1; int retn = -1;
int nAttempts = 0; int nAttempts = 0;
int retnSub = 0; int retnSub = 0;
bool estimateEquil = false;
int printLvlSub = 0;
if (loglevel > 0) { if (loglevel > 0) {
beginLogGroup("equilibrate", loglevel); beginLogGroup("equilibrate", loglevel);
@ -126,6 +125,9 @@ namespace Cantera {
} }
while (redo) { while (redo) {
if (solver >= 2) { if (solver >= 2) {
#ifdef WITH_VCSNONIDEAL
int printLvlSub = 0;
bool estimateEquil = false;
m = new MultiPhase; m = new MultiPhase;
try { try {
m->addPhase(&s, 1.0); m->addPhase(&s, 1.0);
@ -154,6 +156,10 @@ namespace Cantera {
throw err; throw err;
} }
} }
#else
throw CanteraError("equilibrate",
"VCSNonIdeal solver called, but not compiled");
#endif
} else if (solver == 1) { } else if (solver == 1) {
m = new MultiPhase; m = new MultiPhase;
try { try {