Skip to content

Commit a3fffd8

Browse files
committed
Fix COMMON in odepack
1 parent de942fd commit a3fffd8

File tree

1 file changed

+193
-77
lines changed

1 file changed

+193
-77
lines changed

recipes/recipes_emscripten/octave/0002-Remove-COMMON.patch

Lines changed: 193 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,53 @@
1-
From 1ced6a66ca8305c811d9ffead561a3817a8f5fdf Mon Sep 17 00:00:00 2001
1+
From 8531cc88c6013751f29ea4a18d578c7e8bfe4173 Mon Sep 17 00:00:00 2001
22
From: AntoinePrv <[email protected]>
3-
Date: Thu, 10 Apr 2025 14:18:55 +0200
3+
Date: Fri, 11 Apr 2025 10:18:03 +0200
44
Subject: [PATCH] Remove COMMON
55

66
---
7-
liboctave/external/odepack/dintdy.f | 1 -
8-
liboctave/external/odepack/dlsode.f | 2 --
9-
liboctave/external/odepack/dprepj.f | 1 -
10-
liboctave/external/odepack/dsolsy.f | 1 -
11-
liboctave/external/odepack/dstode.f | 1 -
12-
liboctave/external/odepack/sintdy.f | 1 -
13-
liboctave/external/odepack/slsode.f | 2 --
14-
liboctave/external/odepack/sprepj.f | 1 -
15-
liboctave/external/odepack/ssolsy.f | 1 -
16-
liboctave/external/odepack/sstode.f | 1 -
17-
liboctave/external/ranlib/advnst.f | 7 -------
18-
liboctave/external/ranlib/getsd.f | 7 -------
19-
liboctave/external/ranlib/ignlgi.f | 7 -------
20-
liboctave/external/ranlib/initgn.f | 7 -------
21-
liboctave/external/ranlib/inrgcm.f | 7 -------
22-
liboctave/external/ranlib/setall.f | 7 -------
23-
liboctave/external/ranlib/setant.f | 7 -------
24-
liboctave/external/ranlib/setsd.f | 7 -------
25-
18 files changed, 68 deletions(-)
7+
liboctave/external/odepack/dintdy.f | 10 +---------
8+
liboctave/external/odepack/dlsode.f | 11 +----------
9+
liboctave/external/odepack/dprepj.f | 10 +---------
10+
liboctave/external/odepack/dsolsy.f | 10 +---------
11+
liboctave/external/odepack/dstode.f | 10 +---------
12+
liboctave/external/odepack/sintdy.f | 10 +---------
13+
liboctave/external/odepack/slsode.f | 11 +----------
14+
liboctave/external/odepack/sprepj.f | 10 +---------
15+
liboctave/external/odepack/ssolsy.f | 10 +---------
16+
liboctave/external/odepack/sstode.f | 10 +---------
17+
liboctave/external/ranlib/advnst.f | 7 -------
18+
liboctave/external/ranlib/getsd.f | 7 -------
19+
liboctave/external/ranlib/ignlgi.f | 7 -------
20+
liboctave/external/ranlib/initgn.f | 7 -------
21+
liboctave/external/ranlib/inrgcm.f | 7 -------
22+
liboctave/external/ranlib/setall.f | 7 -------
23+
liboctave/external/ranlib/setant.f | 7 -------
24+
liboctave/external/ranlib/setsd.f | 7 -------
25+
18 files changed, 10 insertions(+), 148 deletions(-)
2626

