Skip to content

Commit

Permalink
..
Browse files Browse the repository at this point in the history
  • Loading branch information
dweindl committed Sep 25, 2024
1 parent 50bfc1c commit 773e0b2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
7 changes: 4 additions & 3 deletions include/amici/rdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ class ReturnData : public ModelDimensions {
std::vector<realtype> xdot;

/**
* Jacobian of differential equation right hand side (shape `nx_solver` x `nx_solver`,
* row-major) evaluated at `t_last`.
* Jacobian of differential equation right hand side (shape `nx_solver` x
* `nx_solver`, row-major) evaluated at `t_last`.
*/
std::vector<realtype> J;

Expand Down Expand Up @@ -160,7 +160,8 @@ class ReturnData : public ModelDimensions {
std::vector<realtype> x;

/**
* parameter derivative of state (shape `nt` x `nplist` x `nx_rdata`, row-major)
* parameter derivative of state (shape `nt` x `nplist` x `nx_rdata`,
* row-major)
*/
std::vector<realtype> sx;

Expand Down
6 changes: 3 additions & 3 deletions src/model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2006,9 +2006,9 @@ void Model::fsx_rdata(
if (ncl() > 0)
stcl = &state_.stotal_cl.at(plist(ip) * ncl());
fsx_rdata(
&sx_rdata[ip * nx_rdata], sx.data(ip), stcl, state_.unscaledParameters.data(),
state_.fixedParameters.data(), x_solver.data(),
state_.total_cl.data(), plist(ip)
&sx_rdata[ip * nx_rdata], sx.data(ip), stcl,
state_.unscaledParameters.data(), state_.fixedParameters.data(),
x_solver.data(), state_.total_cl.data(), plist(ip)
);
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/rdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,10 @@ void ReturnData::getDataSensisFSA(
ExpData const* edata
) {
if (!sx.empty()) {
model.fsx_rdata(gsl::span<realtype>(&sx.at(it * nplist * nx), nx), simulation_state.sx, simulation_state.x);
model.fsx_rdata(
gsl::span<realtype>(&sx.at(it * nplist * nx), nx),
simulation_state.sx, simulation_state.x
);
}

if (!sy.empty()) {
Expand Down

0 comments on commit 773e0b2

Please sign in to comment.