From 114ed0ca64d169cdfb74e3c5c241a4fe9923c56a Mon Sep 17 00:00:00 2001 From: Antoine Brunet Date: Fri, 27 Aug 2021 17:07:01 +0200 Subject: [PATCH] Removed unnecessary 'ntime_max.inc' includes. Put back 'ntime_max' array sizes on drift_shell routines inputs to be coherent with outputs. --- source/LAndI2Lstar.f | 21 ++++++++++----------- source/onera_desp_lib.f | 17 +++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/source/LAndI2Lstar.f b/source/LAndI2Lstar.f index 2aa58396..6c9ee198 100644 --- a/source/LAndI2Lstar.f +++ b/source/LAndI2Lstar.f @@ -20513,7 +20513,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) @@ -20602,12 +20601,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 @@ -20621,16 +20620,16 @@ SUBROUTINE LAndI2Lstar_shell_splitting1(ntime,Nipa,kext,options, c c Declare internal variables INTEGER*4 option1,isat,IPA,ntime_tmp,sysaxesOUT,sysaxesIN - REAL*8 BLOCAL_tmp(ntime),BMIN_tmp(ntime) - REAL*8 XJ_tmp(ntime),MLT_tmp(ntime) - REAL*8 Lm_tmp(ntime),Lstar_tmp(ntime) + REAL*8 BLOCAL_tmp(ntime_max),BMIN_tmp(ntime_max) + REAL*8 XJ_tmp(ntime_max),MLT_tmp(ntime_max) + REAL*8 Lm_tmp(ntime_max),Lstar_tmp(ntime_max) REAL*8 xIN(3),xOUT(3),BL,BMIR,xGEO(3) REAL*8 maginput_tmp(25) 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 index 2bffa9e5..cc64d923 100644 --- a/source/onera_desp_lib.f +++ b/source/onera_desp_lib.f @@ -114,7 +114,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) @@ -260,12 +259,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 @@ -277,8 +276,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 @@ -392,7 +391,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) @@ -1044,7 +1042,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