Mercurial > octave
changeset 22136:9c3ace79cc3b
declare odepack common blocks consistently (bug #48531)
* dlsode.f, intdy.f, prepj.f, solsy.f, stode.f: Declare variables
consistently in common block /ls0001/.
* sintdy.f, slsode.f, sprepj.f, ssolsy.f, sstode.f: Likewise, for
common block /sls001/.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 18 Jul 2016 11:18:47 -0400 |
| parents | 407c66ae1e20 |
| children | 37f41acc2c39 |
| files | liboctave/cruft/odepack/dlsode.f liboctave/cruft/odepack/intdy.f liboctave/cruft/odepack/prepj.f liboctave/cruft/odepack/sintdy.f liboctave/cruft/odepack/slsode.f liboctave/cruft/odepack/solsy.f liboctave/cruft/odepack/sprepj.f liboctave/cruft/odepack/ssolsy.f liboctave/cruft/odepack/sstode.f liboctave/cruft/odepack/stode.f |
| diffstat | 10 files changed, 79 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/cruft/odepack/dlsode.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/dlsode.f Mon Jul 18 11:18:47 2016 -0400 @@ -945,12 +945,13 @@ C----------------------------------------------------------------------- EXTERNAL PREPJ, SOLSY INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, - 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, IOWNS + 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, + 2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 1 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, I1, I2, IFLAG, IMXER, KGO, LF0, 1 LENIW, LENRW, LENWM, ML, MORD, MU, MXHNL0, MXSTP0 - DOUBLE PRECISION ROWNS, + DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND DOUBLE PRECISION ATOLI, AYI, BIG, EWTI, H0, HMAX, HMX, RH, RTOLI, 1 TCRIT, TDIST, TNEXT, TOL, TOLSF, TP, SIZE, SUM, W0, @@ -971,10 +972,12 @@ C REPLACED BY DUMMY ARRAYS IN THE COMMON DECLARATIONS IN ROUTINES C WHERE THOSE VARIABLES ARE NOT USED. C----------------------------------------------------------------------- - COMMON /LS0001/ ROWNS(209), + COMMON /LS0001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, - 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, IOWNS(6), + 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU C
--- a/liboctave/cruft/odepack/intdy.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/intdy.f Mon Jul 18 11:18:47 2016 -0400 @@ -1,18 +1,23 @@ SUBROUTINE INTDY (T, K, YH, NYH, DKY, IFLAG) CLLL. OPTIMIZE INTEGER K, NYH, IFLAG - INTEGER IOWND, IOWNS, - 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, + INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, + 2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP + INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, IC, J, JB, JB2, JJ, JJ1, JP1 DOUBLE PRECISION T, YH, DKY - DOUBLE PRECISION ROWNS, + DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND DOUBLE PRECISION C, R, S, TP DIMENSION YH(NYH,*), DKY(*) - COMMON /LS0001/ ROWNS(209), + COMMON /LS0001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 3 IOWND(14), IOWNS(6), + 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU C-----------------------------------------------------------------------
--- a/liboctave/cruft/odepack/prepj.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/prepj.f Mon Jul 18 11:18:47 2016 -0400 @@ -3,21 +3,26 @@ CLLL. OPTIMIZE EXTERNAL F, JAC INTEGER NEQ, NYH, IWM - INTEGER IOWND, IOWNS, - 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, + INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, + 2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP + INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, I1, I2, IER, II, J, J1, JJ, LENP, 1 MBA, MBAND, MEB1, MEBAND, ML, ML3, MU, NP1 DOUBLE PRECISION Y, YH, EWT, FTEM, SAVF, WM - DOUBLE PRECISION ROWNS, + DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND DOUBLE PRECISION CON, DI, FAC, HL0, R, R0, SRUR, YI, YJ, YJJ, 1 VNORM DIMENSION NEQ(*), Y(*), YH(NYH,*), EWT(*), FTEM(*), SAVF(*), 1 WM(*), IWM(*) - COMMON /LS0001/ ROWNS(209), + COMMON /LS0001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 3 IOWND(14), IOWNS(6), + 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU C-----------------------------------------------------------------------
--- a/liboctave/cruft/odepack/sintdy.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/sintdy.f Mon Jul 18 11:18:47 2016 -0400 @@ -42,15 +42,18 @@ INTEGER K, NYH, IFLAG REAL T, YH, DKY DIMENSION YH(NYH,*), DKY(*) - INTEGER IOWND, IOWNS, + INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 1 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU - REAL ROWNS, + REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND - COMMON /SLS001/ ROWNS(209), + COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 2 IOWND(6), IOWNS(6), + 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
--- a/liboctave/cruft/odepack/slsode.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/slsode.f Mon Jul 18 11:18:47 2016 -0400 @@ -1207,13 +1207,14 @@ REAL R1MACH, SVNORM C C Declare all other variables. - INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, IOWNS, + INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, + 1 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, I1, I2, IFLAG, IMXER, KGO, LF0, 1 LENIW, LENRW, LENWM, ML, MORD, MU, MXHNL0, MXSTP0 - REAL ROWNS, + REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND REAL ATOLI, AYI, BIG, EWTI, H0, HMAX, HMX, RH, RTOLI, 1 TCRIT, TDIST, TNEXT, TOL, TOLSF, TP, SIZE, SUM, W0 @@ -1231,9 +1232,11 @@ C Groups of variables are replaced by dummy arrays in the Common C declarations in routines where those variables are not used. C----------------------------------------------------------------------- - COMMON /SLS001/ ROWNS(209), + COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, IOWNS(6), + 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
--- a/liboctave/cruft/odepack/solsy.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/solsy.f Mon Jul 18 11:18:47 2016 -0400 @@ -1,18 +1,23 @@ SUBROUTINE SOLSY (WM, IWM, X, TEM) CLLL. OPTIMIZE INTEGER IWM - INTEGER IOWND, IOWNS, - 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, + INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, + 2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP + INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, MEBAND, ML, MU DOUBLE PRECISION WM, X, TEM - DOUBLE PRECISION ROWNS, + DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND DOUBLE PRECISION DI, HL0, PHL0, R DIMENSION WM(*), IWM(*), X(*), TEM(*) - COMMON /LS0001/ ROWNS(209), + COMMON /LS0001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 3 IOWND(14), IOWNS(6), + 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, NYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU C-----------------------------------------------------------------------
--- a/liboctave/cruft/odepack/sprepj.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/sprepj.f Mon Jul 18 11:18:47 2016 -0400 @@ -58,15 +58,18 @@ REAL Y, YH, EWT, FTEM, SAVF, WM DIMENSION NEQ(*), Y(*), YH(NYH,*), EWT(*), FTEM(*), SAVF(*), 1 WM(*), IWM(*) - INTEGER IOWND, IOWNS, + INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 1 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU - REAL ROWNS, + REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND - COMMON /SLS001/ ROWNS(209), + COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 2 IOWND(6), IOWNS(6), + 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
--- a/liboctave/cruft/odepack/ssolsy.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/ssolsy.f Mon Jul 18 11:18:47 2016 -0400 @@ -45,15 +45,18 @@ INTEGER IWM REAL WM, X, TEM DIMENSION WM(*), IWM(*), X(*), TEM(*) - INTEGER IOWND, IOWNS, + INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, + 1 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU - REAL ROWNS, + REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND - COMMON /SLS001/ ROWNS(209), + COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12), + 1 HOLD, RMAX, TESCO(3,12), 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 2 IOWND(6), IOWNS(6), + 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, NYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
--- a/liboctave/cruft/odepack/sstode.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/sstode.f Mon Jul 18 11:18:47 2016 -0400 @@ -97,19 +97,21 @@ REAL Y, YH, YH1, EWT, SAVF, ACOR, WM DIMENSION NEQ(*), Y(*), YH(NYH,*), YH1(*), EWT(*), SAVF(*), 1 ACOR(*), WM(*), IWM(*) - INTEGER IOWND, IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, + INTEGER INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 1 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 2 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 3 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, I1, IREDO, IRET, J, JB, M, NCF, NEWQ REAL CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, - 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND + 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND REAL DCON, DDN, DEL, DELP, DSM, DUP, EXDN, EXSM, EXUP, 1 R, RH, RHDN, RHSM, RHUP, TOLD, SVNORM COMMON /SLS001/ CONIT, CRATE, EL(13), ELCO(13,12), 1 HOLD, RMAX, TESCO(3,12), - 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, - 3 IOWND(6), IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, + 1 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, + 2 INIT, MXSTEP, MXHNIL, NHNIL, NSLAST, CNYH, + 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 3 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, 4 LYH, LEWT, LACOR, LSAVF, LWM, LIWM, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU
--- a/liboctave/cruft/odepack/stode.f Mon Jul 18 09:38:57 2016 -0400 +++ b/liboctave/cruft/odepack/stode.f Mon Jul 18 11:18:47 2016 -0400 @@ -3,9 +3,11 @@ CLLL. OPTIMIZE EXTERNAL F, JAC, PJAC, SLVS INTEGER NEQ, NYH, IWM - INTEGER IOWND, IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, - 1 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, - 2 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU + INTEGER ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 1 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, + 2 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP + INTEGER ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, + 1 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU INTEGER I, I1, IREDO, IRET, J, JB, M, NCF, NEWQ DOUBLE PRECISION Y, YH, YH1, EWT, SAVF, ACOR, WM DOUBLE PRECISION CONIT, CRATE, EL, ELCO, HOLD, RMAX, TESCO, @@ -16,7 +18,9 @@ 1 ACOR(*), WM(*), IWM(*) COMMON /LS0001/ CONIT, CRATE, EL(13), ELCO(13,12), 1 HOLD, RMAX, TESCO(3,12), - 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, IOWND(14), + 2 CCMAX, EL0, H, HMIN, HMXI, HU, RC, TN, UROUND, + 2 ILLIN, INIT, LYH, LEWT, LACOR, LSAVF, LWM, LIWM, + 3 MXSTEP, MXHNIL, NHNIL, NTREP, NSLAST, CNYH, 3 IALTH, IPUP, LMAX, MEO, NQNYH, NSLP, 4 ICF, IERPJ, IERSL, JCUR, JSTART, KFLAG, L, METH, MITER, 5 MAXORD, MAXCOR, MSBP, MXNCF, N, NQ, NST, NFE, NJE, NQU