Skip to content
Snippets Groups Projects
Commit 2cf8fda9 authored by Juan Escobar's avatar Juan Escobar
Browse files

Juan 28/06/2018:radiation ECRAD => do OUTPUT in OUTPUT_LISTING

parent e54464bd
No related branches found
No related tags found
No related merge requests found
&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 &NAM_CONFZ
! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8
/ /
......
...@@ -86,8 +86,9 @@ USE MODD_TIME_n , ONLY : TDTMOD,TDTCUR ...@@ -86,8 +86,9 @@ USE MODD_TIME_n , ONLY : TDTMOD,TDTCUR
USE MODI_ICE_EFFECTIVE_RADIUS USE MODI_ICE_EFFECTIVE_RADIUS
USE MODI_LIQUID_EFFECTIVE_RADIUS USE MODI_LIQUID_EFFECTIVE_RADIUS
USE MODI_CLOUD_OVERLAP_DECORR_LEN USE MODI_CLOUD_OVERLAP_DECORR_LEN
USE MODD_LUNIT_n , ONLY : TLUOUT
! MNH ! MNH
USE YOMLUN ,ONLY : NULOUT
USE RADIATION_SETUP, ONLY : rad_config, & USE RADIATION_SETUP, ONLY : rad_config, &
& NWEIGHT_UV, IBAND_UV, WEIGHT_UV, & & NWEIGHT_UV, IBAND_UV, WEIGHT_UV, &
& NWEIGHT_PAR, IBAND_PAR, WEIGHT_PAR, & & NWEIGHT_PAR, IBAND_PAR, WEIGHT_PAR, &
...@@ -278,6 +279,9 @@ REAL(KIND=JPRB) :: ZHOOK_HANDLE ...@@ -278,6 +279,9 @@ REAL(KIND=JPRB) :: ZHOOK_HANDLE
IF (LHOOK) CALL DR_HOOK('RADIATION_SCHEME',0,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 ! Allocate memory in radiation objects
CALL single_level%allocate(KLON, NSWB_OLD, 2, & ! ncol, nalbedobands, nemisbands CALL single_level%allocate(KLON, NSWB_OLD, 2, & ! ncol, nalbedobands, nemisbands
& use_sw_albedo_direct=.TRUE.) ! mu0, tskin, albedo, emiss, seed for McICA & use_sw_albedo_direct=.TRUE.) ! mu0, tskin, albedo, emiss, seed for McICA
......
...@@ -12,7 +12,7 @@ SUBROUTINE RRTM_KGB1(DIRECTORY) ...@@ -12,7 +12,7 @@ SUBROUTINE RRTM_KGB1(DIRECTORY)
USE PARKIND1 ,ONLY : JPRB USE PARKIND1 ,ONLY : JPRB
USE YOMHOOK ,ONLY : LHOOK, DR_HOOK USE YOMHOOK ,ONLY : LHOOK, DR_HOOK
USE YOMLUN ,ONLY : NULRAD USE YOMLUN ,ONLY : NULRAD , NULOUT
USE MPL_MODULE,ONLY : MPL_BROADCAST USE MPL_MODULE,ONLY : MPL_BROADCAST
USE YOMTAG ,ONLY : MTAGRAD USE YOMTAG ,ONLY : MTAGRAD
USE YOMMP0 , ONLY : NPROC, MYPROC USE YOMMP0 , ONLY : NPROC, MYPROC
...@@ -39,7 +39,7 @@ IF( MYPROC==1 )THEN ...@@ -39,7 +39,7 @@ IF( MYPROC==1 )THEN
!IF(CLZZZ /= " ") THEN !IF(CLZZZ /= " ") THEN
! CLF1=TRIM(CLZZZ) // "/RADRRTM" ! CLF1=TRIM(CLZZZ) // "/RADRRTM"
CLF1 = DIRECTORY // "/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. ! 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 ! 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" ! No need for complation option export GFORTRAN_CONVERT_UNIT="little_endian;big_endian:145"
......
...@@ -11,7 +11,7 @@ SUBROUTINE SRTM_KGB16(DIRECTORY) ...@@ -11,7 +11,7 @@ SUBROUTINE SRTM_KGB16(DIRECTORY)
USE PARKIND1 , ONLY : JPRB USE PARKIND1 , ONLY : JPRB
USE YOMHOOK , ONLY : LHOOK, DR_HOOK USE YOMHOOK , ONLY : LHOOK, DR_HOOK
USE YOMLUN , ONLY : NULRAD USE YOMLUN , ONLY : NULRAD , NULOUT
USE YOMMP0 , ONLY : NPROC, MYPROC USE YOMMP0 , ONLY : NPROC, MYPROC
USE MPL_MODULE, ONLY : MPL_BROADCAST USE MPL_MODULE, ONLY : MPL_BROADCAST
USE YOMTAG , ONLY : MTAGRAD USE YOMTAG , ONLY : MTAGRAD
...@@ -37,7 +37,7 @@ IF( MYPROC==1 )THEN ...@@ -37,7 +37,7 @@ IF( MYPROC==1 )THEN
!IF(CLZZZ /= " ") THEN !IF(CLZZZ /= " ") THEN
! CLF1=TRIM(CLZZZ)//"/RADSRTM" ! CLF1=TRIM(CLZZZ)//"/RADSRTM"
CLF1 = DIRECTORY // "/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. ! RRTM and SRTM files from ecrad are in big-endian format.
! Here they are covnerted into little-endian at opening ! Here they are covnerted into little-endian at opening
! No need for compialtion option export GFORTRAN_CONVERT_UNIT="little_endian;big_endian:145" ! No need for compialtion option export GFORTRAN_CONVERT_UNIT="little_endian;big_endian:145"
......
...@@ -108,6 +108,8 @@ USE MODI_SURRTRF ...@@ -108,6 +108,8 @@ USE MODI_SURRTRF
!USE MODI_SRTM_INIT !USE MODI_SRTM_INIT
USE MODD_PARAM_ECRAD_n USE MODD_PARAM_ECRAD_n
USE YOERDI USE YOERDI
USE MODD_LUNIT_n , ONLY : TLUOUT
USE YOMLUN ,ONLY : NULOUT
#endif #endif
USE MODD_PARAM_RAD_n, ONLY : XDTRAD USE MODD_PARAM_RAD_n, ONLY : XDTRAD
USE MODD_DYN_n, ONLY : XTSTEP USE MODD_DYN_n, ONLY : XTSTEP
...@@ -158,6 +160,9 @@ LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid condensation ...@@ -158,6 +160,9 @@ LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid condensation
#ifdef MNH_ECRAD #ifdef MNH_ECRAD
! Redirect OUTPUT to MNH OUTPUT_LISTING
NULOUT = TLUOUT%NLU
! Initialization of ECMWF still neede because many things intialized through this routine ! Initialization of ECMWF still neede because many things intialized through this routine
CALL INI_RADIATIONS_ECMWF (HINIFILE,HLUOUT, & CALL INI_RADIATIONS_ECMWF (HINIFILE,HLUOUT, &
PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, & PZHAT,PPABST,PTHT,PTSRAD,PLAT,PLON,TPDTCUR,TPDTEXP, &
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment