Removed unnecessary 'ntime_max.inc' includes. Put back 'ntime_max' array sizes on drift_shell routines inputs to be coherent with outputs.

AntoineBrunet · AntoineBrunet · commit d94a586539dd · 2024-04-11T12:44:35.000+02:00
diff --git a/source/LAndI2Lstar.f b/source/LAndI2Lstar.f
@@ -20443,7 +20443,6 @@ SUBROUTINE LAndI2Lstar1(ntime,kext,options,sysaxes,iyearsat,
 c
       IMPLICIT NONE
       INCLUDE 'variables.inc'
-      INCLUDE 'ntime_max.inc'
 c
 c declare inputs
       INTEGER*4    kext,k_ext,k_l,options(5)
@@ -20532,12 +20531,12 @@ SUBROUTINE LAndI2Lstar_shell_splitting1(ntime,Nipa,kext,options,
       INTEGER*4    kext,k_ext,k_l,options(5),Nalp,Nipa
       PARAMETER (Nalp=25)
       INTEGER*4    ntime,sysaxes
-      INTEGER*4    iyearsat(ntime)
-      integer*4    idoy(ntime)
-      real*8     UT(ntime)
-      real*8     xIN1(ntime),xIN2(ntime),xIN3(ntime)
+      INTEGER*4    iyearsat(ntime_max)
+      integer*4    idoy(ntime_max)
+      real*8     UT(ntime_max)
+      real*8     xIN1(ntime_max),xIN2(ntime_max),xIN3(ntime_max)
       real*8     alpha(Nalp)
-      real*8     maginput(25,ntime)
+      real*8     maginput(25,ntime_max)
 c                      1: Kp
 c                      2: Dst
 c                      3: dens
@@ -20560,8 +20559,8 @@ SUBROUTINE LAndI2Lstar_shell_splitting1(ntime,Nipa,kext,options,
       INTEGER*4  imagin
 c
 c Declare output variables
-      REAL*8     BLOCAL(ntime_max,Nalp),BMIN(ntime)
-      REAL*8     XJ(ntime_max,Nalp),MLT(ntime)
+      REAL*8     BLOCAL(ntime_max,Nalp),BMIN(ntime_max)
+      REAL*8     XJ(ntime_max,Nalp),MLT(ntime_max)
       REAL*8     Lm(ntime_max,Nalp),Lstar(ntime_max,Nalp)
 C
 c     This method to compute L* is only available for IGRF + Olson-Pfitzer quiet
diff --git a/source/onera_desp_lib.f b/source/onera_desp_lib.f
@@ -51,7 +51,6 @@ SUBROUTINE make_lstar1(ntime,kext,options,sysaxes,iyearsat,
 c
       IMPLICIT NONE
       INCLUDE 'variables.inc'
-      INCLUDE 'ntime_max.inc'
 C
 c declare inputs
         INTEGER*4    kext,k_ext,k_l,options(5)
@@ -173,12 +172,12 @@ SUBROUTINE make_lstar_shell_splitting1(ntime,Nipa,kext,options,
         INTEGER*4    kext,k_ext,k_l,options(5),Nalp,Nipa
       PARAMETER (Nalp=25)
         INTEGER*4    ntime,sysaxes
-      INTEGER*4    iyearsat(ntime)
-      integer*4    idoy(ntime)
-      real*8     UT(ntime)
-      real*8     xIN1(ntime),xIN2(ntime),xIN3(ntime)
+      INTEGER*4    iyearsat(ntime_max)
+      integer*4    idoy(ntime_max)
+      real*8     UT(ntime_max)
+      real*8     xIN1(ntime_max),xIN2(ntime_max),xIN3(ntime_max)
       real*8     alpha(Nalp)
-      real*8     maginput(25,ntime)
+      real*8     maginput(25,ntime_max)
 c
 c
 c Declare internal variables
@@ -190,8 +189,8 @@ SUBROUTINE make_lstar_shell_splitting1(ntime,Nipa,kext,options,
       real*8     alti,lati,longi
 c
 c Declare output variables
-        REAL*8     BLOCAL(ntime_max,Nalp),BMIN(ntime)
-      REAL*8     XJ(ntime_max,Nalp),MLT(ntime)
+        REAL*8     BLOCAL(ntime_max,Nalp),BMIN(ntime_max)
+      REAL*8     XJ(ntime_max,Nalp),MLT(ntime_max)
         REAL*8     Lm(ntime_max,Nalp),Lstar(ntime_max,Nalp)
 C
       COMMON /magmod/k_ext,k_l,kint
@@ -285,7 +284,6 @@ SUBROUTINE Lstar_Phi1(ntime,whichinv,options,iyearsat,
 c
       IMPLICIT NONE
       INCLUDE 'variables.inc'
-        INCLUDE 'ntime_max.inc'
 C
 c declare inputs
         INTEGER*4    whichinv,options(5)
@@ -752,7 +750,6 @@ SUBROUTINE GET_FIELD_MULTI(ntime,kext,options,sysaxes,iyearsat,
 c
       IMPLICIT NONE
       INCLUDE 'variables.inc'
-      INCLUDE 'ntime_max.inc'   ! include file created by make, defines ntime_max
 C
 c     declare inputs
       INTEGER*4    ntime

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ SUBROUTINE make_lstar1(ntime,kext,options,sysaxes,iyearsat,`
`51`	`51`	`c`
`52`	`52`	`IMPLICIT NONE`
`53`	`53`	`INCLUDE 'variables.inc'`
`54`		`- INCLUDE 'ntime_max.inc'`
`55`	`54`	`C`
`56`	`55`	`c declare inputs`
`57`	`56`	`INTEGER*4 kext,k_ext,k_l,options(5)`
`@@ -173,12 +172,12 @@ SUBROUTINE make_lstar_shell_splitting1(ntime,Nipa,kext,options,`
`173`	`172`	`INTEGER*4 kext,k_ext,k_l,options(5),Nalp,Nipa`
`174`	`173`	`PARAMETER (Nalp=25)`
`175`	`174`	`INTEGER*4 ntime,sysaxes`
`176`		`- INTEGER*4 iyearsat(ntime)`
`177`		`- integer*4 idoy(ntime)`
`178`		`- real*8 UT(ntime)`
`179`		`- real*8 xIN1(ntime),xIN2(ntime),xIN3(ntime)`
	`175`	`+ INTEGER*4 iyearsat(ntime_max)`
	`176`	`+ integer*4 idoy(ntime_max)`
	`177`	`+ real*8 UT(ntime_max)`
	`178`	`+ real*8 xIN1(ntime_max),xIN2(ntime_max),xIN3(ntime_max)`
`180`	`179`	`real*8 alpha(Nalp)`
`181`		`- real*8 maginput(25,ntime)`
	`180`	`+ real*8 maginput(25,ntime_max)`
`182`	`181`	`c`
`183`	`182`	`c`
`184`	`183`	`c Declare internal variables`
`@@ -190,8 +189,8 @@ SUBROUTINE make_lstar_shell_splitting1(ntime,Nipa,kext,options,`
`190`	`189`	`real*8 alti,lati,longi`
`191`	`190`	`c`
`192`	`191`	`c Declare output variables`
`193`		`- REAL*8 BLOCAL(ntime_max,Nalp),BMIN(ntime)`
`194`		`- REAL*8 XJ(ntime_max,Nalp),MLT(ntime)`
	`192`	`+ REAL*8 BLOCAL(ntime_max,Nalp),BMIN(ntime_max)`
	`193`	`+ REAL*8 XJ(ntime_max,Nalp),MLT(ntime_max)`
`195`	`194`	`REAL*8 Lm(ntime_max,Nalp),Lstar(ntime_max,Nalp)`
`196`	`195`	`C`
`197`	`196`	`COMMON /magmod/k_ext,k_l,kint`
`@@ -285,7 +284,6 @@ SUBROUTINE Lstar_Phi1(ntime,whichinv,options,iyearsat,`
`285`	`284`	`c`
`286`	`285`	`IMPLICIT NONE`
`287`	`286`	`INCLUDE 'variables.inc'`
`288`		`- INCLUDE 'ntime_max.inc'`
`289`	`287`	`C`
`290`	`288`	`c declare inputs`
`291`	`289`	`INTEGER*4 whichinv,options(5)`
`@@ -752,7 +750,6 @@ SUBROUTINE GET_FIELD_MULTI(ntime,kext,options,sysaxes,iyearsat,`
`752`	`750`	`c`
`753`	`751`	`IMPLICIT NONE`
`754`	`752`	`INCLUDE 'variables.inc'`
`755`		`- INCLUDE 'ntime_max.inc' ! include file created by make, defines ntime_max`
`756`	`753`	`C`
`757`	`754`	`c declare inputs`
`758`	`755`	`INTEGER*4 ntime`