Mercurial > octave-nkf
comparison scripts/ode/private/integrate_n_steps.m @ 20639:a260a6acb70f
fix test failures introduced by a22d8a2eb0e5
* scripts/ode/private/integrate_adaptive.m: fix stepping backwards, fix
invocation of OutputFcn, fix text of some error messages
* scripts/ode/private/integrate_const.m: remove use of option OutputSave
* scripts/ode/private/integrate_n_steps.m: remove use of option OutputSave
author | Carlo de Falco <carlo.defalco@polimi.it> |
---|---|
date | Sun, 11 Oct 2015 23:09:01 +0200 |
parents | b7ac1e94266e |
children |
comparison
equal
deleted
inserted
replaced
20638:d30fc2c11455 | 20639:a260a6acb70f |
---|---|
127 | 127 |
128 ## values on this interval for time and solution | 128 ## values on this interval for time and solution |
129 z = [t(end);s]; | 129 z = [t(end);s]; |
130 u = [x(:,end),y]; | 130 u = [x(:,end),y]; |
131 | 131 |
132 if (mod (solution.vcntloop-1, options.OutputSave) == 0) | 132 x = [x,u(:,2:end)]; |
133 x = [x,u(:,2:end)]; | 133 t = [t;z(2:end)]; |
134 t = [t;z(2:end)]; | 134 solution.vcntsave = solution.vcntsave + 1; |
135 solution.vcntsave = solution.vcntsave + 1; | |
136 endif | |
137 solution.vcntloop = solution.vcntloop + 1; | 135 solution.vcntloop = solution.vcntloop + 1; |
138 vcntiter = 0; | 136 vcntiter = 0; |
139 | 137 |
140 ## Call plot only if a valid result has been found, therefore this code | 138 ## Call plot only if a valid result has been found, therefore this code |
141 ## fragment has moved here. Stop integration if plot function returns false | 139 ## fragment has moved here. Stop integration if plot function returns false |