From 42ad6e919ed425d3e56c34da0fe96bdde206340e Mon Sep 17 00:00:00 2001 From: flei Date: Tue, 6 Apr 2021 14:15:17 +0200 Subject: [PATCH 1/2] added the Boberg extension to TS89 model for Kp > 6 cases with iopt fixed at 7, but set dst = -200 nT for Kp=7, dst = -225 nT for Kp=8 and dst = -250 nT for Kp=9. --- example/test.dat | 0 manual/frames/Thumbs.db | Bin manual/frames/favicon.ico | Bin source/SGP4.CMN | 0 source/Tsyganenko89.f | 10 +++++++++- source/astconst.cmn | 0 source/astmath.cmn | 0 source/onera_desp_lib.f | 8 +++++++- source/variables.inc | 0 source/wrappers_32.inc | 0 source/wrappers_64.inc | 0 11 files changed, 16 insertions(+), 2 deletions(-) mode change 100755 => 100644 example/test.dat mode change 100755 => 100644 manual/frames/Thumbs.db mode change 100755 => 100644 manual/frames/favicon.ico mode change 100755 => 100644 source/SGP4.CMN mode change 100755 => 100644 source/astconst.cmn mode change 100755 => 100644 source/astmath.cmn mode change 100755 => 100644 source/variables.inc mode change 100755 => 100644 source/wrappers_32.inc mode change 100755 => 100644 source/wrappers_64.inc diff --git a/example/test.dat b/example/test.dat old mode 100755 new mode 100644 diff --git a/manual/frames/Thumbs.db b/manual/frames/Thumbs.db old mode 100755 new mode 100644 diff --git a/manual/frames/favicon.ico b/manual/frames/favicon.ico old mode 100755 new mode 100644 diff --git a/source/SGP4.CMN b/source/SGP4.CMN old mode 100755 new mode 100644 diff --git a/source/Tsyganenko89.f b/source/Tsyganenko89.f index deeffbd6..283c504c 100644 --- a/source/Tsyganenko89.f +++ b/source/Tsyganenko89.f @@ -105,10 +105,18 @@ 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 BOBERG extension to kp>6 with fixed Dst values +c kp7: Dst = -200 nt +c kp8: Dst = -225 nt +c kp9: Dst = -250 nt + IF (IOPT.GT.7) THEN + A(5)=-10220 - 408.5 *(200.+ 25.*(IOPT-8)) + ENDIF C XI(1)=X XI(2)=Y diff --git a/source/astconst.cmn b/source/astconst.cmn old mode 100755 new mode 100644 diff --git a/source/astmath.cmn b/source/astmath.cmn old mode 100755 new mode 100644 diff --git a/source/onera_desp_lib.f b/source/onera_desp_lib.f index 00f36489..9906d192 100644 --- a/source/onera_desp_lib.f +++ b/source/onera_desp_lib.f @@ -1485,7 +1485,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 diff --git a/source/variables.inc b/source/variables.inc old mode 100755 new mode 100644 diff --git a/source/wrappers_32.inc b/source/wrappers_32.inc old mode 100755 new mode 100644 diff --git a/source/wrappers_64.inc b/source/wrappers_64.inc old mode 100755 new mode 100644 From a077e573600379d97e5f1619142fd7515305c904 Mon Sep 17 00:00:00 2001 From: Fan Lei Date: Wed, 1 Apr 2026 16:04:07 +0100 Subject: [PATCH 2/2] Modify BOBERG extension for kp>5 Dst values Updated BOBERG extension to handle kp>5 with new fixed Dst values. --- source/Tsyganenko89.f | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/Tsyganenko89.f b/source/Tsyganenko89.f index 283c504c..3fa66f42 100644 --- a/source/Tsyganenko89.f +++ b/source/Tsyganenko89.f @@ -110,12 +110,14 @@ SUBROUTINE T89C(IOPT,X,Y,Z,BX,BY,BZ) 1 A(I)=PARAM(I,IOP) C ENDIF -c BOBERG extension to kp>6 with fixed Dst values +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 = -225 nt -c kp9: Dst = -250 nt +c kp8: Dst = -250 nt +c kp9: Dst = -300 nt IF (IOPT.GT.7) THEN - A(5)=-10220 - 408.5 *(200.+ 25.*(IOPT-8)) + A(5)=-10220 - 408.5 *(150.+ 50.*(IOPT-6)) ENDIF C XI(1)=X