From 3df193935e31b95219f6d9eaf88c214041a38661 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 2 Jan 2024 14:04:56 +0100 Subject: [PATCH 1/4] Update Doxygen to 1.10 --- scripts/downloadAndBuildDoxygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/downloadAndBuildDoxygen.sh b/scripts/downloadAndBuildDoxygen.sh index 19d86be5a1..4efa9ab483 100755 --- a/scripts/downloadAndBuildDoxygen.sh +++ b/scripts/downloadAndBuildDoxygen.sh @@ -9,7 +9,7 @@ DOXYGEN_DIR="${AMICI_PATH}"/ThirdParty/doxygen cd "${AMICI_PATH}"/ThirdParty if [[ ! -d ${DOXYGEN_DIR} ]]; then git clone --single-branch \ - --branch Release_1_9_7 \ + --branch Release_1_10_0 \ --depth 1 \ -c advice.detachedHead=false \ https://github.com/doxygen/doxygen.git "${DOXYGEN_DIR}" From 31e85c8bb060ddeb4bf742dd04009d7f52588eda Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 2 Jan 2024 14:27:19 +0100 Subject: [PATCH 2/4] Fix undoc --- include/amici/misc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/amici/misc.h b/include/amici/misc.h index 81543b399d..879439bdf5 100644 --- a/include/amici/misc.h +++ b/include/amici/misc.h @@ -290,6 +290,10 @@ class CpuTimer { return d_milliseconds(clock::now() - start_).count(); } + /** + * @brief Whether the timer uses a thread clock (i.e. provides proper, + * thread-specific CPU time). + */ static bool const uses_thread_clock = true; private: From eea16a8df7a8ef5b483f0bda6e58c93b1ebebe3b Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 2 Jan 2024 17:56:00 +0100 Subject: [PATCH 3/4] .. --- include/amici/misc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/amici/misc.h b/include/amici/misc.h index 879439bdf5..6dc3294240 100644 --- a/include/amici/misc.h +++ b/include/amici/misc.h @@ -333,6 +333,10 @@ class CpuTimer { / CLOCKS_PER_SEC; } + /** + * @brief Whether the timer uses a thread clock (i.e. provides proper, + * thread-specific CPU time). + */ static bool const uses_thread_clock = false; private: From 5313fa447cdb15d07ff10eacf156c3c80e1c74bf Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 2 Jan 2024 19:15:25 +0100 Subject: [PATCH 4/4] ? --- include/amici/solver.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/amici/solver.h b/include/amici/solver.h index 120a963ba4..4a1c95b96a 100644 --- a/include/amici/solver.h +++ b/include/amici/solver.h @@ -48,7 +48,8 @@ class Solver { public: /** Type of what is passed to Sundials solvers as user_data */ using user_data_type = std::pair; - + /** Type of the function to free a raw sundials solver pointer */ + using free_solver_ptr = std::function; /** * @brief Default constructor */ @@ -1608,10 +1609,10 @@ class Solver { void applySensitivityTolerances() const; /** pointer to solver memory block */ - mutable std::unique_ptr> solver_memory_; + mutable std::unique_ptr solver_memory_; /** pointer to solver memory block */ - mutable std::vector>> + mutable std::vector> solver_memory_B_; /** Sundials user_data */