Mercurial > hg > octave-lyh

changeset 4428:067160691cc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-06-16 19:09:11 by jwe]
author jwe
date Mon, 16 Jun 2003 19:09:11 +0000
parents 8040775cf0a9
children c1f6200b5f0e
files libcruft/ChangeLog libcruft/dasrt/ddasrt.f liboctave/ChangeLog liboctave/DASRT.cc
diffstat 4 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* dasrt/ddasrt.f (DDASRT): Set LMXSTP to 21 and LIPVT to 22 to
+	avoid conflict with LLAST in DRCHECK.  Change docs for INFO(12)
+	and LIW.
+
 2003-05-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in, misc/Makefile.in: Handle DESTDIR.
--- a/libcruft/dasrt/ddasrt.f
+++ b/libcruft/dasrt/ddasrt.f
@@ -390,7 +390,7 @@
 C                 Yes - Set INFO(11) = 0
 C                  No - Set INFO(11) = 1,
 C                       and define the maximum number of steps
-C                       by setting IWORK(19)=MXSTEP
+C                       by setting IWORK(21)=MXSTEP
 C
 C   RTOL, ATOL -- You must assign relative (RTOL) and absolute (ATOL
 C               error tolerances to tell the code how accurately you
@@ -456,7 +456,7 @@
 C               your calling program.
 C
 C  LIW -- Set it to the declared length of the IWORK array.
-C               you must have LIW .GE. 20+NEQ
+C               you must have LIW .GE. 21+NEQ
 C
 C  RPAR, IPAR -- These are parameter arrays, of real and integer
 C               type, respectively. You can use them for communication
@@ -877,7 +877,7 @@
 C     SET POINTERS INTO IWORK
       PARAMETER (LML=1, LMU=2, LMXORD=3, LMTYPE=4, LNST=11,
      *  LNRE=12, LNJE=13, LETF=14, LCTF=15, LNGE=16, LNPD=17,
-     *  LIRFND=18, LMXSTP=19, LIPVT=21, LJCALC=5, LPHASE=6, LK=7,
+     *  LIRFND=18, LMXSTP=21, LIPVT=22, LJCALC=5, LPHASE=6, LK=7,
      *  LKOLD=8, LNS=9, LNSTL=10, LIWM=1)
 C
 C     SET RELATIVE OFFSET INTO RWORK
@@ -935,7 +935,7 @@
          LENRW=50+(IWORK(LMXORD)+4)*NEQ+LENPD+3*NG
 C
 C     CHECK LENGTHS OF RWORK AND IWORK
-60    LENIW=20+NEQ
+60    LENIW=21+NEQ
       IWORK(LNPD)=LENPD
       IF(LRW.LT.LENRW)GO TO 704
       IF(LIW.LT.LENIW)GO TO 705
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* DASRT.cc (DASRT::integrate): Set liw to 21 + n, not 20 + n.
+	Store step limit in iwork(20), not iwork(18).
+
 2003-05-16  Paul Kienzle <pkienzle@users.sf.net>
 
 	* oct-rand.cc: Use liboctave's clock layer instead of the system clock.
--- a/liboctave/DASRT.cc
+++ b/liboctave/DASRT.cc
@@ -196,7 +196,7 @@
 	    }
 	}
 
-      liw = 20 + n;
+      liw = 21 + n;
       lrw = 50 + 9*n + n*n + 3*ng;
 
       iwork.resize (liw);
@@ -282,7 +282,7 @@
       if (step_limit () >= 0)
 	{
 	  info(11) = 1;
-	  iwork(18) = step_limit ();
+	  iwork(20) = step_limit ();
 	}
       else
 	info(11) = 0;