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

Translate exceptions into appropriate error codes in cvodes_rhs

Browse source
This commit is contained in:
Ray Speth 2012-08-11 23:58:33 +00:00
parent 1becffecb0
commit e168634c72
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/numerics/CVodesIntegrator.cpp
View file

@ -83,24 +83,25 @@ extern "C" {
static int cvodes_rhs(realtype t, N_Vector y, N_Vector ydot,
void* f_data)
{
double* ydata = NV_DATA_S(y); //N_VDATA(y);
double* ydotdata = NV_DATA_S(ydot); //N_VDATA(ydot);
Cantera::FuncData* d = (Cantera::FuncData*)f_data;
Cantera::FuncEval* f = d->m_func;
//try {
if (d->m_pars.size() == 0) {
f->eval(t, ydata, ydotdata, NULL);
} else {
f->eval(t, ydata, ydotdata, DATA_PTR(d->m_pars));
try {
double* ydata = NV_DATA_S(y); //N_VDATA(y);
double* ydotdata = NV_DATA_S(ydot); //N_VDATA(ydot);
Cantera::FuncData* d = (Cantera::FuncData*)f_data;
Cantera::FuncEval* f = d->m_func;
if (d->m_pars.size() == 0) {
f->eval(t, ydata, ydotdata, NULL);
} else {
f->eval(t, ydata, ydotdata, DATA_PTR(d->m_pars));
}
} catch (Cantera::CanteraError& err) {
std::cerr << err.what() << std::endl;
return 1; // possibly recoverable error
} catch (...) {
std::cerr << "cvodes_rhs: unhandled exception" << std::endl;
return -1; // unrecoverable error
}
//}
//catch (...) {
//Cantera::showErrors();
//Cantera::error("Teminating execution");
//}
return 0;
return 0; // successful evaluation
}
}
namespace Cantera

20
src/zeroD/ReactorNet.cpp
View file

@ -203,19 +203,13 @@ void ReactorNet::eval(doublereal t, doublereal* y,
size_t n;
size_t start = 0;
size_t pstart = 0;
// use a try... catch block, since exceptions are not passed
// through CVODE, since it is C code
try {
updateState(y);
for (n = 0; n < m_nreactors; n++) {
m_reactors[n]->evalEqs(t, y + start,
ydot + start, p + pstart);
start += m_size[n];
pstart += m_nparams[n];
}
} catch (CanteraError& err) {
std::cerr << err.what() << std::endl;
error("Terminating execution.");
updateState(y);
for (n = 0; n < m_nreactors; n++) {
m_reactors[n]->evalEqs(t, y + start,
ydot + start, p + pstart);
start += m_size[n];
pstart += m_nparams[n];
}
}