From 2da9782e21b72d5a3ed9b2b76b66e9ed621807d0 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 17 Apr 2026 11:22:34 +1200 Subject: [PATCH 1/2] New version. --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 121861f9f..26976cbc3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.20260416.0 +0.20260417.0 From 2ec2c5c4ad2f22c587c11650d68c32229dcc069d Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 17 Apr 2026 11:22:25 +1200 Subject: [PATCH 2/2] Renamed `algebraic` to `algebraicVariables`. --- src/sed/sedinstancetask.cpp | 16 ++++++++-------- src/sed/sedinstancetask_p.h | 4 ++-- src/solver/solvercvode.cpp | 6 +++--- src/solver/solvercvode_p.h | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/sed/sedinstancetask.cpp b/src/sed/sedinstancetask.cpp index f7d643157..8cd91e03b 100644 --- a/src/sed/sedinstancetask.cpp +++ b/src/sed/sedinstancetask.cpp @@ -121,15 +121,15 @@ SedInstanceTask::Impl::Impl(const SedAbstractTaskPtr &pTask) mConstantDoubles.resize(mConstantCount, NAN); mComputedConstantDoubles.resize(mComputedConstantCount, NAN); - mAlgebraicDoubles.resize(mAlgebraicVariableCount, NAN); + mAlgebraicVariableDoubles.resize(mAlgebraicVariableCount, NAN); mConstants = mConstantDoubles.data(); mComputedConstants = mComputedConstantDoubles.data(); - mAlgebraicVariables = mAlgebraicDoubles.data(); + mAlgebraicVariables = mAlgebraicVariableDoubles.data(); mResults.constants.resize(mConstantCount, {}); mResults.computedConstants.resize(mComputedConstantCount, {}); - mResults.algebraic.resize(mAlgebraicVariableCount, {}); + mResults.algebraicVariables.resize(mAlgebraicVariableCount, {}); // Retrieve our various strings. @@ -203,7 +203,7 @@ void SedInstanceTask::Impl::trackResults(size_t pIndex) auto &rates = mResults.rates; auto &constants = mResults.constants; auto &computedConstants = mResults.computedConstants; - auto &algebraic = mResults.algebraic; + auto &algebraicVariables = mResults.algebraicVariables; for (size_t i {0}; i < mStateCount; ++i) { states[i][pIndex] = mStates[i]; // NOLINT @@ -219,7 +219,7 @@ void SedInstanceTask::Impl::trackResults(size_t pIndex) } for (size_t i {0}; i < mAlgebraicVariableCount; ++i) { - algebraic[i][pIndex] = mAlgebraicVariables[i]; // NOLINT + algebraicVariables[i][pIndex] = mAlgebraicVariables[i]; // NOLINT } } @@ -337,7 +337,7 @@ double SedInstanceTask::Impl::run() } for (size_t i {0}; i < mAlgebraicVariableCount; ++i) { - mResults.algebraic[i].resize(resultsSize, NAN); + mResults.algebraicVariables[i].resize(resultsSize, NAN); } // Track our initial results. @@ -397,7 +397,7 @@ double SedInstanceTask::Impl::run() } for (size_t i {0}; i < mAlgebraicVariableCount; ++i) { - mResults.algebraic[i].assign(1, mAlgebraicVariables[i]); // NOLINT + mResults.algebraicVariables[i].assign(1, mAlgebraicVariables[i]); // NOLINT } } @@ -604,7 +604,7 @@ const Doubles &SedInstanceTask::Impl::algebraicVariable(size_t pIndex) const return NO_DOUBLES; } - return mResults.algebraic[pIndex]; + return mResults.algebraicVariables[pIndex]; } const std::string &SedInstanceTask::Impl::algebraicVariableName(size_t pIndex) const diff --git a/src/sed/sedinstancetask_p.h b/src/sed/sedinstancetask_p.h index 1567e46e9..0447fed6a 100644 --- a/src/sed/sedinstancetask_p.h +++ b/src/sed/sedinstancetask_p.h @@ -32,7 +32,7 @@ struct SedInstanceTaskResults std::vector rates; std::vector constants; std::vector computedConstants; - std::vector algebraic; + std::vector algebraicVariables; }; using SedInstanceTaskWeakPtr = std::weak_ptr; @@ -66,7 +66,7 @@ class SedInstanceTask::Impl: public Logger::Impl Doubles mRateDoubles; Doubles mConstantDoubles; Doubles mComputedConstantDoubles; - Doubles mAlgebraicDoubles; + Doubles mAlgebraicVariableDoubles; SedInstanceTaskResults mResults; diff --git a/src/solver/solvercvode.cpp b/src/solver/solvercvode.cpp index f72940c1f..13ff9eb2f 100644 --- a/src/solver/solvercvode.cpp +++ b/src/solver/solvercvode.cpp @@ -108,10 +108,10 @@ int rhsFunction(double pVoi, N_Vector pStates, N_Vector pRates, void *pUserData) #ifdef __EMSCRIPTEN__ userData->runtime->computeRates(pVoi, N_VGetArrayPointer_Serial(pStates), N_VGetArrayPointer_Serial(pRates), - userData->constants, userData->computedConstants, userData->algebraic); + userData->constants, userData->computedConstants, userData->algebraicVariables); #else userData->runtime->computeRates()(pVoi, N_VGetArrayPointer_Serial(pStates), N_VGetArrayPointer_Serial(pRates), - userData->constants, userData->computedConstants, userData->algebraic); + userData->constants, userData->computedConstants, userData->algebraicVariables); #endif return 0; @@ -613,7 +613,7 @@ bool SolverCvode::Impl::initialise(double pVoi, size_t pSize, double *pStates, d mUserData.constants = pConstants; mUserData.computedConstants = pComputedConstants; - mUserData.algebraic = pAlgebraicVariables; + mUserData.algebraicVariables = pAlgebraicVariables; mUserData.runtime = pRuntime; ASSERT_EQ(CVodeSetUserData(mSolver, &mUserData), CV_SUCCESS); diff --git a/src/solver/solvercvode_p.h b/src/solver/solvercvode_p.h index 6f0d18d4b..b2bb755f6 100644 --- a/src/solver/solvercvode_p.h +++ b/src/solver/solvercvode_p.h @@ -31,7 +31,7 @@ struct SolverCvodeUserData { double *constants {nullptr}; double *computedConstants {nullptr}; - double *algebraic {nullptr}; + double *algebraicVariables {nullptr}; CellmlFileRuntimePtr runtime; };