From 64bfdcc952bbaf9d7d926833a85e0ccc7356d8bc Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 5 Jun 2013 17:09:30 +0000 Subject: [PATCH] Deprecate support for Sundials 2.2 and 2.3. --- include/cantera/numerics/CVodesIntegrator.h | 4 ++++ src/numerics/CVodesIntegrator.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h index 324db1653..e2ae19d3c 100644 --- a/include/cantera/numerics/CVodesIntegrator.h +++ b/include/cantera/numerics/CVodesIntegrator.h @@ -38,6 +38,10 @@ public: * * @see FuncEval.h. Classes that use CVodeInt: * ImplicitChem, ImplicitSurfChem, Reactor + * + * @deprecated Support for Sundials 2.2 and 2.3 is deprecated. Starting with + * %Cantera 2.2, only Sundials versions 2.4 and newer will be supported. + * (The CVodesIntegrator class itself is not deprecated). */ class CVodesIntegrator : public Integrator { diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index f172f5013..4052d249b 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -128,6 +128,10 @@ CVodesIntegrator::CVodesIntegrator() : m_mupper(0), m_mlower(0), m_sens_ok(false) { +#if SUNDIALS_VERSION <= 23 + warn_deprecated("Use of Sundials 2.2 and 2.3", + "Support for these versions will be removed in Cantera 2.2."); +#endif //m_ropt.resize(OPT_SIZE,0.0); //m_iopt = new long[OPT_SIZE]; //fill(m_iopt, m_iopt+OPT_SIZE,0);