Mercurial > jwe > octave
changeset 30902:260ce8667d96
maint: Revert changeset 360d330cc30e to match updated names in c9788d7f6e65.
* ode15i.m, ode15s.m: Use "havejacfcn" in options structure passed to
__ode15__.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 05 Apr 2022 08:55:38 -0700 |
parents | c9788d7f6e65 |
children | 51a3d3a69193 |
files | scripts/ode/ode15i.m scripts/ode/ode15s.m |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ode/ode15i.m Tue Apr 05 08:33:58 2022 -0700 +++ b/scripts/ode/ode15i.m Tue Apr 05 08:55:38 2022 -0700 @@ -172,7 +172,7 @@ ## Jacobian options.havejac = false; options.havejacsparse = false; - options.havejacfun = false; + options.havejacfcn = false; if (! isempty (options.Jacobian)) options.havejac = true; @@ -196,7 +196,7 @@ endif elseif (is_function_handle (options.Jacobian)) - options.havejacfun = true; + options.havejacfcn = true; if (nargin (options.Jacobian) == 3) [J1, J2] = options.Jacobian (trange(1), y0, yp0);
--- a/scripts/ode/ode15s.m Tue Apr 05 08:33:58 2022 -0700 +++ b/scripts/ode/ode15s.m Tue Apr 05 08:55:38 2022 -0700 @@ -216,12 +216,12 @@ ## Jacobian options.havejac = false; options.havejacsparse = false; - options.havejacfun = false; + options.havejacfcn = false; if (! isempty (options.Jacobian)) options.havejac = true; if (is_function_handle (options.Jacobian)) - options.havejacfun = true; + options.havejacfcn = true; if (nargin (options.Jacobian) == 2) A = options.Jacobian (trange(1), y0); if (! issquare (A) || rows (A) != n || ! isnumeric (A) || ! isreal (A)) @@ -263,13 +263,13 @@ ## If Mass or Jacobian is fcn, then new Jacobian is fcn if (options.havejac) - if (options.havejacfun || options.havetimedep) + if (options.havejacfcn || options.havetimedep) options.Jacobian = @ (t, y, yp) wrapjacfcn (t, y, yp, options.Jacobian, options.Mass, options.havetimedep, - options.havejacfun); - options.havejacfun = true; + options.havejacfcn); + options.havejacfcn = true; else # All matrices are constant if (! isempty (options.Mass)) options.Jacobian = {[- options.Jacobian], [options.Mass]};