diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src index 020661410b1417aab3c09f297007bfe2b0c02f3e..43a028c9c68c856bd4b021b0b2454646d6c28dee 100644 --- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src +++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src @@ -1,4 +1,6 @@ -&NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F, NIO_VERB=5, NGEN_VERB=5 / +&NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F + ! , NIO_VERB=5, NGEN_VERB=5 + / &NAM_CONFZ ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 / diff --git a/src/LIB/RAD/ecrad-1.0.1_mnh/ifs/radiation_scheme.F90 b/src/LIB/RAD/ecrad-1.0.1_mnh/ifs/radiation_scheme.F90 index e33efcc997adf884a0ff00b69bf8300c17a276ae..4f00fba6f7b381a844ba27db13d6042dc9668d28 100644 --- a/src/LIB/RAD/ecrad-1.0.1_mnh/ifs/radiation_scheme.F90 +++ b/src/LIB/RAD/ecrad-1.0.1_mnh/ifs/radiation_scheme.F90 @@ -86,8 +86,9 @@ USE MODD_TIME_n , ONLY : TDTMOD,TDTCUR USE MODI_ICE_EFFECTIVE_RADIUS USE MODI_LIQUID_EFFECTIVE_RADIUS USE MODI_CLOUD_OVERLAP_DECORR_LEN +USE MODD_LUNIT_n , ONLY : TLUOUT ! MNH - +USE YOMLUN ,ONLY : NULOUT USE RADIATION_SETUP, ONLY : rad_config, & & NWEIGHT_UV, IBAND_UV, WEIGHT_UV, & & NWEIGHT_PAR, IBAND_PAR, WEIGHT_PAR, & @@ -278,6 +279,9 @@ REAL(KIND=JPRB) :: ZHOOK_HANDLE IF (LHOOK) CALL DR_HOOK('RADIATION_SCHEME',0,ZHOOK_HANDLE) +! Redirect OUTPUT to MNH OUTPUT_LISTING +NULOUT = TLUOUT%NLU + ! Allocate memory in radiation objects CALL single_level%allocate(KLON, NSWB_OLD, 2, & ! ncol, nalbedobands, nemisbands & use_sw_albedo_direct=.TRUE.) ! mu0, tskin, albedo, emiss, seed for McICA diff --git a/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/rrtm_kgb1.F90 b/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/rrtm_kgb1.F90 index cf0126f5d79d355f315af4fd2944246ccfee52a7..e2b5bca94223aad523ff94b3fc99d66334a36dfe 100644 --- a/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/rrtm_kgb1.F90 +++ b/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/rrtm_kgb1.F90 @@ -12,7 +12,7 @@ SUBROUTINE RRTM_KGB1(DIRECTORY) USE PARKIND1 ,ONLY : JPRB USE YOMHOOK ,ONLY : LHOOK, DR_HOOK -USE YOMLUN ,ONLY : NULRAD +USE YOMLUN ,ONLY : NULRAD , NULOUT USE MPL_MODULE,ONLY : MPL_BROADCAST USE YOMTAG ,ONLY : MTAGRAD USE YOMMP0 , ONLY : NPROC, MYPROC @@ -39,7 +39,7 @@ IF( MYPROC==1 )THEN !IF(CLZZZ /= " ") THEN ! CLF1=TRIM(CLZZZ) // "/RADRRTM" CLF1 = DIRECTORY // "/RADRRTM" - WRITE(0,'(A,A)') 'Reading ',TRIM(CLF1) + WRITE(NULOUT,'(A,A)') 'Reading ',TRIM(CLF1) ! RRTM and SRTM files from ecrad are in big-endian format. ! Here they are read as big-endian at opening because otherwise MNH assumes littel-endian ! No need for complation option export GFORTRAN_CONVERT_UNIT="little_endian;big_endian:145" diff --git a/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/srtm_kgb16.F90 b/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/srtm_kgb16.F90 index 7e589efd97594e9f9b57e105724dfdc56135170c..c2295d630cb84690228df926cbe42accfbee4916 100644 --- a/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/srtm_kgb16.F90 +++ b/src/LIB/RAD/ecrad-1.0.1_mnh/ifsrrtm/srtm_kgb16.F90 @@ -11,7 +11,7 @@ SUBROUTINE SRTM_KGB16(DIRECTORY) USE PARKIND1 , ONLY : JPRB USE YOMHOOK , ONLY : LHOOK, DR_HOOK -USE YOMLUN , ONLY : NULRAD +USE YOMLUN , ONLY : NULRAD , NULOUT USE YOMMP0 , ONLY : NPROC, MYPROC USE MPL_MODULE, ONLY : MPL_BROADCAST USE YOMTAG , ONLY : MTAGRAD @@ -37,7 +37,7 @@ IF( MYPROC==1 )THEN !IF(CLZZZ /= " ") THEN ! CLF1=TRIM(CLZZZ)//"/RADSRTM" CLF1 = DIRECTORY // "/RADSRTM" - WRITE(0,'(A,A)') 'Reading ',TRIM(CLF1) + WRITE(NULOUT,'(A,A)') 'Reading ',TRIM(CLF1) ! RRTM and SRTM files from ecrad are in big-endian format. ! Here they are covnerted into little-endian at opening ! No need for compialtion option export GFORTRAN_CONVERT_UNIT="little_endian;big_endian:145" diff --git a/src/MNH/ini_radiations_ecrad.f90 b/src/MNH/ini_radiations_ecrad.f90 index ceb2f3bf3b0786be30e25047491cf3ee40fb21a2..f4115e2c50051aef4b45356df3a2be8934278461 100644 --- a/src/MNH/ini_radiations_ecrad.f90 +++ b/src/MNH/ini_radiations_ecrad.f90 @@ -108,6 +108,8 @@ USE MODI_SURRTRF !USE MODI_SRTM_INIT USE MODD_PARAM_ECRAD_n USE YOERDI +USE MODD_LUNIT_n , ONLY : TLUOUT +USE YOMLUN ,ONLY : NULOUT #endif USE MODD_PARAM_RAD_n, ONLY : XDTRAD USE MODD_DYN_n, ONLY : XTSTEP @@ -158,6 +160,9 @@ LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid condensation #ifdef MNH_ECRAD +! Redirect OUTPUT to MNH OUTPUT_LISTING +NULOUT = TLUOUT%NLU + ! Initialization of ECMWF still neede because many things intialized through this routine CALL INI_RADIATIONS_ECMWF (HINIFILE,HLUOUT, & PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &