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

Removed exception-based flow control from Sim1D::solve

Browse source
This commit is contained in:
Ray Speth 2012-03-09 22:54:35 +00:00
parent 50bef3ee5c
commit 0312f6dc21
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/cantera/oneD/Sim1D.h
View file

@ -132,7 +132,10 @@ private:
/// Calls method _finalize in each domain.
void finalize();
void newtonSolve(int loglevel);
/*! Wrapper around the Newton solver.
* @return 0 if successful, -1 on failure
*/
int newtonSolve(int loglevel);
};

43
src/oneD/Sim1D.cpp
View file

@ -248,45 +248,42 @@ void Sim1D::setTimeStep(doublereal stepsize, size_t n, integer* tsteps)
}
void Sim1D::newtonSolve(int loglevel)
int Sim1D::newtonSolve(int loglevel)
{
int m = OneDim::solve(DATA_PTR(m_x), DATA_PTR(m_xnew), loglevel);
if (m >= 0) {
copy(m_xnew.begin(), m_xnew.end(), m_x.begin());
return 0;
} else if (m > -10) {
throw CanteraError("Sim1D::newtonSolve","no solution found");
return -1;
} else {
writelog(string("ERROR: solve returned m = ") + int2str(m) + "\n");
exit(EXIT_FAILURE);
throw CanteraError("Sim1D::newtonSolve",
"ERROR: OneDim::solve returned m = " + int2str(m) + "\n");
}
}
void Sim1D::solve(int loglevel, bool refine_grid)
{
int new_points = 1;
int istep, nsteps;
int nsteps;
doublereal dt = m_tstep;
int soln_number = -1;
finalize();
while (new_points > 0) {
istep = 0;
size_t istep = 0;
nsteps = m_steps[istep];
bool ok = false;
while (!ok) {
if (loglevel > 0) {
sim1D_drawline();
writelog("\nAttempt Newton solution of steady-state problem...");
}
int status = newtonSolve(loglevel-1);
try {
if (loglevel > 0) {
sim1D_drawline();
writelog("\nAttempt Newton solution of steady-state problem...");
}
newtonSolve(loglevel-1);
if (status == 0) {
if (loglevel > 0) {
writelog(" success.\n\n");
writelog("Problem solved on [");
@ -301,20 +298,12 @@ void Sim1D::solve(int loglevel, bool refine_grid)
}
ok = true;
soln_number++;
}
catch (CanteraError& err) {
err.save();
popError();
} else {
char buf[100];
if (loglevel > 0) {
writelog(" failure. \n\n");
sim1D_drawline();
// }
//if (loglevel == 1)
writelog("Take "+int2str(nsteps)+
" timesteps ");
writelog("Take "+int2str(nsteps)+" timesteps ");
}
dt = timeStep(nsteps, dt, DATA_PTR(m_x), DATA_PTR(m_xnew),
loglevel-1);
@ -324,7 +313,7 @@ void Sim1D::solve(int loglevel, bool refine_grid)
writelog(buf);
}
istep++;
if (istep >= int(m_steps.size())) {
if (istep >= m_steps.size()) {
nsteps = m_steps.back();
} else {
nsteps = m_steps[istep];