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

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2004-03-18 01:13:26 +00:00
parent 275075c895
commit aa01fa76b4
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Cantera/src/ChemEquil.cpp
View file

@ -456,14 +456,6 @@ namespace Cantera {
for (int ii = 0; ii < m_mm; ii++) x[ii] = -100.0; for (int ii = 0; ii < m_mm; ii++) x[ii] = -100.0;
estimateElementPotentials(s, x); estimateElementPotentials(s, x);
x[m_mm] = log(m_phase->temperature());
if (m_thermo->temperature() > m_thermo->maxTemp() ||
m_thermo->temperature() < m_thermo->minTemp() ) {
throw CanteraError("ChemEquil","Temperature ("
+fp2str(m_thermo->temperature())+" K) outside "
"valid range of "+fp2str(m_thermo->minTemp())+" K to "
+fp2str(m_thermo->maxTemp())+" K\n");
}
vector_fp above(nvar); vector_fp above(nvar);
vector_fp below(nvar); vector_fp below(nvar);
@ -556,6 +548,15 @@ namespace Cantera {
&& fabs(deltax) < options.relTolerance && fabs(deltax) < options.relTolerance
&& fabs(deltay) < options.relTolerance) { && fabs(deltay) < options.relTolerance) {
options.iterations = iter; options.iterations = iter;
if (m_thermo->temperature() > m_thermo->maxTemp() ||
m_thermo->temperature() < m_thermo->minTemp() ) {
throw CanteraError("ChemEquil","Temperature ("
+fp2str(m_thermo->temperature())+" K) outside "
"valid range of "+fp2str(m_thermo->minTemp())+" K to "
+fp2str(m_thermo->maxTemp())+" K\n");
}
return 0; return 0;
} }