diff --git a/source/Tsyganenko89.f b/source/Tsyganenko89.f index deeffbd6..3fa66f42 100644 --- a/source/Tsyganenko89.f +++ b/source/Tsyganenko89.f @@ -105,10 +105,20 @@ SUBROUTINE T89C(IOPT,X,Y,Z,BX,BY,BZ) C ID=1 IOP=IOPT + IF (IOPT.GT.7) IOP = 7 DO 1 I=1,30 - 1 A(I)=PARAM(I,IOPT) + 1 A(I)=PARAM(I,IOP) C ENDIF +c Modified BOBERG extension to kp>5 with fixed Dst values +c IOPT = 6, and +c kp6: Dst = -150 nt +c kp7: Dst = -200 nt +c kp8: Dst = -250 nt +c kp9: Dst = -300 nt + IF (IOPT.GT.7) THEN + A(5)=-10220 - 408.5 *(150.+ 50.*(IOPT-6)) + ENDIF C XI(1)=X XI(2)=Y diff --git a/source/onera_desp_lib.f b/source/onera_desp_lib.f index 08a968d2..0b21e1de 100644 --- a/source/onera_desp_lib.f +++ b/source/onera_desp_lib.f @@ -1129,7 +1129,13 @@ subroutine set_magfield_inputs ( kext, maginput, ifail ) & maginput(1).lt.47.d0) Activ=5 if (maginput(1).ge.47.d0 .and. & maginput(1).lt.57.d0) Activ=6 - if (maginput(1).ge.57.d0) Activ=7 + if (maginput(1).ge.57.d0 .and. + & maginput(1).lt.67.d0) Activ=7 + if (maginput(1).ge.67.d0 .and. + & maginput(1).lt.77.d0) Activ=8 + if (maginput(1).ge.77.d0 .and. + & maginput(1).lt.87.d0) Activ=9 + if (maginput(1).ge.87.d0) Activ=10 c if (maginput(1).lt.0.d0 .or. & maginput(1).gt.90.d0) return