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

Include CVodes error text in resulting CanteraErrors

Browse source 
Failures in 'integrate' and 'advance' now include the error text provided by
CVodes directly, rather than just the numerical error code. This is especially
helpful in cases where the direct output from CVodes to stderr is lost
(e.g. when running from the Matlab GUI).
This commit is contained in:
Ray Speth 2014-08-28 16:55:41 +00:00
parent 002c158761
commit 0886de8650
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cantera/numerics/CVodesIntegrator.h
View file

@ -80,6 +80,9 @@ public:
//! responsible for integrator failures or unexpected small timesteps.
virtual std::string getErrorInfo(int N);
//! Error message information provide by CVodes
std::string m_error_message;
protected:
//! Applies user-specified options to the underlying CVODES solver. Called
//! during integrator initialization or reinitialization.
@ -113,6 +116,7 @@ private:
//! Indicates whether the sensitivities stored in m_yS have been updated
//! for at the current integrator time.
bool m_sens_ok;
};
} // namespace

20
src/numerics/CVodesIntegrator.cpp
View file

@ -43,8 +43,6 @@ public:
vector_fp m_pars;
FuncEval* m_func;
};
}
extern "C" {
@ -79,10 +77,19 @@ extern "C" {
}
return 0; // successful evaluation
}
//! Function called by CVodes when an error is encountered instead of
//! writing to stdout. Here, save the error message provided by CVodes so
//! that it can be included in the subsequently raised CanteraError.
static void cvodes_err(int error_code, const char* module,
const char* function, char* msg, void* eh_data)
{
CVodesIntegrator* integrator = (CVodesIntegrator*) eh_data;
integrator->m_error_message = msg;
integrator->m_error_message += "\n";
}
}
namespace Cantera
{
CVodesIntegrator::CVodesIntegrator() :
m_neq(0),
m_cvode_mem(0),
@ -299,6 +306,7 @@ void CVodesIntegrator::initialize(double t0, FuncEval& func)
throw CVodesErr("CVodeInit failed.");
}
}
CVodeSetErrHandlerFn(m_cvode_mem, &cvodes_err, this);
if (m_itol == CV_SV) {
flag = CVodeSVtolerances(m_cvode_mem, m_reltol, m_abstol);
@ -394,7 +402,7 @@ void CVodesIntegrator::integrate(double tout)
{
int flag = CVode(m_cvode_mem, tout, m_y, &m_time, CV_NORMAL);
if (flag != CV_SUCCESS) {
throw CVodesErr(" CVodes error encountered. Error code: " + int2str(flag) +
throw CVodesErr("CVodes error encountered. Error code: " + int2str(flag) + "\n" + m_error_message +
"\nComponents with largest weighted error estimates:\n" + getErrorInfo(10));
}
m_sens_ok = false;
@ -404,7 +412,7 @@ double CVodesIntegrator::step(double tout)
{
int flag = CVode(m_cvode_mem, tout, m_y, &m_time, CV_ONE_STEP);
if (flag != CV_SUCCESS) {
throw CVodesErr(" CVodes error encountered. Error code: " + int2str(flag) +
throw CVodesErr("CVodes error encountered. Error code: " + int2str(flag) + "\n" + m_error_message +
"\nComponents with largest weighted error estimates:\n" + getErrorInfo(10));
}