changeset 3090:27ac5cea9fe3 octave-forge

Added a line for the support of not-constant mass matrices in radau.f.
author treichl
date Thu, 08 Feb 2007 21:09:08 +0000
parents 523d3a2ee1b7
children cb60b4f0d4b0
files main/odepkg/src/hairer.diff
diffstat 1 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/odepkg/src/hairer.diff	Thu Feb 08 21:07:28 2007 +0000
+++ b/main/odepkg/src/hairer.diff	Thu Feb 08 21:09:08 2007 +0000
@@ -66,8 +66,17 @@
        IF (ICOMP(J).EQ.II) I=J
     5  CONTINUE
 
---- hairer/radau.f      2007-02-07 20:46:19.000000000 +0100
-+++ hairer/radau.f      2007-02-07 20:50:13.000000000 +0100
+--- hairer/radau.f      2007-02-04 13:39:46.000000000 +0100
++++ hairer/radau.new    2007-02-08 18:08:46.000000000 +0100
+@@ -751,7 +751,7 @@
+       INDEX2=NIND2.NE.0
+       INDEX3=NIND3.NE.0
+ C ------- COMPUTE MASS MATRIX FOR IMPLICIT CASE ----------
+-      IF (IMPLCT) CALL MAS(NM1,FMAS,LDMAS,RPAR,IPAR)
++      IF (IMPLCT) CALL MAS(NM1,X,Y,FMAS,LDMAS,RPAR,IPAR)
+       VARIAB=NSMIN.LT.NSMAX
+ C ---------- CONSTANTS ---------
+       EXPO=1.D0/(NS+1.D0)
 @@ -780,6 +780,13 @@
        NNS=N*NS
        NSCON=NS
@@ -82,3 +91,12 @@
        CALL COERTV(NSMAX)
        CALL COERCV(NS,C,DD,U1,ALPH,BETA)
        IF (M1.GT.0) IJOB=IJOB+10
+@@ -892,6 +899,8 @@
+       ELSE
+ C --- COMPUTE JACOBIAN MATRIX ANALYTICALLY
+          CALL JAC(N,X,Y,FJAC,LDJAC,RPAR,IPAR)
++C ------- COMPUTE MASS MATRIX FOR IMPLICIT CASE ----------
++         IF (IMPLCT) CALL MAS(NM1,X,Y,FMAS,LDMAS,RPAR,IPAR)
+       END IF
+       CALJAC=.TRUE.
+       CALHES=.TRUE.