From e59a61f44a3be25adcd916495a5d7349465eea89 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 14 Feb 2019 11:02:47 +0100
Subject: [PATCH] Philippe 14/02/2019: remove HINIFILE dummy argument from
INI_RADIATIONS_ECMWF/ECRAD
---
src/MNH/ini_modeln.f90 | 9 ++++-----
src/MNH/ini_radiations_ecmwf.f90 | 7 +++----
src/MNH/ini_radiations_ecrad.f90 | 9 ++++-----
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 9e1d3bf88..c4fc6fb9a 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -280,6 +280,7 @@ END MODULE MODI_INI_MODEL_n
!! P.Wautelet 29/01/2019: bug: add missing zero-size allocations
! P. Wautelet 07/02/2019: force TYPE to a known value for IO_FILE_ADD2LIST
! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
+! P. Wautelet 14/02/2019: remove HINIFILE dummy argument from INI_RADIATIONS_ECMWF/ECRAD
!---------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -2241,8 +2242,7 @@ IF (CRAD == 'ECMW') THEN
ZBARE(:,:) = 0.
END IF
!
- CALL INI_RADIATIONS_ECMWF (TPINIFILE%CNAME, &
- XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
+ CALL INI_RADIATIONS_ECMWF (XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
CLW,NDLON,NFLEV,NFLUX,NRAD,NSWB_OLD,CAER,NAER,NSTATM, &
XSTATM,ZSEA,ZTOWN,ZBARE,XOZON, XAER,XDST_WL, LSUBG_COND )
!
@@ -2268,9 +2268,8 @@ ELSE IF (CRAD == 'ECRA') THEN
ZTOWN(:,:) = 0.
ZBARE(:,:) = 0.
END IF
-!
- CALL INI_RADIATIONS_ECRAD (TPINIFILE%CNAME, &
- XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
+!
+ CALL INI_RADIATIONS_ECRAD (XZHAT,XPABST,XTHT,XTSRAD,XLAT,XLON,TDTCUR,TDTEXP, &
CLW,NDLON,NFLEV,NFLUX,NRAD,NSWB_OLD,CAER,NAER,NSTATM, &
XSTATM,ZSEA,ZTOWN,ZBARE,XOZON, XAER,XDST_WL, LSUBG_COND )
diff --git a/src/MNH/ini_radiations_ecmwf.f90 b/src/MNH/ini_radiations_ecmwf.f90
index 17eb3c7d9..2ee41916e 100644
--- a/src/MNH/ini_radiations_ecmwf.f90
+++ b/src/MNH/ini_radiations_ecmwf.f90
@@ -9,14 +9,13 @@
!
INTERFACE
!
- SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE, &
+ SUBROUTINE INI_RADIATIONS_ECMWF( &
PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB, HAER, KAER, KSTATM, &
PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
!
USE MODD_TYPE_DATE
!
-CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -59,7 +58,7 @@ END MODULE MODI_INI_RADIATIONS_ECMWF
!
!
! ###################################################################
- SUBROUTINE INI_RADIATIONS_ECMWF(HINIFILE, &
+ SUBROUTINE INI_RADIATIONS_ECMWF( &
PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB, HAER, KAER, KSTATM, &
PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
@@ -172,6 +171,7 @@ END MODULE MODI_INI_RADIATIONS_ECMWF
!! J.Escobar 30/03/2017 : Management of compilation of ECMWF_RAD in REAL*8 with MNH_REAL=R4
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
+! P. Wautelet 14/02/2019: remove HINIFILE dummy argument
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -215,7 +215,6 @@ IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
!
-CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
diff --git a/src/MNH/ini_radiations_ecrad.f90 b/src/MNH/ini_radiations_ecrad.f90
index d24b8b329..6b3fdd2f2 100644
--- a/src/MNH/ini_radiations_ecrad.f90
+++ b/src/MNH/ini_radiations_ecrad.f90
@@ -9,14 +9,13 @@
!
INTERFACE
!
- SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE, &
+ SUBROUTINE INI_RADIATIONS_ECRAD( &
PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
!
USE MODD_TYPE_DATE
-CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -59,7 +58,7 @@ END MODULE MODI_INI_RADIATIONS_ECRAD
!
!
! ####################################################################
- SUBROUTINE INI_RADIATIONS_ECRAD(HINIFILE, &
+ SUBROUTINE INI_RADIATIONS_ECRAD( &
PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
@@ -86,6 +85,7 @@ END MODULE MODI_INI_RADIATIONS_ECRAD
! -------------
!
! P. Wautelet 14/02/2019: remove CLUOUT/CLUOUT0 and associated variables
+! P. Wautelet 14/02/2019: remove HINIFILE dummy argument
!
!* 0. DECLARATIONS
! ------------
@@ -114,7 +114,6 @@ IMPLICIT NONE
!* 0.1 Declarations of dummy arguments :
!
-CHARACTER (LEN=*), INTENT(IN) :: HINIFILE ! Name of the initial file
CHARACTER (LEN=*), INTENT(IN) :: HAER ! aerosol optical thickness climatology
CHARACTER (LEN=4), INTENT(IN) :: HLW ! LW scheme used
!
@@ -154,7 +153,7 @@ LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid condensation
NULOUT = TLUOUT%NLU
! Initialization of ECMWF still neede because many things intialized through this routine
-CALL INI_RADIATIONS_ECMWF( HINIFILE, &
+CALL INI_RADIATIONS_ECMWF( &
PZHAT, PPABST, PTHT, PTSRAD, PLAT, PLON, TPDTCUR, TPDTEXP, &
HLW, KDLON, KFLEV, KFLUX, KRAD, KSWB_OLD, HAER, KAER, KSTATM, &
PSTATM, PSEA, PTOWN, PBARE, POZON, PAER, PDST_WL, OSUBG_COND )
--
GitLab