From 9a1d6532ba81b84662e8f0d02bf72930c411f9a9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 13 Mar 2013 20:20:27 +0000 Subject: [PATCH] Fixed compilation error when using Sundials 2.3 --- src/numerics/CVodesIntegrator.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index 36e26cebe..0e7109088 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -339,11 +339,11 @@ void CVodesIntegrator::initialize(double t0, FuncEval& func) #if SUNDIALS_VERSION <= 23 if (m_itol == CV_SV) { // vector atol - flag = CVodeMalloc(m_cvode_mem, cvodes_rhs, m_t0, nv(m_y), m_itol, - m_reltol, nv(m_abstol)); + flag = CVodeMalloc(m_cvode_mem, cvodes_rhs, m_t0, m_y, m_itol, + m_reltol, m_abstol); } else { // scalar atol - flag = CVodeMalloc(m_cvode_mem, cvodes_rhs, m_t0, nv(m_y), m_itol, + flag = CVodeMalloc(m_cvode_mem, cvodes_rhs, m_t0, m_y, m_itol, m_reltol, &m_abstols); } if (flag != CV_SUCCESS) { @@ -425,11 +425,11 @@ void CVodesIntegrator::reinitialize(double t0, FuncEval& func) #if SUNDIALS_VERSION <= 23 if (m_itol == CV_SV) { - result = CVodeReInit(m_cvode_mem, cvodes_rhs, m_t0, nv(m_y), + result = CVodeReInit(m_cvode_mem, cvodes_rhs, m_t0, m_y, m_itol, m_reltol, - nv(m_abstol)); + m_abstol); } else { - result = CVodeReInit(m_cvode_mem, cvodes_rhs, m_t0, nv(m_y), + result = CVodeReInit(m_cvode_mem, cvodes_rhs, m_t0, m_y, m_itol, m_reltol, &m_abstols); }