From f72152f73f746d4c92d04f0bd0b5b3381c57f959 Mon Sep 17 00:00:00 2001 From: Bruno JOFRET Date: Wed, 24 Sep 2014 10:08:08 +0200 Subject: [PATCH] Common name lost while going through stack.h Change-Id: I67fa252f41366b0ab7e600553ee46f983fe8d888 --- .../differential_equations/src/fortran/ddassl.f | 30 +++++------ .../tests/nonreg_tests/bug_13512.dia.ref | 52 -------------------- 2 files changed, 15 insertions(+), 67 deletions(-) diff --git a/scilab/modules/differential_equations/src/fortran/ddassl.f b/scilab/modules/differential_equations/src/fortran/ddassl.f index decbb9d..1d8395d 100644 --- a/scilab/modules/differential_equations/src/fortran/ddassl.f +++ b/scilab/modules/differential_equations/src/fortran/ddassl.f @@ -116,10 +116,10 @@ C C CORRECTOR LOOP. 300 IWM(LNRE)=IWM(LNRE)+1 IRES=0 - iero = 0 + ierror = 0 C CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return C IERROR indicates if RES had the right prototype if(IERROR.ne.0) then IDID=-12 @@ -135,7 +135,7 @@ C EVALUATE THE ITERATION MATRIX CALL DDAJAC(NEQ,X,Y,YPRIME,DELTA,CJ,H, * IER,WT,E,WM,IWM,RES,IRES, * UROUND,JAC,RPAR,IPAR,NTEMP) - if(iero.ne.0) return + if(ierror.ne.0) return C S=1000000.D0 IF (IRES.LT.0) GO TO 430 @@ -355,7 +355,7 @@ C DENSE USER-SUPPLIED MATRIX DO 110 I=1,LENPD 110 WM(NPDM1+I)=0.0D0 CALL JAC(X,Y,YPRIME,WM(NPD),CJ,RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return GO TO 230 C C @@ -372,7 +372,7 @@ C DENSE FINITE-DIFFERENCE-GENERATED MATRIX Y(I)=Y(I)+DEL YPRIME(I)=YPRIME(I)+CJ*DEL CALL RES(X,Y,YPRIME,E,IRES,RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return IF (IRES .LT. 0) RETURN DELINV=1.0D0/DEL DO 220 L=1,NEQ @@ -397,7 +397,7 @@ C BANDED USER-SUPPLIED MATRIX DO 410 I=1,LENPD 410 WM(NPDM1+I)=0.0D0 CALL JAC(X,Y,YPRIME,WM(NPD),CJ,RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return MEBAND=2*IWM(LML)+IWM(LMU)+1 GO TO 550 C @@ -423,7 +423,7 @@ C BANDED FINITE-DIFFERENCE-GENERATED MATRIX Y(N)=Y(N)+DEL 510 YPRIME(N)=YPRIME(N)+CJ*DEL CALL RES(X,Y,YPRIME,E,IRES,RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return IF (IRES .LT. 0) RETURN DO 530 N=J,NEQ,MBAND K= (N-J)/MBAND + 1 @@ -1702,13 +1702,13 @@ C COMPUTE TSTOP, IF APPLICABLE C C COMPUTE INITIAL DERIVATIVE, UPDATING TN AND Y, IF APPLICABLE 340 IF (INFO(11) .EQ. 0) GO TO 350 - iero=0 + ierror=0 CALL DDAINI(TN,Y,YPRIME,NEQ, * RES,JAC,HO,RWORK(LWT),IDID,RPAR,IPAR, * RWORK(LPHI),RWORK(LDELTA),RWORK(LE), * RWORK(LWM),IWORK(LIWM),HMIN,RWORK(LROUND), * INFO(10),NTEMP) - if(iero.ne.0) return + if(ierror.ne.0) return IF (IDID .LT. 0) GO TO 390 C C LOAD H WITH HO. STORE H IN RWORK(LH) @@ -1866,7 +1866,7 @@ C TEST H VS. HMAX IF (RH .GT. 1.0D0) H = H/RH 526 CONTINUE C - iero=0 + ierror=0 CALL DDASTP(TN,Y,YPRIME,NEQ, * RES,JAC,H,RWORK(LWT),INFO(1),IDID,RPAR,IPAR, * RWORK(LPHI),RWORK(LDELTA),RWORK(LE), @@ -1877,7 +1877,7 @@ C * RWORK(LS),HMIN,RWORK(LROUND), * IWORK(LPHASE),IWORK(LJCALC),IWORK(LK), * IWORK(LKOLD),IWORK(LNS),INFO(10),NTEMP) - if(iero.ne.0) return + if(ierror.ne.0) return 527 IF(IDID.LT.0)GO TO 600 C C-------------------------------------------------------- @@ -2425,14 +2425,14 @@ C MODIFIED NEWTON SCHEME. M=0 IWM(LNRE)=IWM(LNRE)+1 IRES = 0 - iero = 0 + ierror = 0 CALL RES(X,Y,YPRIME,DELTA,IRES,RPAR,IPAR) C IERROR indicates if RES had the right prototype if(IERROR.ne.0) then IDID=-11 return endif - if(iero.ne.0) return + if(ierror.ne.0) return IF (IRES .LT. 0) GO TO 380 C C @@ -2447,7 +2447,7 @@ C THIS HAS BEEN DONE. CALL DDAJAC(NEQ,X,Y,YPRIME,DELTA,CJ,H, * IER,WT,E,WM,IWM,RES,IRES,UROUND,JAC,RPAR, * IPAR,NTEMP) - if(iero.ne.0) return + if(ierror.ne.0) return CJOLD=CJ S = 100.D0 IF (IRES .LT. 0) GO TO 380 @@ -2503,7 +2503,7 @@ C AND GO BACK TO DO ANOTHER ITERATION IRES = 0 CALL RES(X,Y,YPRIME,DELTA,IRES, * RPAR,IPAR) - if(iero.ne.0) return + if(ierror.ne.0) return IF (IRES .LT. 0) GO TO 380 GO TO 350 C diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref index 0ab0e1d..7dcf5eb 100644 --- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref +++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_13512.dia.ref @@ -25,70 +25,18 @@ t = 1; deff("ydot = f1(t, y)", "ydot = y^2 - y*sin(t) + cos(t)") refMsg = msprintf(_("Wrong number of output arguments.")); assert_checkerror("y = dae(y0, t0, t, f1);", refMsg); - ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC. - ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED - * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL - * YPRIME COULD NOT BE COMPUTED - * ERROR NUMBER = -12 - * - ***END OF MESSAGE - - ***JOB ABORT DUE TO UNRECOVERED ERROR. -0 ERROR MESSAGE SUMMARY - LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT - SLATEC DDASSL AT T = 1.000000D- -12 1 1 - // The evaluation function purposely lacks the input argument 'ydot' deff("[ydot,ires] = f2(t, y)", "ydot = y^2 - y*sin(t) + cos(t)"); refMsg = msprintf(_("Wrong number of input arguments.")); assert_checkerror("y = dae(y0, t0, t, f2);", refMsg); - ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC. - ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED - * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL - * YPRIME COULD NOT BE COMPUTED - * ERROR NUMBER = -12 - * - ***END OF MESSAGE - - ***JOB ABORT DUE TO UNRECOVERED ERROR. -0 ERROR MESSAGE SUMMARY - LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT - SLATEC DDASSL AT T = 1.000000D- -12 1 2 - // ---------------------------------- // Without initial yprime computation // The evaluation function purposely lacks the output argument 'ires' refMsg = msprintf(_("Wrong number of output arguments.")); assert_checkerror("y = dae([y0; 0], t0, t, f1);", refMsg); - ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC. - ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED - * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL - * YPRIME COULD NOT BE COMPUTED - * ERROR NUMBER = -12 - * - ***END OF MESSAGE - - ***JOB ABORT DUE TO UNRECOVERED ERROR. -0 ERROR MESSAGE SUMMARY - LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT - SLATEC DDASSL AT T = 1.000000D- -12 1 3 - // The evaluation function purposely lacks the input argument 'ydot' refMsg = msprintf(_("Wrong number of input arguments.")); assert_checkerror("y = dae([y0; 0], t0, t, f2);", refMsg); - ***MESSAGE FROM ROUTINE DDASSL IN LIBRARY SLATEC. - ***POTENTIALLY RECOVERABLE ERROR, PROG ABORTED, TRACEBACK REQUESTED - * AT T = 1.000000D-03 AND STEPSIZE H = 1.000000D-03 THE INITIAL - * YPRIME COULD NOT BE COMPUTED - * ERROR NUMBER = -12 - * - ***END OF MESSAGE - - ***JOB ABORT DUE TO UNRECOVERED ERROR. -0 ERROR MESSAGE SUMMARY - LIBRARY SUBROUTINE MESSAGE START NERR LEVEL COUNT - SLATEC DDASSL AT T = 1.000000D- -12 1 4 - // ================================================================== // DASRT deff("r = g(t, y)", "r = ones(y)"); -- 1.7.9.5