From 2df82ea520a33c6ba45a65dafbb40c5a86b96d59 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Mon, 23 Oct 2006 01:13:42 +0000 Subject: [PATCH] sundials version detection --- Cantera/src/CVodesIntegrator.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Cantera/src/CVodesIntegrator.cpp b/Cantera/src/CVodesIntegrator.cpp index 98b1c75f4..c9ceb97c9 100644 --- a/Cantera/src/CVodesIntegrator.cpp +++ b/Cantera/src/CVodesIntegrator.cpp @@ -11,10 +11,9 @@ #include using namespace std; -#undef OLD_SUNDIALS // sundials includes -#ifdef OLD_SUNDIALS +#ifdef SUNDIALS_VERSION_1 #include #include #include @@ -125,7 +124,7 @@ namespace Cantera { if (m_cvode_mem) { if (m_np > 0) CVodeSensFree(m_cvode_mem); -#ifdef OLD_SUNDIALS +#ifdef SUNDIALS_VERSION_1 CVodeFree(m_cvode_mem); #else CVodeFree(&m_cvode_mem); @@ -213,7 +212,7 @@ namespace Cantera { m_np = func.nparams(); long int nv = func.neq(); -#ifdef OLD_SUNDIALS +#ifdef SUNDIALS_VERSION_1 doublereal* data; int n, j; m_yS = N_VNewVectorArray_Serial(m_np, nv);