2727
diff --git a/liboctave/external/odepack/dintdy.f b/liboctave/external/odepack/dintdy.f
28-
index f30242c..6029c83 100644
28+
index f30242c..ed03588 100644
2929
--- a/liboctave/external/odepack/dintdy.f
3030
+++ b/liboctave/external/odepack/dintdy.f
31-
@@ -49,7 +49,6 @@ C**End
31+
@@ -47,16 +47,8 @@ C**End
32+
2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP
33+
INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
3234
2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
33-
DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
35+
- DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
36+
+ DOUBLE PRECISION CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
3437
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
3538
- COMMON /DLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
36-
1 HOLD, RMAX, TESCO(3,12),
37-
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
38-
2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
39+
- 1 HOLD, RMAX, TESCO(3,12),
40+
- 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
41+
- 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
42+
- 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH,
43+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
44+
- 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
45+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
46+
INTEGER I, IC, J, JB, JB2, JJ, JJ1, JP1
47+
DOUBLE PRECISION C, R, S, TP
48+
CHARACTER*80 MSG
3949
diff --git a/liboctave/external/odepack/dlsode.f b/liboctave/external/odepack/dlsode.f
40-
index 59e3d53..0a4890e 100644
50+
index 59e3d53..f9866a7 100644
4151
--- a/liboctave/external/odepack/dlsode.f
4252
+++ b/liboctave/external/odepack/dlsode.f
4353
@@ -1082,7 +1082,6 @@ C given by NST = 0, NQ is 1 and H is temporarily set to 1.0.
@@ -48,64 +58,122 @@ index 59e3d53..0a4890e 100644
4858
C NQ = ILS(33)
4959
C NST = ILS(34)
5060
C H = RLS(212)
51-
@@ -1231,7 +1230,6 @@ C DPREPJ, and DSOLSY.
61+
@@ -1213,7 +1212,7 @@ C Declare all other variables.
62+
1 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
63+
INTEGER I, I1, I2, IFLAG, IMXER, KGO, LF0,
64+
1 LENIW, LENRW, LENWM, ML, MORD, MU, MXHNL0, MXSTP0
65+
- DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
66+
+ DOUBLE PRECISION CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
67+
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
68+
DOUBLE PRECISION ATOLI, AYI, BIG, EWTI, H0, HMAX, HMX, RH, RTOLI,
69+
1 TCRIT, TDIST, TNEXT, TOL, TOLSF, TP, SIZE, SUM, W0
70+
@@ -1231,14 +1230,6 @@ C DPREPJ, and DSOLSY.
5271
C Groups of variables are replaced by dummy arrays in the Common
5372
C declarations in routines where those variables are not used.
5473
C-----------------------------------------------------------------------
5574
- COMMON /DLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
56-
1 HOLD, RMAX, TESCO(3,12),
57-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
58-
2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
75+
- 1 HOLD, RMAX, TESCO(3,12),
76+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
77+
- 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
78+
- 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH,
79+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
80+
- 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
81+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
82+
C
83+
DATA MORD(1),MORD(2)/12,5/, MXSTP0/500/, MXHNL0/10/
84+
C-----------------------------------------------------------------------
5985
diff --git a/liboctave/external/odepack/dprepj.f b/liboctave/external/odepack/dprepj.f
60-
index 97d2927..561b64b 100644
86+
index 97d2927..1af4d1c 100644
6187
--- a/liboctave/external/odepack/dprepj.f
6288
+++ b/liboctave/external/odepack/dprepj.f
63-
@@ -65,7 +65,6 @@ C**End
89+
@@ -63,16 +63,8 @@ C**End
90+
INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
91+
1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH,
6492
2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP
65-
DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
93+
- DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
94+
+ DOUBLE PRECISION CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
6695
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
6796
- COMMON /DLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
68-
1 HOLD, RMAX, TESCO(3,12),
69-
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
70-
2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
97+
- 1 HOLD, RMAX, TESCO(3,12),
98+
- 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
99+
- 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
100+
- 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH,
101+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
102+
- 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
103+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
104+
INTEGER I, I1, I2, IER, II, J, J1, JJ, LENP,
105+
1 MBA, MBAND, MEB1, MEBAND, ML, ML3, MU, NP1
106+
DOUBLE PRECISION CON, DI, FAC, HL0, R, R0, SRUR, YI, YJ, YJJ,
71107
diff --git a/liboctave/external/odepack/dsolsy.f b/liboctave/external/odepack/dsolsy.f
72-
index 2d5a403..945c507 100644
108+
index 2d5a403..a33c298 100644
73109
--- a/liboctave/external/odepack/dsolsy.f
74110
+++ b/liboctave/external/odepack/dsolsy.f
75-
@@ -52,7 +52,6 @@ C**End
111+
@@ -50,16 +50,8 @@ C**End
112+
2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP
113+
INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
76114
2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
77-
DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
115+
- DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
116+
+ DOUBLE PRECISION CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
78117
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
79118
- COMMON /DLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
80-
1 HOLD, RMAX, TESCO(3,12),
81-
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
82-
2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
119+
- 1 HOLD, RMAX, TESCO(3,12),
120+
- 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
121+
- 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
122+
- 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH,
123+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
124+
- 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
125+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
126+
INTEGER I, MEBAND, ML, MU
127+
INTEGER INLPCK
128+
DOUBLE PRECISION DI, HL0, PHL0, R
83129
diff --git a/liboctave/external/odepack/dstode.f b/liboctave/external/odepack/dstode.f
84-
index 187d1e8..aea304c 100644
130+
index 187d1e8..4ae2509 100644
85131
--- a/liboctave/external/odepack/dstode.f
86132
+++ b/liboctave/external/odepack/dstode.f
87-
@@ -107,7 +107,6 @@ C**End
133+
@@ -103,18 +103,10 @@ C**End
134+
INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
135+
1 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
136+
INTEGER I, I1, IREDO, IRET, J, JB, M, NCF, NEWQ
137+
- DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
138+
+ DOUBLE PRECISION CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
88139
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
89140
DOUBLE PRECISION DCON, DDN, DEL, DELP, DSM, DUP, EXDN, EXSM, EXUP,
90141
1 R, RH, RHDN, RHSM, RHUP, TOLD, DVNORM
91142
- COMMON /DLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
92-
1 HOLD, RMAX, TESCO(3,12),
93-
2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
94-
2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
143+
- 1 HOLD, RMAX, TESCO(3,12),
144+
- 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
145+
- 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM,
146+
- 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH,
147+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
148+
- 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER,
149+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
150+
C
151+
C***FIRST EXECUTABLE STATEMENT DSTODE
152+
KFLAG = 0
95153
diff --git a/liboctave/external/odepack/sintdy.f b/liboctave/external/odepack/sintdy.f
96-
index aa8af44..6c54749 100644
154+
index aa8af44..8e2b222 100644
97155
--- a/liboctave/external/odepack/sintdy.f
98156
+++ b/liboctave/external/odepack/sintdy.f
99-
@@ -49,7 +49,6 @@ C**End
157+
@@ -47,16 +47,8 @@ C**End
158+
1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
159+
2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
100160
3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
101-
REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
161+
- REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
162+
+ REAL CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
102163
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
103164
- COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
104-
1 HOLD, RMAX, TESCO(3,12),
105-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
106-
2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
165+
- 1 HOLD, RMAX, TESCO(3,12),
166+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
167+
- 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
168+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
169+
- 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
170+
- 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
171+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
172+
INTEGER I, IC, J, JB, JB2, JJ, JJ1, JP1
173+
REAL C, R, S, TP
174+
CHARACTER*80 MSG
107175
diff --git a/liboctave/external/odepack/slsode.f b/liboctave/external/odepack/slsode.f
108-
index 7551589..220db1d 100644
176+
index 7551589..87645a4 100644
109177
--- a/liboctave/external/odepack/slsode.f
110178
+++ b/liboctave/external/odepack/slsode.f
111179
@@ -1082,7 +1082,6 @@ C given by NST = 0, NQ is 1 and H is temporarily set to 1.0.
@@ -116,50 +184,98 @@ index 7551589..220db1d 100644
116184
C NQ = ILS(33)
117185
C NST = ILS(34)
118186
C H = RLS(212)
119-
@@ -1231,7 +1230,6 @@ C SPREPJ, and SSOLSY.
187+
@@ -1213,7 +1212,7 @@ C Declare all other variables.
188+
3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
189+
INTEGER I, I1, I2, IFLAG, IMXER, KGO, LF0,
190+
1 LENIW, LENRW, LENWM, ML, MORD, MU, MXHNL0, MXSTP0
191+
- REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
192+
+ REAL CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
193+
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
194+
REAL ATOLI, AYI, BIG, EWTI, H0, HMAX, HMX, RH, RTOLI,
195+
1 TCRIT, TDIST, TNEXT, TOL, TOLSF, TP, SIZE, SUM, W0
196+
@@ -1231,14 +1230,6 @@ C SPREPJ, and SSOLSY.
120197
C Groups of variables are replaced by dummy arrays in the Common
121198
C declarations in routines where those variables are not used.
122199
C-----------------------------------------------------------------------
123200
- COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
124-
1 HOLD, RMAX, TESCO(3,12),
125-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
126-
2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH,
201+
- 1 HOLD, RMAX, TESCO(3,12),
202+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
203+
- 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH,
204+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
205+
- 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
206+
- 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
207+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
208+
C
209+
DATA MORD(1),MORD(2)/12,5/, MXSTP0/500/, MXHNL0/10/
210+
C-----------------------------------------------------------------------
127211
diff --git a/liboctave/external/odepack/sprepj.f b/liboctave/external/odepack/sprepj.f
128-
index 72f79df..8a94d86 100644
212+
index 72f79df..8b0e5d3 100644
129213
--- a/liboctave/external/odepack/sprepj.f
130214
+++ b/liboctave/external/odepack/sprepj.f
131-
@@ -65,7 +65,6 @@ C**End
215+
@@ -63,16 +63,8 @@ C**End
216+
1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
217+
2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
132218
3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
133-
REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
219+
- REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
220+
+ REAL CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
134221
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
135222
- COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
136-
1 HOLD, RMAX, TESCO(3,12),
137-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
138-
2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
223+
- 1 HOLD, RMAX, TESCO(3,12),
224+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
225+
- 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
226+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
227+
- 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
228+
- 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
229+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
230+
INTEGER I, I1, I2, IER, II, J, J1, JJ, LENP,
231+
1 MBA, MBAND, MEB1, MEBAND, ML, ML3, MU, NP1
232+
REAL CON, DI, FAC, HL0, R, R0, SRUR, YI, YJ, YJJ,
139233
diff --git a/liboctave/external/odepack/ssolsy.f b/liboctave/external/odepack/ssolsy.f
140-
index 35926d7..20898a3 100644
234+
index 35926d7..b2e244a 100644
141235
--- a/liboctave/external/odepack/ssolsy.f
142236
+++ b/liboctave/external/odepack/ssolsy.f
143-
@@ -52,7 +52,6 @@ C**End
237+
@@ -50,16 +50,8 @@ C**End
238+
1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
239+
2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
144240
3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
145-
REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
241+
- REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
242+
+ REAL CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
146243
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
147244
- COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
148-
1 HOLD, RMAX, TESCO(3,12),
149-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
150-
2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH,
245+
- 1 HOLD, RMAX, TESCO(3,12),
246+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
247+
- 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH,
248+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
249+
- 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
250+
- 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
251+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
252+
INTEGER I, MEBAND, ML, MU
253+
INTEGER INLPCK
254+
REAL DI, HL0, PHL0, R
151255
diff --git a/liboctave/external/odepack/sstode.f b/liboctave/external/odepack/sstode.f
152-
index bce053f..f754dd9 100644
256+
index bce053f..401dab2 100644
153257
--- a/liboctave/external/odepack/sstode.f
154258
+++ b/liboctave/external/odepack/sstode.f
155-
@@ -107,7 +107,6 @@ C**End
259+
@@ -103,18 +103,10 @@ C**End
260+
2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
261+
3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
262+
INTEGER I, I1, IREDO, IRET, J, JB, M, NCF, NEWQ
263+
- REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO,
264+
+ REAL CONIT, CRATE, EL(13), ELCO(13,12), HOLD, RMAX, TESCO(3,12),
156265
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND
157266
REAL DCON, DDN, DEL, DELP, DSM, DUP, EXDN, EXSM, EXUP,
158267
1 R, RH, RHDN, RHSM, RHUP, TOLD, SVNORM
159268
- COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12),
160-
1 HOLD, RMAX, TESCO(3,12),
161-
1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
162-
2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
269+
- 1 HOLD, RMAX, TESCO(3,12),
270+
- 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND,
271+
- 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH,
272+
- 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP,
273+
- 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L,
274+
- 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER,
275+
- 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
276+
C
277+
C***FIRST EXECUTABLE STATEMENT SSTODE
278+
KFLAG = 0
163279
diff --git a/liboctave/external/ranlib/advnst.f b/liboctave/external/ranlib/advnst.f
164280
index 2fca548..e0bfa65 100644
165281
--- a/liboctave/external/ranlib/advnst.f

0 commit comments

Comments
 (0)