Mercurial > mxe-octave

annotate src/of-odepkg-1-fixes.patch @ 7186:19a46de50b18 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/jasper.mk: update to v4.2.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 02 May 2024 09:22:30 -0400
parents 5cee475eceb0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4200
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/src/odepkg_octsolver_ddaskr.cc b/src/odepkg_octsolver_ddaskr.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/src/odepkg_octsolver_ddaskr.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/src/odepkg_octsolver_ddaskr.cc 2016-08-31 14:22:43.798913906 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -42,6 +42,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 typedef octave_idx_type (*odepkg_ddaskr_restype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 (const double& T, const double* Y, const double* YPRIME,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 const double& CJ, double* DELTA, octave_idx_type& IRES,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 diff -uNr a/src/odepkg_octsolver_mebdfdae.cc b/src/odepkg_octsolver_mebdfdae.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 --- a/src/odepkg_octsolver_mebdfdae.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 +++ b/src/odepkg_octsolver_mebdfdae.cc 2016-08-31 14:23:07.518439633 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 @@ -46,6 +46,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 typedef octave_idx_type (*odepkg_mebdfdae_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 (const octave_idx_type& N, const double& T, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 double* YDOT, const octave_idx_type* IPAR, const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 diff -uNr a/src/odepkg_octsolver_mebdfi.cc b/src/odepkg_octsolver_mebdfi.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 --- a/src/odepkg_octsolver_mebdfi.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 +++ b/src/odepkg_octsolver_mebdfi.cc 2016-08-31 14:22:39.958990687 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 @@ -42,6 +42,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 * @subsection Source File @file{odepkg_octsolver_mebdfi.cc}
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 *
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 diff -uNr a/src/odepkg_octsolver_radau5.cc b/src/odepkg_octsolver_radau5.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 --- a/src/odepkg_octsolver_radau5.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 +++ b/src/odepkg_octsolver_radau5.cc 2016-08-31 14:51:45.128382513 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 @@ -37,24 +37,28 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 -typedef octave_idx_type (*odepkg_radau5_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 +typedef F77_RET_T (*odepkg_radau5_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 (const octave_idx_type& N, const double& X, const double* Y, double* F,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 -typedef octave_idx_type (*odepkg_radau5_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 +typedef F77_RET_T (*odepkg_radau5_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 (const octave_idx_type& N, const double& X, const double* Y, double* DFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 -typedef octave_idx_type (*odepkg_radau5_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 +typedef F77_RET_T (*odepkg_radau5_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 (const octave_idx_type& N, double* AM,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 GCC_ATTR_UNUSED const octave_idx_type* LMAS,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 -typedef octave_idx_type (*odepkg_radau5_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 +typedef F77_RET_T (*odepkg_radau5_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 @@ -91,7 +95,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 static octave_value vradau5mass;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 static octave_value vradau5massstate;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 -octave_idx_type odepkg_radau5_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 +F77_RET_T odepkg_radau5_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 double* F, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 GCC_ATTR_UNUSED const octave_idx_type* IPAR) {
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 @@ -119,10 +123,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89 for (octave_idx_type vcnt = 0; vcnt < N; vcnt++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90 F[vcnt] = vcol(vcnt);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
96 -octave_idx_type odepkg_radau5_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
97 +F77_RET_T odepkg_radau5_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
98 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
99 double* DFY, GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
100 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
101 @@ -146,7 +150,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
102 for (octave_idx_type vrow = 0; vrow < N; vrow++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
103 DFY[vrow+vcol*N] = vdfy (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
104
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
105 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
106 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
107 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
108
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
109 F77_RET_T odepkg_radau5_massfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
110 @@ -176,10 +180,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
111 for (octave_idx_type vcol = 0; vcol < N; vcol++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
112 AM[vrow+vcol*N] = vam (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
113
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
114 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
115 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
116 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
117
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
118 -octave_idx_type odepkg_radau5_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
119 +F77_RET_T odepkg_radau5_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
120 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
121 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
122 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
123 @@ -241,7 +245,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
124 (vradau5pltfun, vradau5outsel, vt, vy, vradau5extarg, 1);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
125 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
126
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
127 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
128 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
129 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
130
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
131 // PKG_ADD: autoload ("ode5r", "dldsolver.oct");
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
132 diff -uNr a/src/odepkg_octsolver_radau.cc b/src/odepkg_octsolver_radau.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
133 --- a/src/odepkg_octsolver_radau.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
134 +++ b/src/odepkg_octsolver_radau.cc 2016-08-31 14:44:01.261572457 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
135 @@ -37,24 +37,28 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
136 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
137 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
138
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
139 -typedef octave_idx_type (*odepkg_radau_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
140 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
141 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
142 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
143 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
144 +typedef F77_RET_T (*odepkg_radau_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
145 (const octave_idx_type& N, const double& X, const double* Y, double* F,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
146 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
147 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
148
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
149 -typedef octave_idx_type (*odepkg_radau_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
150 +typedef F77_RET_T (*odepkg_radau_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
151 (const octave_idx_type& N, const double& X, const double* Y, double* DFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
152 GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
153 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
154 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
155
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
156 -typedef octave_idx_type (*odepkg_radau_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
157 +typedef F77_RET_T (*odepkg_radau_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
158 (const octave_idx_type& N, double* AM,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
159 GCC_ATTR_UNUSED const octave_idx_type* LMAS,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
160 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
161 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
162
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
163 -typedef octave_idx_type (*odepkg_radau_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
164 +typedef F77_RET_T (*odepkg_radau_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
165 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
166 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
167 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
168 @@ -91,7 +95,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
169 static octave_value vradaumass;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
170 static octave_value vradaumassstate;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
171
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
172 -octave_idx_type odepkg_radau_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
173 +F77_RET_T odepkg_radau_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
174 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
175 double* F, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
176 GCC_ATTR_UNUSED const octave_idx_type* IPAR) {
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
177 @@ -119,10 +123,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
178 for (octave_idx_type vcnt = 0; vcnt < N; vcnt++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
179 F[vcnt] = vcol(vcnt);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
180
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
181 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
182 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
183 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
184
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
185 -octave_idx_type odepkg_radau_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
186 +F77_RET_T odepkg_radau_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
187 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
188 double* DFY, GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
189 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
190 @@ -146,7 +150,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
191 for (octave_idx_type vrow = 0; vrow < N; vrow++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
192 DFY[vrow+vcol*N] = vdfy (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
193
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
194 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
195 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
196 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
197
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
198 F77_RET_T odepkg_radau_massfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
199 @@ -176,10 +180,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
200 for (octave_idx_type vcol = 0; vcol < N; vcol++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
201 AM[vrow+vcol*N] = vam (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
202
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
203 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
204 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
205 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
206
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
207 -octave_idx_type odepkg_radau_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
208 +F77_RET_T odepkg_radau_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
209 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
210 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
211 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
212 @@ -241,7 +245,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
213 (vradaupltfun, vradauoutsel, vt, vy, vradauextarg, 1);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
214 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
215
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
216 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
217 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
218 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
219
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
220 // PKG_ADD: autoload ("ode2r", "dldsolver.oct");
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
221 diff -uNr a/src/odepkg_octsolver_rodas.cc b/src/odepkg_octsolver_rodas.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
222 --- a/src/odepkg_octsolver_rodas.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
223 +++ b/src/odepkg_octsolver_rodas.cc 2016-08-31 14:54:58.648546043 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
224 @@ -33,6 +33,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
225 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
226 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
227
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
228 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
229 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
230 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
231 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
232 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
233 * @subsection Source File @file{odepkg_octsolver_rodas.cc}
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
234 *
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
235 @@ -47,7 +51,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
236 * @end example
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
237 * @end deftp
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
238 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
239 -typedef octave_idx_type (*odepkg_rodas_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
240 +typedef F77_RET_T (*odepkg_rodas_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
241 (const octave_idx_type& N, const double& X, const double* Y, double* F,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
242 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
243 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
244 @@ -66,7 +70,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
245 * @end example
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
246 * @end deftp
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
247 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
248 -typedef octave_idx_type (*odepkg_rodas_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
249 +typedef F77_RET_T (*odepkg_rodas_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
250 (const octave_idx_type& N, const double& X, const double* Y, double* DFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
251 GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
252 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
253 @@ -86,7 +90,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
254 * @end example
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
255 * @end deftp
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
256 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
257 -typedef octave_idx_type (*odepkg_rodas_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
258 +typedef F77_RET_T (*odepkg_rodas_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
259 (const octave_idx_type& N, double* AM,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
260 GCC_ATTR_UNUSED const octave_idx_type* LMAS,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
261 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
262 @@ -106,7 +110,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
263 * @end example
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
264 * @end deftp
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
265 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
266 -typedef octave_idx_type (*odepkg_rodas_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
267 +typedef F77_RET_T (*odepkg_rodas_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
268 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
269 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
270 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
271 @@ -128,7 +132,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
272 * @end example
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
273 * @end deftp
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
274 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
275 -typedef octave_idx_type (*odepkg_rodas_dfxtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
276 +typedef F77_RET_T (*odepkg_rodas_dfxtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
277 (GCC_ATTR_UNUSED const octave_idx_type& N, GCC_ATTR_UNUSED const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
278 GCC_ATTR_UNUSED const double* Y, GCC_ATTR_UNUSED const double* FX,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
279 GCC_ATTR_UNUSED const double* RPAR, GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
280 @@ -270,7 +274,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
281 * @end itemize
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
282 * @end deftypefn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
283 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
284 -octave_idx_type odepkg_rodas_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
285 +F77_RET_T odepkg_rodas_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
286 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
287 double* F, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
288 GCC_ATTR_UNUSED const octave_idx_type* IPAR) {
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
289 @@ -298,7 +302,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
290 for (octave_idx_type vcnt = 0; vcnt < N; vcnt++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
291 F[vcnt] = vcol(vcnt);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
292
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
293 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
294 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
295 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
296
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
297 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
298 @@ -317,7 +321,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
299 * @end itemize
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
300 * @end deftypefn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
301 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
302 -octave_idx_type odepkg_rodas_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
303 +F77_RET_T odepkg_rodas_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
304 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
305 double* DFY, GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
306 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
307 @@ -341,7 +345,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
308 for (octave_idx_type vrow = 0; vrow < N; vrow++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
309 DFY[vrow+vcol*N] = vdfy (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
310
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
311 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
312 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
313 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
314
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
315 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
316 @@ -374,13 +378,13 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
317 for (octave_idx_type vcol = 0; vcol < N; vcol++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
318 AM[vrow+vcol*N] = vam (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
319
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
320 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
321 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
322 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
323
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
324 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
325 * odepkg_rodas_solfcn - TODO
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
326 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
327 -octave_idx_type odepkg_rodas_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
328 +F77_RET_T odepkg_rodas_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
329 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
330 const double* Y, const double* CONT, const octave_idx_type* LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
331 const octave_idx_type& N, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
332 @@ -442,20 +446,20 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
333 (vrodaspltfun, vrodasoutsel, vt, vy, vrodasextarg, 1);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
334 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
335
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
336 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
337 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
338 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
339
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
340 /* -*- texinfo -*-
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
341 * odepkg_rodas_solfcn - TODO dummy function
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
342 */
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
343 -octave_idx_type odepkg_rodas_dfxfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
344 +F77_RET_T odepkg_rodas_dfxfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
345 (GCC_ATTR_UNUSED const octave_idx_type& N, GCC_ATTR_UNUSED const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
346 GCC_ATTR_UNUSED const double* Y, GCC_ATTR_UNUSED const double* FX,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
347 GCC_ATTR_UNUSED const double* RPAR, GCC_ATTR_UNUSED const octave_idx_type* IPAR) {
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
348
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
349 warning_with_id ("OdePkg:InvalidFunctionCall",
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
350 "function odepkg_rodas_dfxfcn: This warning message should never appear");
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
351 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
352 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
353 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
354
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
355 // PKG_ADD: autoload ("oders", "dldsolver.oct");
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
356 diff -uNr a/src/odepkg_octsolver_seulex.cc b/src/odepkg_octsolver_seulex.cc
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
357 --- a/src/odepkg_octsolver_seulex.cc 2015-05-19 09:48:44.000000000 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
358 +++ b/src/odepkg_octsolver_seulex.cc 2016-08-31 14:56:43.990460352 -0400
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
359 @@ -37,24 +37,28 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
360 #include <parse.h>
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
361 #include "odepkg_auxiliary_functions.h"
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
362
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
363 -typedef octave_idx_type (*odepkg_seulex_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
364 +#if ! defined (GCC_ATTR_UNUSED)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
365 +# define GCC_ATTR_UNUSED OCTAVE_UNUSED
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
366 +#endif
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
367 +
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
368 +typedef F77_RET_T (*odepkg_seulex_usrtype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
369 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
370 double* F, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
371 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
372
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
373 -typedef octave_idx_type (*odepkg_seulex_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
374 +typedef F77_RET_T (*odepkg_seulex_jactype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
375 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
376 double* DFY, GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
377 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
378 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
379
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
380 -typedef octave_idx_type (*odepkg_seulex_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
381 +typedef F77_RET_T (*odepkg_seulex_masstype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
382 (const octave_idx_type& N, double* AM,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
383 GCC_ATTR_UNUSED const octave_idx_type* LMAS,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
384 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
385 GCC_ATTR_UNUSED const octave_idx_type* IPAR);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
386
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
387 -typedef octave_idx_type (*odepkg_seulex_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
388 +typedef F77_RET_T (*odepkg_seulex_soltype)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
389 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
390 const double* Y, const double* RC, const octave_idx_type& LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
391 const double* IC, const octave_idx_type& LIC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
392 @@ -94,7 +98,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
393 static octave_value vseulexmass;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
394 static octave_value vseulexmassstate;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
395
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
396 -octave_idx_type odepkg_seulex_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
397 +F77_RET_T odepkg_seulex_usrfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
398 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
399 double* F, GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
400 GCC_ATTR_UNUSED const octave_idx_type* IPAR) {
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
401 @@ -122,10 +126,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
402 for (octave_idx_type vcnt = 0; vcnt < N; vcnt++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
403 F[vcnt] = vcol(vcnt);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
404
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
405 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
406 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
407 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
408
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
409 -octave_idx_type odepkg_seulex_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
410 +F77_RET_T odepkg_seulex_jacfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
411 (const octave_idx_type& N, const double& X, const double* Y,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
412 double* DFY, GCC_ATTR_UNUSED const octave_idx_type& LDFY,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
413 GCC_ATTR_UNUSED const double* RPAR,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
414 @@ -149,7 +153,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
415 for (octave_idx_type vrow = 0; vrow < N; vrow++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
416 DFY[vrow+vcol*N] = vdfy (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
417
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
418 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
419 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
420 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
421
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
422 F77_RET_T odepkg_seulex_massfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
423 @@ -179,10 +183,10 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
424 for (octave_idx_type vcol = 0; vcol < N; vcol++)
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
425 AM[vrow+vcol*N] = vam (vrow, vcol);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
426
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
427 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
428 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
429 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
430
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
431 -octave_idx_type odepkg_seulex_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
432 +F77_RET_T odepkg_seulex_solfcn
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
433 (const octave_idx_type& NR, const double& XOLD, const double& X,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
434 const double* Y, const double* RC, const octave_idx_type& LRC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
435 const double* IC, const octave_idx_type& LIC,
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
436 @@ -249,7 +253,7 @@
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
437 vseulexpltbrk = true;
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
438 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
439
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
440 - return (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
441 + F77_RETURN (true);
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
442 }
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
443
5cee475eceb0 temporary fixes for of-odepkg package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
444 // PKG_ADD: autoload ("odesx", "dldsolver.oct");