Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20260416.0
0.20260417.0
16 changes: 8 additions & 8 deletions src/sed/sedinstancetask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand All @@ -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
}
}

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
}

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/sed/sedinstancetask_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct SedInstanceTaskResults
std::vector<Doubles> rates;
std::vector<Doubles> constants;
std::vector<Doubles> computedConstants;
std::vector<Doubles> algebraic;
std::vector<Doubles> algebraicVariables;
};

using SedInstanceTaskWeakPtr = std::weak_ptr<SedInstanceTask>;
Expand Down Expand Up @@ -66,7 +66,7 @@ class SedInstanceTask::Impl: public Logger::Impl
Doubles mRateDoubles;
Doubles mConstantDoubles;
Doubles mComputedConstantDoubles;
Doubles mAlgebraicDoubles;
Doubles mAlgebraicVariableDoubles;

SedInstanceTaskResults mResults;

Expand Down
6 changes: 3 additions & 3 deletions src/solver/solvercvode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/solver/solvercvode_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct SolverCvodeUserData
{
double *constants {nullptr};
double *computedConstants {nullptr};
double *algebraic {nullptr};
double *algebraicVariables {nullptr};

CellmlFileRuntimePtr runtime;
};
Expand Down
Loading