From 507f400705157065f4a5d835b675a2e4dbd97784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Tue, 6 Feb 2018 16:26:38 +0100 Subject: [PATCH] Prepare forr v0.9.1 --- CHANGES.rst | 4 ++++ external/anyode/include/anyode/anyode.hpp | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index c02a3f5..4834eb3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,7 @@ +v0.9.1 +====== +- Update AnyODE (11) + v0.9.0 ====== - Update AnyODE (8) diff --git a/external/anyode/include/anyode/anyode.hpp b/external/anyode/include/anyode/anyode.hpp index 42fe881..0029821 100644 --- a/external/anyode/include/anyode/anyode.hpp +++ b/external/anyode/include/anyode/anyode.hpp @@ -1,11 +1,11 @@ #ifdef ANYODE_HPP_D47BAD58870311E6B95F2F58DEFE6E37 -#if ANYODE_HPP_D47BAD58870311E6B95F2F58DEFE6E37 != 8 +#if ANYODE_HPP_D47BAD58870311E6B95F2F58DEFE6E37 != 11 #error "Multiple anyode.hpp files included with version mismatch" #endif #else -#define ANYODE_HPP_D47BAD58870311E6B95F2F58DEFE6E37 8 +#define ANYODE_HPP_D47BAD58870311E6B95F2F58DEFE6E37 11 #include @@ -21,16 +21,19 @@ namespace AnyODE { struct OdeSysBase { int nfev=0, njev=0; void * integrator = nullptr; + void * user_data = nullptr; std::unordered_map last_integration_info; std::unordered_map last_integration_info_dbl; std::unordered_map > last_integration_info_vecdbl; std::unordered_map > last_integration_info_vecint; Real_t default_dx0 = 0.0; // *may* be used by `get_dx0`, 0 signifies solver default + bool autonomous_exprs = false; bool use_get_dx_max = false; // whether get_dx_max should be called bool record_rhs_xvals = false; bool record_jac_xvals = false; bool record_order = false; bool record_fpe = false; + bool record_steps = false; virtual ~OdeSysBase() {} virtual int get_ny() const = 0; virtual int get_mlower() const { return -1; } // -1 denotes "not banded"