[Scipy-svn] r2159 - in trunk/Lib: integrate/odepack integrate/quadpack interpolate/fitpack
scipy-svn at scipy.org
scipy-svn at scipy.org
Sun Aug 13 21:27:12 EDT 2006
Author: cookedm
Date: 2006-08-13 20:26:54 -0500 (Sun, 13 Aug 2006)
New Revision: 2159
Modified:
trunk/Lib/integrate/odepack/intdy.f
trunk/Lib/integrate/odepack/lsoda.f
trunk/Lib/integrate/odepack/lsodar.f
trunk/Lib/integrate/odepack/lsode.f
trunk/Lib/integrate/odepack/lsodes.f
trunk/Lib/integrate/odepack/lsodi.f
trunk/Lib/integrate/odepack/lsoibt.f
trunk/Lib/integrate/odepack/xerrwv.f
trunk/Lib/integrate/quadpack/dqag.f
trunk/Lib/integrate/quadpack/dqagi.f
trunk/Lib/integrate/quadpack/dqagp.f
trunk/Lib/integrate/quadpack/dqags.f
trunk/Lib/integrate/quadpack/dqawc.f
trunk/Lib/integrate/quadpack/dqawf.f
trunk/Lib/integrate/quadpack/dqawo.f
trunk/Lib/integrate/quadpack/dqaws.f
trunk/Lib/integrate/quadpack/dqng.f
trunk/Lib/interpolate/fitpack/fppola.f
trunk/Lib/interpolate/fitpack/fpsphe.f
trunk/Lib/interpolate/fitpack/fpsurf.f
Log:
Move some Fortran code out of the 1960's: remove Hollerith constants
Modified: trunk/Lib/integrate/odepack/intdy.f
===================================================================
--- trunk/Lib/integrate/odepack/intdy.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/intdy.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -69,14 +69,14 @@
60 dky(i) = r*dky(i)
return
c
- 80 call xerrwv(30hintdy-- k (=i1) illegal ,
+ 80 call xerrwv('intdy-- k (=i1) illegal ',
1 30, 51, 0, 1, k, 0, 0, 0.0d0, 0.0d0)
iflag = -1
return
- 90 call xerrwv(30hintdy-- t (=r1) illegal ,
+ 90 call xerrwv('intdy-- t (=r1) illegal ',
1 30, 52, 0, 0, 0, 0, 1, t, 0.0d0)
call xerrwv(
- 1 60h t not in interval tcur - hu (= r1) to tcur (=r2) ,
+ 1 ' t not in interval tcur - hu (= r1) to tcur (=r2) ',
1 60, 52, 0, 0, 0, 0, 2, tp, tn)
iflag = -2
return
Modified: trunk/Lib/integrate/odepack/lsoda.f
===================================================================
--- trunk/Lib/integrate/odepack/lsoda.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsoda.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -164,15 +164,15 @@
c call lsoda(fex,neq,y,t,tout,itol,rtol,atol,itask,istate,
c 1 iopt,rwork,lrw,iwork,liw,jdum,jt)
c write(6,20)t,y(1),y(2),y(3)
-c 20 format(7h at t =,e12.4,6h y =,3e14.6)
+c 20 format(' at t =',e12.4,' y =',3e14.6)
c if (istate .lt. 0) go to 80
c 40 tout = tout*10.0d0
c write(6,60)iwork(11),iwork(12),iwork(13),iwork(19),rwork(15)
-c 60 format(/12h no. steps =,i4,11h no. f-s =,i4,11h no. j-s =,i4/
-c 1 19h method last used =,i2,25h last switch was at t =,e12.4)
+c 60 format(/' no. steps =',i4,' no. f-s =',i4,' no. j-s =',i4/
+c 1 ' method last used =',i2,' last switch was at t =',e12.4)
c stop
c 80 write(6,90)istate
-c 90 format(///22h error halt.. istate =,i3)
+c 90 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1134,13 +1134,13 @@
insufr = 2
lewt = len1c + 1
call xerrwv(
- 1 60hlsoda-- warning.. rwork length is sufficient for now, but ,
+ 1 'lsoda-- warning.. rwork length is sufficient for now, but ',
1 60, 103, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h may not be later. integration will proceed anyway. ,
+ 1 ' may not be later. integration will proceed anyway. ',
1 60, 103, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 50h length needed is lenrw = i1, while lrw = i2.,
+ 1 ' length needed is lenrw = i1, while lrw = i2.',
1 50, 103, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
65 lsavf = lewt + n
lacor = lsavf + n
@@ -1148,13 +1148,13 @@
if (liw .ge. leniw) go to 70
insufi = 2
call xerrwv(
- 1 60hlsoda-- warning.. iwork length is sufficient for now, but ,
+ 1 'lsoda-- warning.. iwork length is sufficient for now, but ',
1 60, 104, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h may not be later. integration will proceed anyway. ,
+ 1 ' may not be later. integration will proceed anyway. ',
1 60, 104, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 50h length needed is leniw = i1, while liw = i2.,
+ 1 ' length needed is leniw = i1, while liw = i2.',
1 50, 104, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
70 continue
c check rtol and atol for legality. ------------------------------------
@@ -1334,17 +1334,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsoda-- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsoda-- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsoda-- above warning has been issued i1 times. ,
+ call xerrwv('lsoda-- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1375,13 +1375,13 @@
jstart = -1
if (ixpr .eq. 0) go to 310
if (meth .eq. 2) call xerrwv(
- 1 60hlsoda-- a switch to the bdf (stiff) method has occurred ,
+ 1 'lsoda-- a switch to the bdf (stiff) method has occurred ',
1 60, 105, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
if (meth .eq. 1) call xerrwv(
- 1 60hlsoda-- a switch to the adams (nonstiff) method has occurred,
+ 1 'lsoda-- a switch to the adams (nonstiff) method has occurred',
1 60, 106, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h at t = r1, tentative step size h = r2, step nst = i1 ,
+ 1 ' at t = r1, tentative step size h = r2, step nst = i1 ',
1 60, 107, 0, 1, nst, 0, 2, tn, h)
310 go to (320, 400, 330, 340, 350), itask
c itask = 1. if tout has been reached, interpolate. -------------------
@@ -1440,7 +1440,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsoda-- repeated calls with istate = 1 and tout = t (=r1) ,
+ 1 'lsoda-- repeated calls with istate = 1 and tout = t (=r1) ',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1453,55 +1453,55 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsoda-- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsoda-- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsoda-- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsoda-- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 580
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsoda-- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsoda-- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 580
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsoda-- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsoda-- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 560
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsoda-- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsoda-- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
go to 560
c rwork length too small to proceed. -----------------------------------
- 550 call xerrwv(50hlsoda-- at current t(=r1), rwork length too small,
+ 550 call xerrwv('lsoda-- at current t(=r1), rwork length too small',
1 50, 206, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h to proceed. the integration was otherwise successful.,
+ 1 ' to proceed. the integration was otherwise successful.',
1 60, 206, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 580
c iwork length too small to proceed. -----------------------------------
- 555 call xerrwv(50hlsoda-- at current t(=r1), iwork length too small,
+ 555 call xerrwv('lsoda-- at current t(=r1), iwork length too small',
1 50, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h to proceed. the integration was otherwise successful.,
+ 1 ' to proceed. the integration was otherwise successful.',
1 60, 207, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 580
@@ -1540,114 +1540,114 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsoda-- istate (=i1) illegal ,
+ 601 call xerrwv('lsoda-- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsoda-- itask (=i1) illegal ,
+ 602 call xerrwv('lsoda-- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsoda-- istate .gt. 1 but lsoda not initialized ,
+ 603 call xerrwv('lsoda-- istate .gt. 1 but lsoda not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsoda-- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsoda-- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsoda-- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsoda-- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsoda-- itol (=i1) illegal ,
+ 606 call xerrwv('lsoda-- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsoda-- iopt (=i1) illegal ,
+ 607 call xerrwv('lsoda-- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsoda-- jt (=i1) illegal ,
+ 608 call xerrwv('lsoda-- jt (=i1) illegal ',
1 30, 8, 0, 1, jt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(50hlsoda-- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 609 call xerrwv('lsoda-- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 9, 0, 2, ml, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 610 call xerrwv(50hlsoda-- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 610 call xerrwv('lsoda-- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 10, 0, 2, mu, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 611 call xerrwv(30hlsoda-- ixpr (=i1) illegal ,
+ 611 call xerrwv('lsoda-- ixpr (=i1) illegal ',
1 30, 11, 0, 1, ixpr, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsoda-- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsoda-- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsoda-- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsoda-- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsoda-- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsoda-- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsoda-- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsoda-- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsoda-- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsoda-- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
617 call xerrwv(
- 1 60hlsoda-- rwork length needed, lenrw (=i1), exceeds lrw (=i2),
+ 1 'lsoda-- rwork length needed, lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
618 call xerrwv(
- 1 60hlsoda-- iwork length needed, leniw (=i1), exceeds liw (=i2),
+ 1 'lsoda-- iwork length needed, leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsoda-- rtol(i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsoda-- rtol(i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsoda-- atol(i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsoda-- atol(i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsoda-- ewt(i1) is r1 .le. 0.0 ,
+ call xerrwv('lsoda-- ewt(i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsoda-- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsoda-- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsoda-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsoda-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsoda-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsoda-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsoda-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsoda-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsoda-- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsoda-- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsoda-- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsoda-- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
go to 700
- 628 call xerrwv(30hlsoda-- mxordn (=i1) .lt. 0 ,
+ 628 call xerrwv('lsoda-- mxordn (=i1) .lt. 0 ',
1 30, 28, 0, 1, mxordn, 0, 0, 0.0d0, 0.0d0)
go to 700
- 629 call xerrwv(30hlsoda-- mxords (=i1) .lt. 0 ,
+ 629 call xerrwv('lsoda-- mxords (=i1) .lt. 0 ',
1 30, 29, 0, 1, mxords, 0, 0, 0.0d0, 0.0d0)
c
700 if (illin .eq. 5) go to 710
illin = illin + 1
istate = -3
return
- 710 call xerrwv(50hlsoda-- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsoda-- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsoda-- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsoda-- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsoda -----------------------
Modified: trunk/Lib/integrate/odepack/lsodar.f
===================================================================
--- trunk/Lib/integrate/odepack/lsodar.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsodar.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -206,22 +206,22 @@
c 10 call lsodar(fex,neq,y,t,tout,itol,rtol,atol,itask,istate,
c 1 iopt,rwork,lrw,iwork,liw,jdum,jt,gex,ng,jroot)
c write(6,20)t,y(1),y(2),y(3)
-c 20 format(7h at t =,e12.4,6h y =,3e14.6)
+c 20 format(' at t =',e12.4,' y =',3e14.6)
c if (istate .lt. 0) go to 80
c if (istate .eq. 2) go to 40
c write(6,30)jroot(1),jroot(2)
-c 30 format(5x,35h the above line is a root, jroot =,2i5)
+c 30 format(5x,' the above line is a root, jroot =',2i5)
c istate = 2
c go to 10
c 40 tout = tout*10.0d0
c write(6,60)iwork(11),iwork(12),iwork(13),iwork(10),
c 1 iwork(19),rwork(15)
-c 60 format(/12h no. steps =,i4,11h no. f-s =,i4,11h no. j-s =,i4,
-c 1 11h no. g-s =,i4/
-c 2 19h method last used =,i2,25h last switch was at t =,e12.4)
+c 60 format(/' no. steps =',i4,' no. f-s =',i4,' no. j-s =',i4,
+c 1 ' no. g-s =',i4/
+c 2 ' method last used =',i2,' last switch was at t =',e12.4)
c stop
c 80 write(6,90)istate
-c 90 format(///22h error halt.. istate =,i3)
+c 90 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1277,13 +1277,13 @@
insufr = 2
lewt = len1c + 1
call xerrwv(
- 1 60hlsodar- warning.. rwork length is sufficient for now, but ,
+ 1 'lsodar- warning.. rwork length is sufficient for now, but ',
1 60, 103, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h may not be later. integration will proceed anyway. ,
+ 1 ' may not be later. integration will proceed anyway. ',
1 60, 103, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 50h length needed is lenrw = i1, while lrw = i2.,
+ 1 ' length needed is lenrw = i1, while lrw = i2.',
1 50, 103, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
65 lsavf = lewt + n
lacor = lsavf + n
@@ -1291,13 +1291,13 @@
if (liw .ge. leniw) go to 70
insufi = 2
call xerrwv(
- 1 60hlsodar- warning.. iwork length is sufficient for now, but ,
+ 1 'lsodar- warning.. iwork length is sufficient for now, but ',
1 60, 104, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h may not be later. integration will proceed anyway. ,
+ 1 ' may not be later. integration will proceed anyway. ',
1 60, 104, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 50h length needed is leniw = i1, while liw = i2.,
+ 1 ' length needed is leniw = i1, while liw = i2.',
1 50, 104, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
70 continue
c check rtol and atol for legality. ------------------------------------
@@ -1503,17 +1503,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsodar- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsodar- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsodar- above warning has been issued i1 times. ,
+ call xerrwv('lsodar- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1545,13 +1545,13 @@
jstart = -1
if (ixpr .eq. 0) go to 310
if (meth .eq. 2) call xerrwv(
- 1 60hlsodar- a switch to the bdf (stiff) method has occurred ,
+ 1 'lsodar- a switch to the bdf (stiff) method has occurred ',
1 60, 105, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
if (meth .eq. 1) call xerrwv(
- 1 60hlsodar- a switch to the adams (nonstiff) method has occurred,
+ 1 'lsodar- a switch to the adams (nonstiff) method has occurred',
1 60, 106, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h at t = r1, tentative step size h = r2, step nst = i1 ,
+ 1 ' at t = r1, tentative step size h = r2, step nst = i1 ',
1 60, 107, 0, 1, nst, 0, 2, tn, h)
310 continue
c
@@ -1625,7 +1625,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsodar- repeated calls with istate = 1 and tout = t (=r1) ,
+ 1 'lsodar- repeated calls with istate = 1 and tout = t (=r1) ',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1638,55 +1638,55 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsodar- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsodar- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsodar- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsodar- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 580
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsodar- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsodar- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 580
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsodar- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsodar- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 560
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsodar- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsodar- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
go to 560
c rwork length too small to proceed. -----------------------------------
- 550 call xerrwv(50hlsodar- at current t(=r1), rwork length too small,
+ 550 call xerrwv('lsodar- at current t(=r1), rwork length too small',
1 50, 206, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h to proceed. the integration was otherwise successful.,
+ 1 ' to proceed. the integration was otherwise successful.',
1 60, 206, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 580
c iwork length too small to proceed. -----------------------------------
- 555 call xerrwv(50hlsodar- at current t(=r1), iwork length too small,
+ 555 call xerrwv('lsodar- at current t(=r1), iwork length too small',
1 50, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h to proceed. the integration was otherwise successful.,
+ 1 ' to proceed. the integration was otherwise successful.',
1 60, 207, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 580
@@ -1727,117 +1727,117 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsodar- istate (=i1) illegal ,
+ 601 call xerrwv('lsodar- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsodar- itask (=i1) illegal ,
+ 602 call xerrwv('lsodar- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsodar- istate .gt. 1 but lsodar not initialized ,
+ 603 call xerrwv('lsodar- istate .gt. 1 but lsodar not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsodar- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsodar- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsodar- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsodar- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsodar- itol (=i1) illegal ,
+ 606 call xerrwv('lsodar- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsodar- iopt (=i1) illegal ,
+ 607 call xerrwv('lsodar- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsodar- jt (=i1) illegal ,
+ 608 call xerrwv('lsodar- jt (=i1) illegal ',
1 30, 8, 0, 1, jt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(50hlsodar- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 609 call xerrwv('lsodar- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 9, 0, 2, ml, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 610 call xerrwv(50hlsodar- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 610 call xerrwv('lsodar- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 10, 0, 2, mu, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 611 call xerrwv(30hlsodar- ixpr (=i1) illegal ,
+ 611 call xerrwv('lsodar- ixpr (=i1) illegal ',
1 30, 11, 0, 1, ixpr, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsodar- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsodar- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsodar- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsodar- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsodar- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsodar- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsodar- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsodar- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsodar- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsodar- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
617 call xerrwv(
- 1 60hlsodar- rwork length needed, lenrw (=i1), exceeds lrw (=i2),
+ 1 'lsodar- rwork length needed, lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
618 call xerrwv(
- 1 60hlsodar- iwork length needed, leniw (=i1), exceeds liw (=i2),
+ 1 'lsodar- iwork length needed, leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsodar- rtol(i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsodar- rtol(i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsodar- atol(i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsodar- atol(i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsodar- ewt(i1) is r1 .le. 0.0 ,
+ call xerrwv('lsodar- ewt(i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsodar- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsodar- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsodar- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsodar- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsodar- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsodar- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsodar- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsodar- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsodar- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsodar- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsodar- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsodar- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
go to 700
- 628 call xerrwv(30hlsodar- mxordn (=i1) .lt. 0 ,
+ 628 call xerrwv('lsodar- mxordn (=i1) .lt. 0 ',
1 30, 28, 0, 1, mxordn, 0, 0, 0.0d0, 0.0d0)
go to 700
- 629 call xerrwv(30hlsodar- mxords (=i1) .lt. 0 ,
+ 629 call xerrwv('lsodar- mxords (=i1) .lt. 0 ',
1 30, 29, 0, 1, mxords, 0, 0, 0.0d0, 0.0d0)
go to 700
- 630 call xerrwv(30hlsodar- ng (=i1) .lt. 0 ,
+ 630 call xerrwv('lsodar- ng (=i1) .lt. 0 ',
1 30, 30, 0, 1, ng, 0, 0, 0.0d0, 0.0d0)
go to 700
- 631 call xerrwv(50hlsodar- ng changed (from i1 to i2) illegally, ,
+ 631 call xerrwv('lsodar- ng changed (from i1 to i2) illegally, ',
1 50, 31, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h i.e. not immediately after a root was found ,
+ call xerrwv(' i.e. not immediately after a root was found ',
1 50, 31, 0, 2, ngc, ng, 0, 0.0d0, 0.0d0)
go to 700
- 632 call xerrwv(50hlsodar- one or more components of g has a root ,
+ 632 call xerrwv('lsodar- one or more components of g has a root ',
1 50, 32, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(40h too near to the initial point ,
+ call xerrwv(' too near to the initial point ',
1 40, 32, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
700 if (illin .eq. 5) go to 710
@@ -1845,10 +1845,10 @@
tlast = t
istate = -3
return
- 710 call xerrwv(50hlsodar- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsodar- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsodar- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsodar- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsodar ----------------------
Modified: trunk/Lib/integrate/odepack/lsode.f
===================================================================
--- trunk/Lib/integrate/odepack/lsode.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsode.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -178,14 +178,14 @@
c call lsode(fex,neq,y,t,tout,itol,rtol,atol,itask,istate,
c 1 iopt,rwork,lrw,iwork,liw,jex,mf)
c write(6,20)t,y(1),y(2),y(3)
-c 20 format(7h at t =,e12.4,6h y =,3e14.6)
+c 20 format(' at t =',e12.4,' y =',3e14.6)
c if (istate .lt. 0) go to 80
c 40 tout = tout*10.d0
c write(6,60)iwork(11),iwork(12),iwork(13)
-c 60 format(/12h no. steps =,i4,11h no. f-s =,i4,11h no. j-s =,i4)
+c 60 format(/' no. steps =',i4,' no. f-s =',i4,' no. j-s =',i4)
c stop
c 80 write(6,90)istate
-c 90 format(///22h error halt.. istate =,i3)
+c 90 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1243,17 +1243,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsode-- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsode-- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsode-- above warning has been issued i1 times. ,
+ call xerrwv('lsode-- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1324,7 +1324,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsode-- repeated calls with istate = 1 and tout = t (=r1) ,
+ 1 'lsode-- repeated calls with istate = 1 and tout = t (=r1) ',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1337,39 +1337,39 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsode-- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsode-- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsode-- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsode-- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 580
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsode-- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsode-- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 580
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsode-- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsode-- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 560
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsode-- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsode-- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
c compute imxer if relevant. -------------------------------------------
@@ -1404,108 +1404,108 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsode-- istate (=i1) illegal ,
+ 601 call xerrwv('lsode-- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsode-- itask (=i1) illegal ,
+ 602 call xerrwv('lsode-- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsode-- istate .gt. 1 but lsode not initialized ,
+ 603 call xerrwv('lsode-- istate .gt. 1 but lsode not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsode-- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsode-- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsode-- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsode-- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsode-- itol (=i1) illegal ,
+ 606 call xerrwv('lsode-- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsode-- iopt (=i1) illegal ,
+ 607 call xerrwv('lsode-- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsode-- mf (=i1) illegal ,
+ 608 call xerrwv('lsode-- mf (=i1) illegal ',
1 30, 8, 0, 1, mf, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(50hlsode-- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 609 call xerrwv('lsode-- ml (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 9, 0, 2, ml, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 610 call xerrwv(50hlsode-- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2),
+ 610 call xerrwv('lsode-- mu (=i1) illegal.. .lt.0 or .ge.neq (=i2)',
1 50, 10, 0, 2, mu, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 611 call xerrwv(30hlsode-- maxord (=i1) .lt. 0 ,
+ 611 call xerrwv('lsode-- maxord (=i1) .lt. 0 ',
1 30, 11, 0, 1, maxord, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsode-- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsode-- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsode-- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsode-- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsode-- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsode-- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsode-- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsode-- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsode-- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsode-- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
617 call xerrwv(
- 1 60hlsode-- rwork length needed, lenrw (=i1), exceeds lrw (=i2),
+ 1 'lsode-- rwork length needed, lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
618 call xerrwv(
- 1 60hlsode-- iwork length needed, leniw (=i1), exceeds liw (=i2),
+ 1 'lsode-- iwork length needed, leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsode-- rtol(i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsode-- rtol(i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsode-- atol(i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsode-- atol(i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsode-- ewt(i1) is r1 .le. 0.0 ,
+ call xerrwv('lsode-- ewt(i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsode-- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsode-- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsode-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsode-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsode-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsode-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsode-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsode-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsode-- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsode-- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsode-- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsode-- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
c
700 if (illin .eq. 5) go to 710
illin = illin + 1
istate = -3
return
- 710 call xerrwv(50hlsode-- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsode-- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsode-- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsode-- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsode -----------------------
Modified: trunk/Lib/integrate/odepack/lsodes.f
===================================================================
--- trunk/Lib/integrate/odepack/lsodes.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsodes.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -217,9 +217,9 @@
c call lsodes (fex, neq, y, t, tout, itol, rtol, atol,
c 1 itask, istate, iopt, rwork, lrw, iwork, liw, jex, mf)
c write(6,30)t,iwork(11),rwork(11),(y(i),i=1,neq)
-c 30 format(//7h at t =,e11.3,4x,
-c 1 12h no. steps =,i5,4x,12h last step =,e11.3/
-c 2 13h y array = ,4e14.5/13x,4e14.5/13x,4e14.5)
+c 30 format(//' at t =',e11.3,4x,
+c 1 ' no. steps =',i5,4x,' last step =',e11.3/
+c 2 ' y array = ',4e14.5/13x,4e14.5/13x,4e14.5)
c if (istate .lt. 0) go to 80
c tout = tout*10.0d0
c 40 continue
@@ -232,13 +232,13 @@
c nnz = iwork(19)
c nnzlu = iwork(25) + iwork(26) + neq
c write (6,70) lenrw,leniw,nst,nfe,nje,nlu,nnz,nnzlu
-c 70 format(//22h required rwork size =,i4,15h iwork size =,i4/
-c 1 12h no. steps =,i4,12h no. f-s =,i4,12h no. j-s =,i4,
-c 2 13h no. lu-s =,i4/23h no. of nonzeros in j =,i5,
-c 3 26h no. of nonzeros in lu =,i5)
+c 70 format(//' required rwork size =',i4,' iwork size =',i4/
+c 1 ' no. steps =',i4,' no. f-s =',i4,' no. j-s =',i4,
+c 2 ' no. lu-s =',i4/' no. of nonzeros in j =',i5,
+c 3 ' no. of nonzeros in lu =',i5)
c stop
c 80 write(6,90)istate
-c 90 format(///22h error halt.. istate =,i3)
+c 90 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1646,17 +1646,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsodes-- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsodes-- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsodes-- above warning has been issued i1 times. ,
+ call xerrwv('lsodes-- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1732,7 +1732,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsodes-- repeated calls with istate = 1 and tout = t (=r1) ,
+ 1 'lsodes-- repeated calls with istate = 1 and tout = t (=r1) ',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1745,48 +1745,48 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsodes-- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsodes-- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsodes-- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsodes-- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 580
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsodes-- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsodes-- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 580
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsodes-- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsodes-- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 560
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsodes-- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsodes-- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
go to 560
c kflag = -3. fatal error flag returned by prjs or slss (cdrv). -------
- 550 call xerrwv(50hlsodes-- at t (=r1) and step size h (=r2), a fatal,
+ 550 call xerrwv('lsodes-- at t (=r1) and step size h (=r2), a fatal',
1 50, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h error flag was returned by cdrv (by way of ,
+ call xerrwv(' error flag was returned by cdrv (by way of ',
1 50, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h subroutine prjs or slss),
+ call xerrwv(' subroutine prjs or slss)',
1 30, 207, 0, 0, 0, 0, 2, tn, h)
istate = -7
go to 580
@@ -1827,161 +1827,161 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsodes-- istate (=i1) illegal ,
+ 601 call xerrwv('lsodes-- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsodes-- itask (=i1) illegal ,
+ 602 call xerrwv('lsodes-- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsodes-- istate .gt. 1 but lsodes not initialized ,
+ 603 call xerrwv('lsodes-- istate .gt. 1 but lsodes not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsodes-- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsodes-- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsodes-- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsodes-- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsodes-- itol (=i1) illegal ,
+ 606 call xerrwv('lsodes-- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsodes-- iopt (=i1) illegal ,
+ 607 call xerrwv('lsodes-- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsodes-- mf (=i1) illegal ,
+ 608 call xerrwv('lsodes-- mf (=i1) illegal ',
1 30, 8, 0, 1, mf, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(30hlsodes-- seth (=r1) .lt. 0.0 ,
+ 609 call xerrwv('lsodes-- seth (=r1) .lt. 0.0 ',
1 30, 9, 0, 0, 0, 0, 1, seth, 0.0d0)
go to 700
- 611 call xerrwv(30hlsodes-- maxord (=i1) .lt. 0 ,
+ 611 call xerrwv('lsodes-- maxord (=i1) .lt. 0 ',
1 30, 11, 0, 1, maxord, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsodes-- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsodes-- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsodes-- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsodes-- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsodes-- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsodes-- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsodes-- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsodes-- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsodes-- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsodes-- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
- 617 call xerrwv(50hlsodes-- rwork length is insufficient to proceed. ,
+ 617 call xerrwv('lsodes-- rwork length is insufficient to proceed. ',
1 50, 17, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. lenrw (=i1), exceeds lrw (=i2),
+ 1 ' length needed is .ge. lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
- 618 call xerrwv(50hlsodes-- iwork length is insufficient to proceed. ,
+ 618 call xerrwv('lsodes-- iwork length is insufficient to proceed. ',
1 50, 18, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. leniw (=i1), exceeds liw (=i2),
+ 1 ' length needed is .ge. leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsodes-- rtol(i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsodes-- rtol(i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsodes-- atol(i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsodes-- atol(i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsodes-- ewt(i1) is r1 .le. 0.0 ,
+ call xerrwv('lsodes-- ewt(i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsodes-- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsodes-- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsodes-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsodes-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsodes-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsodes-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsodes-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsodes-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsodes-- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsodes-- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsodes-- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsodes-- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
go to 700
628 call xerrwv(
- 1 60hlsodes-- rwork length insufficient (for subroutine prep). ,
+ 1 'lsodes-- rwork length insufficient (for subroutine prep). ',
1 60, 28, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. lenrw (=i1), exceeds lrw (=i2),
+ 1 ' length needed is .ge. lenrw (=i1), exceeds lrw (=i2)',
1 60, 28, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
629 call xerrwv(
- 1 60hlsodes-- rwork length insufficient (for subroutine jgroup). ,
+ 1 'lsodes-- rwork length insufficient (for subroutine jgroup). ',
1 60, 29, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. lenrw (=i1), exceeds lrw (=i2),
+ 1 ' length needed is .ge. lenrw (=i1), exceeds lrw (=i2)',
1 60, 29, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
630 call xerrwv(
- 1 60hlsodes-- rwork length insufficient (for subroutine odrv). ,
+ 1 'lsodes-- rwork length insufficient (for subroutine odrv). ',
1 60, 30, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. lenrw (=i1), exceeds lrw (=i2),
+ 1 ' length needed is .ge. lenrw (=i1), exceeds lrw (=i2)',
1 60, 30, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
631 call xerrwv(
- 1 60hlsodes-- error from odrv in yale sparse matrix package ,
+ 1 'lsodes-- error from odrv in yale sparse matrix package ',
1 60, 31, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
imul = (iys - 1)/n
irem = iys - imul*n
call xerrwv(
- 1 60h at t (=r1), odrv returned error flag = i1*neq + i2. ,
+ 1 ' at t (=r1), odrv returned error flag = i1*neq + i2. ',
1 60, 31, 0, 2, imul, irem, 1, tn, 0.0d0)
go to 700
632 call xerrwv(
- 1 60hlsodes-- rwork length insufficient (for subroutine cdrv). ,
+ 1 'lsodes-- rwork length insufficient (for subroutine cdrv). ',
1 60, 32, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h length needed is .ge. lenrw (=i1), exceeds lrw (=i2),
+ 1 ' length needed is .ge. lenrw (=i1), exceeds lrw (=i2)',
1 60, 32, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
633 call xerrwv(
- 1 60hlsodes-- error from cdrv in yale sparse matrix package ,
+ 1 'lsodes-- error from cdrv in yale sparse matrix package ',
1 60, 33, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
imul = (iys - 1)/n
irem = iys - imul*n
call xerrwv(
- 1 60h at t (=r1), cdrv returned error flag = i1*neq + i2. ,
+ 1 ' at t (=r1), cdrv returned error flag = i1*neq + i2. ',
1 60, 33, 0, 2, imul, irem, 1, tn, 0.0d0)
if (imul .eq. 2) call xerrwv(
- 1 60h duplicate entry in sparsity structure descriptors ,
+ 1 ' duplicate entry in sparsity structure descriptors ',
1 60, 33, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
if (imul .eq. 3 .or. imul .eq. 6) call xerrwv(
- 1 60h insufficient storage for nsfc (called by cdrv) ,
+ 1 ' insufficient storage for nsfc (called by cdrv) ',
1 60, 33, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
700 if (illin .eq. 5) go to 710
illin = illin + 1
istate = -3
return
- 710 call xerrwv(50hlsodes-- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsodes-- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsodes-- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsodes-- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsodes ----------------------
Modified: trunk/Lib/integrate/odepack/lsodi.f
===================================================================
--- trunk/Lib/integrate/odepack/lsodi.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsodi.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -247,15 +247,15 @@
c call lsodi(resid, aplusp, dgbydy, neq, y, ydoti, t, tout, itol,
c 1 rtol, atol, itask, istate, iopt, rwork, lrw, iwork, liw, mf)
c write (6,20) t, y(1), y(2), y(3)
-c 20 format(7h at t =,e12.4,6h y =,3e14.6)
+c 20 format(' at t =',e12.4,' y =',3e14.6)
c if (istate .lt. 0 ) go to 80
c 40 tout = tout*10.d0
c write (6,60) iwork(11), iwork(12), iwork(13)
-c 60 format(/12h no. steps =,i4,11h no. r-s =,i4,
-c 1 11h no. j-s =,i4)
+c 60 format(/' no. steps =',i4,' no. r-s =',i4,
+c 1 ' no. j-s =',i4)
c stop
c 80 write (6,90) istate
-c 90 format(///22h error halt.. istate =,i3)
+c 90 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1446,17 +1446,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsodi-- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsodi-- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsodi-- above warning has been issued i1 times. ,
+ call xerrwv('lsodi-- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1533,7 +1533,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsodi-- repeated calls with istate= 0 or 1 and tout= t(=r1),
+ 1 'lsodi-- repeated calls with istate= 0 or 1 and tout= t(=r1)',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1546,64 +1546,64 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsodi-- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsodi-- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsodi-- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsodi-- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 590
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsodi-- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsodi-- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 590
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsodi-- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsodi-- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 570
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsodi-- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsodi-- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
go to 570
c ires = 3 returned by res, despite retries by stodi. ------------------
- 550 call xerrwv(50hlsodi-- at t (=r1) residual routine returned ,
+ 550 call xerrwv('lsodi-- at t (=r1) residual routine returned ',
1 50, 206, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(40h error ires = 3 repeatedly ,
+ call xerrwv(' error ires = 3 repeatedly ',
1 40, 206, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 590
c ainvg failed because a-matrix was singular. --------------------------
560 ier = -ier
call xerrwv(
- 1 60hlsodi-- attempt to initialize dy/dt failed.. matrix a is ,
+ 1 'lsodi-- attempt to initialize dy/dt failed.. matrix a is ',
1 60, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h singular. sgefa or sgbfa returned info=(i1),
+ call xerrwv(' singular. sgefa or sgbfa returned info=(i1)',
2 50, 207, 0, 1, ier, 0, 0, 0.0d0, 0.0d0)
istate = -8
return
c ainvg failed because res set ires to 2 or 3. -------------------------
- 565 call xerrwv(50hlsodi-- attempt to initialize dy/dt failed ,
+ 565 call xerrwv('lsodi-- attempt to initialize dy/dt failed ',
1 50, 208, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h because residual routine set its error flag ,
+ call xerrwv(' because residual routine set its error flag ',
1 50, 208, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(20h to ires = (i1),
+ call xerrwv(' to ires = (i1)',
1 20, 208, 0, 1, ier, 0, 0, 0.0d0, 0.0d0)
istate = -8
return
@@ -1626,9 +1626,9 @@
call res ( neq, tn, y, rwork(lsavr), ydoti, ires )
nre = nre + 1
if (ires .le. 1) go to 595
- call xerrwv(50hlsodi-- residual routine set its flag ires ,
+ call xerrwv('lsodi-- residual routine set its flag ires ',
1 50, 210, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h to (i1) when called for final output. ,
+ call xerrwv(' to (i1) when called for final output. ',
1 50, 210, 0, 1, ires, 0, 0, 0.0d0, 0.0d0)
go to 595
c set y vector, t, illin, and optional outputs. ------------------------
@@ -1653,108 +1653,108 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsodi-- istate (=i1) illegal ,
+ 601 call xerrwv('lsodi-- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsodi-- itask (=i1) illegal ,
+ 602 call xerrwv('lsodi-- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsodi-- istate .gt. 1 but lsodi not initialized ,
+ 603 call xerrwv('lsodi-- istate .gt. 1 but lsodi not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsodi-- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsodi-- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsodi-- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsodi-- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsodi-- itol (=i1) illegal ,
+ 606 call xerrwv('lsodi-- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsodi-- iopt (=i1) illegal ,
+ 607 call xerrwv('lsodi-- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsodi-- mf (=i1) illegal ,
+ 608 call xerrwv('lsodi-- mf (=i1) illegal ',
1 30, 8, 0, 1, mf, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(50hlsodi-- ml(=i1) illegal.. .lt. 0 or .ge. neq(=i2),
+ 609 call xerrwv('lsodi-- ml(=i1) illegal.. .lt. 0 or .ge. neq(=i2)',
1 50, 9, 0, 2, ml, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 610 call xerrwv(50hlsodi-- mu(=i1) illegal.. .lt. 0 or .ge. neq(=i2),
+ 610 call xerrwv('lsodi-- mu(=i1) illegal.. .lt. 0 or .ge. neq(=i2)',
1 50, 10, 0, 2, mu, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 611 call xerrwv(30hlsodi-- maxord (=i1) .lt. 0 ,
+ 611 call xerrwv('lsodi-- maxord (=i1) .lt. 0 ',
1 30, 11, 0, 1, maxord, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsodi-- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsodi-- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsodi-- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsodi-- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsodi-- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsodi-- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsodi-- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsodi-- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsodi-- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsodi-- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
617 call xerrwv(
- 1 60hlsodi-- rwork length needed, lenrw (=i1), exceeds lrw (=i2),
+ 1 'lsodi-- rwork length needed, lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
618 call xerrwv(
- 1 60hlsodi-- iwork length needed, leniw (=i1), exceeds liw (=i2),
+ 1 'lsodi-- iwork length needed, leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsodi-- rtol(=i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsodi-- rtol(=i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsodi-- atol(=i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsodi-- atol(=i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsodi-- ewt(=i1) is r1 .le. 0.0 ,
+ call xerrwv('lsodi-- ewt(=i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsodi-- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsodi-- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsodi-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsodi-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsodi-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsodi-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsodi-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsodi-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsodi-- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsodi-- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsodi-- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsodi-- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
c
700 if (illin .eq. 5) go to 710
illin = illin + 1
istate = -3
return
- 710 call xerrwv(50hlsodi-- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsodi-- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsodi-- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsodi-- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsodi -----------------------
Modified: trunk/Lib/integrate/odepack/lsoibt.f
===================================================================
--- trunk/Lib/integrate/odepack/lsoibt.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/lsoibt.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -280,16 +280,16 @@
c call lsoibt (resid, addabt, jacbt, neq, y, ydoti, t, tout,
c 1 itol,rtol,atol, itask, istate, iopt, rwork,lrw,iwork,liw, mf)
c write (6,30) t, iwork(11), iwork(12), iwork(13)
-c 30 format(7h at t =,f5.2,14h no. steps =,i4,11h no. r-s =,i4,
-c 1 11h no. j-s =,i3)
+c 30 format(' at t =',f5.2,' no. steps =',i4,' no. r-s =',i4,
+c 1 ' no. j-s =',i3)
c if (istate .ne. 2) go to 90
c tout = tout + 0.1d0
c 40 continue
c write(6,50) (y(i),i=1,neq)
-c 50 format(/24h final solution values../9(5e12.4/))
+c 50 format(/' final solution values..'/9(5e12.4/))
c stop
c 90 write(6,95) istate
-c 95 format(///22h error halt.. istate =,i3)
+c 95 format(///' error halt.. istate =',i3)
c stop
c end
c
@@ -1500,17 +1500,17 @@
280 if ((tn + h) .ne. tn) go to 290
nhnil = nhnil + 1
if (nhnil .gt. mxhnil) go to 290
- call xerrwv(50hlsoibt-- warning..internal t (=r1) and h (=r2) are,
+ call xerrwv('lsoibt-- warning..internal t (=r1) and h (=r2) are',
1 50, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h such that in the machine, t + h = t on the next step ,
+ 1 ' such that in the machine, t + h = t on the next step ',
1 60, 101, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h (h = step size). solver will continue anyway,
+ call xerrwv(' (h = step size). solver will continue anyway',
1 50, 101, 0, 0, 0, 0, 2, tn, h)
if (nhnil .lt. mxhnil) go to 290
- call xerrwv(50hlsoibt-- above warning has been issued i1 times. ,
+ call xerrwv('lsoibt-- above warning has been issued i1 times. ',
1 50, 102, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h it will not be issued again for this problem,
+ call xerrwv(' it will not be issued again for this problem',
1 50, 102, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
290 continue
c-----------------------------------------------------------------------
@@ -1587,7 +1587,7 @@
430 ntrep = ntrep + 1
if (ntrep .lt. 5) return
call xerrwv(
- 1 60hlsoibt-- repeated calls with istate= 0 or 1 and tout= t(=r1),
+ 1 'lsoibt-- repeated calls with istate= 0 or 1 and tout= t(=r1)',
1 60, 301, 0, 0, 0, 0, 1, t, 0.0d0)
go to 800
c-----------------------------------------------------------------------
@@ -1600,64 +1600,64 @@
c the work arrays before returning.
c-----------------------------------------------------------------------
c the maximum number of steps was taken before reaching tout. ----------
- 500 call xerrwv(50hlsoibt-- at current t (=r1), mxstep (=i1) steps ,
+ 500 call xerrwv('lsoibt-- at current t (=r1), mxstep (=i1) steps ',
1 50, 201, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h taken on this call before reaching tout ,
+ call xerrwv(' taken on this call before reaching tout ',
1 50, 201, 0, 1, mxstep, 0, 1, tn, 0.0d0)
istate = -1
go to 580
c ewt(i) .le. 0.0 for some i (not at start of problem). ----------------
510 ewti = rwork(lewt+i-1)
- call xerrwv(50hlsoibt-- at t (=r1), ewt(i1) has become r2 .le. 0.,
+ call xerrwv('lsoibt-- at t (=r1), ewt(i1) has become r2 .le. 0.',
1 50, 202, 0, 1, i, 0, 2, tn, ewti)
istate = -6
go to 590
c too much accuracy requested for machine precision. -------------------
- 520 call xerrwv(50hlsoibt-- at t (=r1), too much accuracy requested ,
+ 520 call xerrwv('lsoibt-- at t (=r1), too much accuracy requested ',
1 50, 203, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h for precision of machine.. see tolsf (=r2) ,
+ call xerrwv(' for precision of machine.. see tolsf (=r2) ',
1 50, 203, 0, 0, 0, 0, 2, tn, tolsf)
rwork(14) = tolsf
istate = -2
go to 590
c kflag = -1. error test failed repeatedly or with abs(h) = hmin. -----
- 530 call xerrwv(50hlsoibt-- at t(=r1) and step size h(=r2), the error,
+ 530 call xerrwv('lsoibt-- at t(=r1) and step size h(=r2), the error',
1 50, 204, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h test failed repeatedly or with abs(h) = hmin,
+ call xerrwv(' test failed repeatedly or with abs(h) = hmin',
1 50, 204, 0, 0, 0, 0, 2, tn, h)
istate = -4
go to 570
c kflag = -2. convergence failed repeatedly or with abs(h) = hmin. ----
- 540 call xerrwv(50hlsoibt-- at t (=r1) and step size h (=r2), the ,
+ 540 call xerrwv('lsoibt-- at t (=r1) and step size h (=r2), the ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h corrector convergence failed repeatedly ,
+ call xerrwv(' corrector convergence failed repeatedly ',
1 50, 205, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(30h or with abs(h) = hmin ,
+ call xerrwv(' or with abs(h) = hmin ',
1 30, 205, 0, 0, 0, 0, 2, tn, h)
istate = -5
go to 570
c ires = 3 returned by res, despite retries by stodi. ------------------
- 550 call xerrwv(50hlsoibt-- at t (=r1) residual routine returned ,
+ 550 call xerrwv('lsoibt-- at t (=r1) residual routine returned ',
1 50, 206, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(40h error ires = 3 repeatedly ,
+ call xerrwv(' error ires = 3 repeatedly ',
1 40, 206, 0, 0, 0, 0, 1, tn, 0.0d0)
istate = -7
go to 590
c aigbt failed because a diagonal block of a-matrix was singular. ------
560 ier = -ier
call xerrwv(
- 1 60hlsoibt-- attempt to initialize dy/dt failed.. matrix a has a,
+ 1 'lsoibt-- attempt to initialize dy/dt failed.. matrix a has a',
1 60, 207, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h singular diagonal block, block no. = (i1) ,
+ call xerrwv(' singular diagonal block, block no. = (i1) ',
2 50, 207, 0, 1, ier, 0, 0, 0.0d0, 0.0d0)
istate = -8
return
c aigbt failed because res set ires to 2 or 3. -------------------------
- 565 call xerrwv(50hlsoibt-- attempt to initialize dy/dt failed ,
+ 565 call xerrwv('lsoibt-- attempt to initialize dy/dt failed ',
1 50, 208, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h because residual routine set its error flag ,
+ call xerrwv(' because residual routine set its error flag ',
1 50, 208, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(20h to ires = (i1),
+ call xerrwv(' to ires = (i1)',
1 20, 208, 0, 1, ier, 0, 0, 0.0d0, 0.0d0)
istate = -8
return
@@ -1680,9 +1680,9 @@
call res ( neq, tn, y, rwork(lsavr), ydoti, ires )
nre = nre + 1
if ( ires .le. 1 ) go to 595
- call xerrwv(50hlsoibt-- residual routine set its flag ires ,
+ call xerrwv('lsoibt-- residual routine set its flag ires ',
1 50, 210, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
- call xerrwv(50h to (i1) when called for final output. ,
+ call xerrwv(' to (i1) when called for final output. ',
1 50, 210, 0, 1, ires, 0, 0, 0.0d0, 0.0d0)
go to 595
c set y vector, t, illin, and optional outputs. ------------------------
@@ -1707,108 +1707,108 @@
c 5 consecutive such returns just before this call to the solver,
c the run is halted.
c-----------------------------------------------------------------------
- 601 call xerrwv(30hlsoibt-- istate (=i1) illegal ,
+ 601 call xerrwv('lsoibt-- istate (=i1) illegal ',
1 30, 1, 0, 1, istate, 0, 0, 0.0d0, 0.0d0)
go to 700
- 602 call xerrwv(30hlsoibt-- itask (=i1) illegal ,
+ 602 call xerrwv('lsoibt-- itask (=i1) illegal ',
1 30, 2, 0, 1, itask, 0, 0, 0.0d0, 0.0d0)
go to 700
- 603 call xerrwv(50hlsoibt-- istate .gt. 1 but lsoibt not initialized ,
+ 603 call xerrwv('lsoibt-- istate .gt. 1 but lsoibt not initialized ',
1 50, 3, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
go to 700
- 604 call xerrwv(30hlsoibt-- neq (=i1) .lt. 1 ,
+ 604 call xerrwv('lsoibt-- neq (=i1) .lt. 1 ',
1 30, 4, 0, 1, neq(1), 0, 0, 0.0d0, 0.0d0)
go to 700
- 605 call xerrwv(50hlsoibt-- istate = 3 and neq increased (i1 to i2) ,
+ 605 call xerrwv('lsoibt-- istate = 3 and neq increased (i1 to i2) ',
1 50, 5, 0, 2, n, neq(1), 0, 0.0d0, 0.0d0)
go to 700
- 606 call xerrwv(30hlsoibt-- itol (=i1) illegal ,
+ 606 call xerrwv('lsoibt-- itol (=i1) illegal ',
1 30, 6, 0, 1, itol, 0, 0, 0.0d0, 0.0d0)
go to 700
- 607 call xerrwv(30hlsoibt-- iopt (=i1) illegal ,
+ 607 call xerrwv('lsoibt-- iopt (=i1) illegal ',
1 30, 7, 0, 1, iopt, 0, 0, 0.0d0, 0.0d0)
go to 700
- 608 call xerrwv(30hlsoibt-- mf (=i1) illegal ,
+ 608 call xerrwv('lsoibt-- mf (=i1) illegal ',
1 30, 8, 0, 1, mf, 0, 0, 0.0d0, 0.0d0)
go to 700
- 609 call xerrwv(40hlsoibt-- mb (=i1) or nb (=i2) illegal ,
+ 609 call xerrwv('lsoibt-- mb (=i1) or nb (=i2) illegal ',
1 50, 9, 0, 2, mb, nb, 0, 0.0d0, 0.0d0)
go to 700
- 610 call xerrwv(40hlsoibt-- nb(=i1) illegal.. .lt. 4 ,
+ 610 call xerrwv('lsoibt-- nb(=i1) illegal.. .lt. 4 ',
1 50, 10, 0, 1, nb, 0, 0, 0.0d0, 0.0d0)
go to 700
- 611 call xerrwv(30hlsoibt-- maxord (=i1) .lt. 0 ,
+ 611 call xerrwv('lsoibt-- maxord (=i1) .lt. 0 ',
1 30, 11, 0, 1, maxord, 0, 0, 0.0d0, 0.0d0)
go to 700
- 612 call xerrwv(30hlsoibt-- mxstep (=i1) .lt. 0 ,
+ 612 call xerrwv('lsoibt-- mxstep (=i1) .lt. 0 ',
1 30, 12, 0, 1, mxstep, 0, 0, 0.0d0, 0.0d0)
go to 700
- 613 call xerrwv(30hlsoibt-- mxhnil (=i1) .lt. 0 ,
+ 613 call xerrwv('lsoibt-- mxhnil (=i1) .lt. 0 ',
1 30, 13, 0, 1, mxhnil, 0, 0, 0.0d0, 0.0d0)
go to 700
- 614 call xerrwv(40hlsoibt-- tout (=r1) behind t (=r2) ,
+ 614 call xerrwv('lsoibt-- tout (=r1) behind t (=r2) ',
1 40, 14, 0, 0, 0, 0, 2, tout, t)
- call xerrwv(50h integration direction is given by h0 (=r1) ,
+ call xerrwv(' integration direction is given by h0 (=r1) ',
1 50, 14, 0, 0, 0, 0, 1, h0, 0.0d0)
go to 700
- 615 call xerrwv(30hlsoibt-- hmax (=r1) .lt. 0.0 ,
+ 615 call xerrwv('lsoibt-- hmax (=r1) .lt. 0.0 ',
1 30, 15, 0, 0, 0, 0, 1, hmax, 0.0d0)
go to 700
- 616 call xerrwv(30hlsoibt-- hmin (=r1) .lt. 0.0 ,
+ 616 call xerrwv('lsoibt-- hmin (=r1) .lt. 0.0 ',
1 30, 16, 0, 0, 0, 0, 1, hmin, 0.0d0)
go to 700
617 call xerrwv(
- 1 60hlsoibt-- rwork length needed, lenrw (=i1), exceeds lrw (=i2),
+ 1 'lsoibt-- rwork length needed, lenrw (=i1), exceeds lrw (=i2)',
1 60, 17, 0, 2, lenrw, lrw, 0, 0.0d0, 0.0d0)
go to 700
618 call xerrwv(
- 1 60hlsoibt-- iwork length needed, leniw (=i1), exceeds liw (=i2),
+ 1 'lsoibt-- iwork length needed, leniw (=i1), exceeds liw (=i2)',
1 60, 18, 0, 2, leniw, liw, 0, 0.0d0, 0.0d0)
go to 700
- 619 call xerrwv(40hlsoibt-- rtol(=i1) is r1 .lt. 0.0 ,
+ 619 call xerrwv('lsoibt-- rtol(=i1) is r1 .lt. 0.0 ',
1 40, 19, 0, 1, i, 0, 1, rtoli, 0.0d0)
go to 700
- 620 call xerrwv(40hlsoibt-- atol(=i1) is r1 .lt. 0.0 ,
+ 620 call xerrwv('lsoibt-- atol(=i1) is r1 .lt. 0.0 ',
1 40, 20, 0, 1, i, 0, 1, atoli, 0.0d0)
go to 700
621 ewti = rwork(lewt+i-1)
- call xerrwv(40hlsoibt-- ewt(=i1) is r1 .le. 0.0 ,
+ call xerrwv('lsoibt-- ewt(=i1) is r1 .le. 0.0 ',
1 40, 21, 0, 1, i, 0, 1, ewti, 0.0d0)
go to 700
622 call xerrwv(
- 1 60hlsoibt-- tout (=r1) too close to t(=r2) to start integration,
+ 1 'lsoibt-- tout (=r1) too close to t(=r2) to start integration',
1 60, 22, 0, 0, 0, 0, 2, tout, t)
go to 700
623 call xerrwv(
- 1 60hlsoibt-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ,
+ 1 'lsoibt-- itask = i1 and tout (=r1) behind tcur - hu (= r2) ',
1 60, 23, 0, 1, itask, 0, 2, tout, tp)
go to 700
624 call xerrwv(
- 1 60hlsoibt-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ,
+ 1 'lsoibt-- itask = 4 or 5 and tcrit (=r1) behind tcur (=r2) ',
1 60, 24, 0, 0, 0, 0, 2, tcrit, tn)
go to 700
625 call xerrwv(
- 1 60hlsoibt-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ,
+ 1 'lsoibt-- itask = 4 or 5 and tcrit (=r1) behind tout (=r2) ',
1 60, 25, 0, 0, 0, 0, 2, tcrit, tout)
go to 700
- 626 call xerrwv(50hlsoibt-- at start of problem, too much accuracy ,
+ 626 call xerrwv('lsoibt-- at start of problem, too much accuracy ',
1 50, 26, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
call xerrwv(
- 1 60h requested for precision of machine.. see tolsf (=r1) ,
+ 1 ' requested for precision of machine.. see tolsf (=r1) ',
1 60, 26, 0, 0, 0, 0, 1, tolsf, 0.0d0)
rwork(14) = tolsf
go to 700
- 627 call xerrwv(50hlsoibt-- trouble from intdy. itask = i1, tout = r1,
+ 627 call xerrwv('lsoibt-- trouble from intdy. itask = i1, tout = r1',
1 50, 27, 0, 1, itask, 0, 1, tout, 0.0d0)
c
700 if (illin .eq. 5) go to 710
illin = illin + 1
istate = -3
return
- 710 call xerrwv(50hlsoibt-- repeated occurrences of illegal input ,
+ 710 call xerrwv('lsoibt-- repeated occurrences of illegal input ',
1 50, 302, 0, 0, 0, 0, 0, 0.0d0, 0.0d0)
c
- 800 call xerrwv(50hlsoibt-- run aborted.. apparent infinite loop ,
+ 800 call xerrwv('lsoibt-- run aborted.. apparent infinite loop ',
1 50, 303, 2, 0, 0, 0, 0, 0.0d0, 0.0d0)
return
c----------------------- end of subroutine lsoibt ----------------------
Modified: trunk/Lib/integrate/odepack/xerrwv.f
===================================================================
--- trunk/Lib/integrate/odepack/xerrwv.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/odepack/xerrwv.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -100,13 +100,13 @@
c 10 format(1x,30a2)
c-----------------------------------------------------------------------
if (ni .eq. 1) write (lun, 20) i1
- 20 format(6x,23hin above message, i1 =,i10)
+ 20 format(6x,'in above message, i1 =',i10)
if (ni .eq. 2) write (lun, 30) i1,i2
- 30 format(6x,23hin above message, i1 =,i10,3x,4hi2 =,i10)
+ 30 format(6x,'in above message, i1 =',i10,3x,'i2 =',i10)
if (nr .eq. 1) write (lun, 40) r1
- 40 format(6x,23hin above message, r1 =,d21.13)
+ 40 format(6x,'in above message, r1 =',d21.13)
if (nr .eq. 2) write (lun, 50) r1,r2
- 50 format(6x,15hin above, r1 =,d21.13,3x,4hr2 =,d21.13)
+ 50 format(6x,'in above, r1 =',d21.13,3x,'r2 =',d21.13)
c abort the run if level = 2. ------------------------------------------
100 if (level .ne. 2) return
stop
Modified: trunk/Lib/integrate/quadpack/dqag.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqag.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqag.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -177,6 +177,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqag ,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqag' ,26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqagi.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqagi.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqagi.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -186,6 +186,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqagi,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqagi',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqagp.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqagp.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqagp.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -220,6 +220,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqagp,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqagp',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqags.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqags.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqags.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -183,6 +183,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqags,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqags',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqawc.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqawc.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqawc.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -173,6 +173,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqawc,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqawc',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqawf.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqawf.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqawf.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -226,6 +226,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqawf,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqawf',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqawo.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqawo.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqawo.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -220,6 +220,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 0
- if(ier.ne.0) call xerror(26habnormal return from dqawo,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqawo',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqaws.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqaws.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqaws.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -195,6 +195,6 @@
c
lvl = 0
10 if(ier.eq.6) lvl = 1
- if(ier.ne.0) call xerror(26habnormal return from dqaws,26,ier,lvl)
+ if(ier.ne.0) call xerror('abnormal return from dqaws',26,ier,lvl)
return
end
Modified: trunk/Lib/integrate/quadpack/dqng.f
===================================================================
--- trunk/Lib/integrate/quadpack/dqng.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/integrate/quadpack/dqng.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -369,6 +369,6 @@
c ***jump out of do-loop
if (ier.eq.0) go to 999
70 continue
- 80 call xerror(26habnormal return from dqng ,26,ier,0)
+ 80 call xerror('abnormal return from dqng ',26,ier,0)
999 return
end
Modified: trunk/Lib/interpolate/fitpack/fppola.f
===================================================================
--- trunk/Lib/interpolate/fitpack/fppola.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/interpolate/fitpack/fppola.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -51,7 +51,9 @@
c calculation of acc, the absolute tolerance for the root of f(p)=s.
acc = tol*s
if(iopt1.eq.0) go to 10
- if(s.lt.sup) if(nv-nvmin) 70,90,90
+ if(s.lt.sup) then
+ if(nv-nvmin) 70,90,90
+ endif
c if iopt1 = 0 we begin by computing the weighted least-squares
c polymomial of the form
c s(u,v) = f(1)*(1-u**3)+f(2)*u**3+f(3)*(u**2-u**3)+f(4)*(u-u**3)
@@ -416,9 +418,13 @@
c the spline.
430 call fprppo(nu,nv,iopt2,iopt3,cosi,ratio,c,ff,ncoff)
c test whether the least-squares spline is an acceptable solution.
- if(iopt1.lt.0) if(fp) 970,970,980
+ if(iopt1.lt.0) then
+ if(fp) 970,970,980
+ endif
fpms = fp-s
- if(abs(fpms).le.acc) if(fp) 970,970,980
+ if(abs(fpms).le.acc) then
+ if(fp) 970,970,980
+ endif
c if f(p=inf) < s, accept the choice of knots.
if(fpms.lt.0.) go to 580
c test whether we cannot further increase the number of knots
@@ -634,7 +640,9 @@
do 710 irot=jrot,ncof
piv = h(1)
i2 = min0(iband1,ncof-irot)
- if(piv.eq.0.) if(i2) 720,720,690
+ if(piv.eq.0.) then
+ if(i2) 720,720,690
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),co,si)
c apply that givens transformation to the right hand side.
@@ -697,7 +705,9 @@
do 800 irot=jrot,ncof
piv = h(1)
i2 = min0(iband3,ncof-irot)
- if(piv.eq.0.) if(i2) 810,810,780
+ if(piv.eq.0.) then
+ if(i2) 810,810,780
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),co,si)
c apply that givens transformation to the right hand side.
Modified: trunk/Lib/interpolate/fitpack/fpsphe.f
===================================================================
--- trunk/Lib/interpolate/fitpack/fpsphe.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/interpolate/fitpack/fpsphe.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -44,7 +44,9 @@
c calculation of acc, the absolute tolerance for the root of f(p)=s.
acc = tol*s
if(iopt.eq.0) go to 10
- if(s.lt.sup) if(np-11) 60,70,70
+ if(s.lt.sup) then
+ if(np-11) 60,70,70
+ endif
c if iopt=0 we begin by computing the weighted least-squares polynomial
c of the form
c s(teta,phi) = c1*f1(teta) + cn*fn(teta)
@@ -366,9 +368,13 @@
c the spherical spline.
390 call fprpsp(nt,np,coco,cosi,c,ff,ncoff)
c test whether the least-squares spline is an acceptable solution.
- if(iopt.lt.0) if(fp) 970,970,980
+ if(iopt.lt.0) then
+ if(fp) 970,970,980
+ endif
fpms = fp-s
- if(abs(fpms).le.acc) if(fp) 970,970,980
+ if(abs(fpms).le.acc) then
+ if(fp) 970,970,980
+ endif
c if f(p=inf) < s, accept the choice of knots.
if(fpms.lt.0.) go to 580
c test whether we cannot further increase the number of knots.
@@ -567,7 +573,9 @@
do 710 irot=jrot,ncof
piv = h(1)
i2 = min0(iband1,ncof-irot)
- if(piv.eq.0.) if(i2) 720,720,690
+ if(piv.eq.0.) then
+ if(i2) 720,720,690
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),co,si)
c apply that givens transformation to the right hand side.
@@ -622,7 +630,9 @@
do 800 irot=jrot,ncof
piv = h(1)
i2 = min0(iband3,ncof-irot)
- if(piv.eq.0.) if(i2) 810,810,780
+ if(piv.eq.0.) then
+ if(i2) 810,810,780
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),co,si)
c apply that givens transformation to the right hand side.
Modified: trunk/Lib/interpolate/fitpack/fpsurf.f
===================================================================
--- trunk/Lib/interpolate/fitpack/fpsurf.f 2006-08-12 23:04:32 UTC (rev 2158)
+++ trunk/Lib/interpolate/fitpack/fpsurf.f 2006-08-14 01:26:54 UTC (rev 2159)
@@ -286,7 +286,9 @@
c test whether the least-squares spline is an acceptable solution.
if(iopt.lt.0) go to 820
fpms = fp-s
- if(abs(fpms).le.acc) if(fp) 815,815,820
+ if(abs(fpms).le.acc) then
+ if(fp) 815,815,820
+ endif
c test whether we can accept the choice of knots.
if(fpms.lt.0.) go to 430
c test whether we cannot further increase the number of knots.
@@ -464,7 +466,9 @@
do 540 irot=jrot,ncof
piv = h(1)
i2 = min0(iband1,ncof-irot)
- if(piv.eq.0.) if(i2) 550,550,520
+ if(piv.eq.0.) then
+ if(i2) 550,550,520
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),cos,sin)
c apply that givens transformation to the right hand side.
@@ -504,7 +508,9 @@
do 620 irot=jrot,ncof
piv = h(1)
i2 = min0(iband3,ncof-irot)
- if(piv.eq.0.) if(i2) 630,630,600
+ if(piv.eq.0.) then
+ if(i2) 630,630,600
+ endif
c calculate the parameters of the givens transformation.
call fpgivs(piv,q(irot,1),cos,sin)
c apply that givens transformation to the right hand side.
More information about the Scipy-svn
mailing list