Mercurial > octave-libtiff

comparison liboctave/numeric/DASSL.cc @ 30898:51a3d3a69193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. * DAEFunc.h, DASPK.cc, DASSL.cc, LSODE.cc, ODEFunc.h, eigs-base.cc, eigs-base.h, oct-norm.cc, mx-inlines.cc: Replace "func", "fun" in documentation and variable names with "fcn".
author Rik <rik@octave.org>
date Tue, 05 Apr 2022 13:20:48 -0700
parents 796f54d4ddbf
children
comparison
equal deleted inserted replaced
30897:260ce8667d96 30898:51a3d3a69193
53 F77_DBLE *, const F77_INT&, F77_INT *, 53 F77_DBLE *, const F77_INT&, F77_INT *,
54 const F77_INT&, const F77_DBLE *, const F77_INT *, 54 const F77_INT&, const F77_DBLE *, const F77_INT *,
55 dassl_jac_ptr); 55 dassl_jac_ptr);
56 } 56 }
57 57
58 static DAEFunc::DAERHSFunc user_fun; 58 static DAEFunc::DAERHSFunc user_fcn;
59 static DAEFunc::DAEJacFunc user_jac; 59 static DAEFunc::DAEJacFunc user_jac;
60 60
61 static F77_INT nn; 61 static F77_INT nn;
62 62
63 static F77_INT 63 static F77_INT
76 tmp_state.elem (i) = state[i]; 76 tmp_state.elem (i) = state[i];
77 } 77 }
78 78
79 octave_idx_type tmp_ires = ires; 79 octave_idx_type tmp_ires = ires;
80 80
81 tmp_delta = user_fun (tmp_state, tmp_deriv, time, tmp_ires); 81 tmp_delta = user_fcn (tmp_state, tmp_deriv, time, tmp_ires);
82 82
83 ires = octave::to_f77_int (tmp_ires); 83 ires = octave::to_f77_int (tmp_ires);
84 84
85 if (ires >= 0) 85 if (ires >= 0)
86 { 86 {
159 159
160 m_restart = false; 160 m_restart = false;
161 161
162 // DAEFunc 162 // DAEFunc
163 163
164 user_fun = DAEFunc::function (); 164 user_fcn = DAEFunc::function ();
165 user_jac = DAEFunc::jacobian_function (); 165 user_jac = DAEFunc::jacobian_function ();
166 166
167 if (user_fun) 167 if (user_fcn)
168 { 168 {
169 octave_idx_type ires = 0; 169 octave_idx_type ires = 0;
170 170
171 ColumnVector res = (*user_fun) (m_x, m_xdot, m_t, ires); 171 ColumnVector res = (*user_fcn) (m_x, m_xdot, m_t, ires);
172 172
173 if (res.numel () != m_x.numel ()) 173 if (res.numel () != m_x.numel ())
174 { 174 {
175 (*current_liboctave_error_handler) 175 (*current_liboctave_error_handler)
176 ("dassl: inconsistent sizes for state and residual vectors"); 176 ("dassl: inconsistent sizes for state and residual vectors");