Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/rrtm_ecrt_140gp.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90

@@ -10 +10 @@
  & P_ZEMIS, P_ZEMIW,&
  & pq   , pcco2, pozn, pcldf, ptaucld, ptclear,&
- & P_CLDFRAC,P_TAUCLD,P_COLDRY,P_WKL,P_WX,&
- & P_TAUAERL,PAVEL,P_TAVEL,PZ,P_TZ,P_TBOUND,K_NLAYERS,P_SEMISS,K_IREFLECT)  
+ & P_CLDFRAC,P_TAUCLD,&
+ & PTAU_LW,&
+ & P_COLDRY,P_WKL,P_WX,&
+ & P_TAUAERL,PAVEL,P_TAVEL,PZ,P_TZ,P_TBOUND,K_NLAYERS,P_SEMISS,K_IREFLECT )  
 
 !     Reformatted for F90 by JJMorcrette, ECMWF, 980714
@@ -28 +30 @@
 USE PARRRTM  , ONLY : JPBAND   ,JPXSEC   ,JPLAY   ,&
  & JPINPX  
-USE YOERAD   , ONLY : NOVLP
-!USE YOERDI   , ONLY :    RCH4     ,RN2O    ,RCFC11  ,RCFC12
+USE YOERAD   , ONLY : NLW      ,NOVLP
+USE YOERDI   , ONLY :    RCH4     ,RN2O    ,RCFC11  ,RCFC12
 USE YOESW    , ONLY : RAER
 
 !------------------------------Arguments--------------------------------
 
-
-
 IMPLICIT NONE
 
-#include "clesphys.h"
+
 INTEGER(KIND=JPIM),INTENT(IN)    :: KLON! Number of atmospheres (longitudes) 
 INTEGER(KIND=JPIM),INTENT(IN)    :: KLEV! Number of atmospheric layers 
@@ -56 +56 @@
 REAL(KIND=JPRB)   ,INTENT(IN)    :: PCLDF(KLON,KLEV) ! Cloud fraction
 REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAUCLD(KLON,KLEV,JPBAND) ! Cloud optical depth
+!--C.Kleinschmitt
+REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAU_LW(KLON,KLEV,NLW) ! LW Optical depth of aerosols  
+!--end
 REAL(KIND=JPRB)   ,INTENT(OUT)   :: PTCLEAR 
 REAL(KIND=JPRB)   ,INTENT(OUT)   :: P_CLDFRAC(JPLAY) ! Cloud fraction
@@ -258 +261 @@
   P_TAUAERL(I_L,16)=ZTAUAER(5)
 ENDDO
+!--Use LW AOD from own Mie calculations (C. Kleinschmitt)
+DO I_L=1,KLEV
+  JK=KLEV-I_L+1
+  DO JAE=1, NLW 
+    P_TAUAERL(I_L,JAE) = MAX( PTAU_LW(K_IPLON, JK, JAE), 1e-30 )
+  ENDDO
+ENDDO
+!--end C. Kleinschmitt
 
 DO J2=1,KLEV
@@ -390 +401 @@
 !     ------------------------------------------------------------------
 
-
-
 IF (LHOOK) CALL DR_HOOK('RRTM_ECRT_140GP',1,ZHOOK_HANDLE)
 END SUBROUTINE RRTM_ECRT_140GP