Changeset 2056 for LMDZ5/branches/testing/libf/phylmd/rrtm/swclr.F90

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/swclr.F90 (modified) (6 diffs)

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

@@ -5 +5 @@
  & PRK   , PRMU0 , PTAUAZ, PTRA1 , PTRA2 , PTRCLR, &
 !++MODIFCODE
-  & LRDUST,PPIZA_DST, PCGA_DST, PTAUREL_DST )
+  & LDDUST,PPIZA_DST, PCGA_DST, PTAU_DST )
 !--MODIFCODE
 
@@ -58 +58 @@
 !        Y.Seity 05-10-10 : add add 3 optional arg. for dust SW properties
 !        Y.Seity 06-09-09 : add modset from O.Thouron (MesoNH) under NOVLP tests
+!        O.Boucher fev.2014: modification sur les aerosols pour utiliser les variables DST
 !     ------------------------------------------------------------------
 
@@ -71 +72 @@
 
 IMPLICIT NONE
-
-include "clesphys.h"
+INCLUDE "clesphys.h"
 
 INTEGER(KIND=JPIM),INTENT(IN)    :: KLON 
@@ -86 +86 @@
 REAL(KIND=JPRB)   ,INTENT(IN)    :: PSEC(KLON) 
 !++MODIFCODE
-LOGICAL           ,INTENT(IN)    :: LRDUST                   ! flag for DUST
+LOGICAL           ,INTENT(IN)    :: LDDUST                   ! flag for DUST
 REAL(KIND=JPRB)   ,INTENT(IN)    :: PPIZA_DST(KLON,KLEV)
 REAL(KIND=JPRB)   ,INTENT(IN)    :: PCGA_DST(KLON,KLEV)
-REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAUREL_DST(KLON,KLEV)
+REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAU_DST(KLON,KLEV)
 !--MODIFCODE
 REAL(KIND=JPRB)   ,INTENT(OUT)   :: PCGAZ(KLON,KLEV) 
@@ -157 +157 @@
 
 !++MODIFCODE  
+!--OB on fait passer les aerosols LMDZ dans la variable DST
   IF(NOVLP < 5)THEN !ECMWF VERSION
-  DO JAE=1,6
+!  DO JAE=1,6
       DO JL = KIDIA,KFDIA
-        PTAUAZ(JL,JK)=PTAUAZ(JL,JK)+PAER(JL,JAE,IKL)*RTAUA(KNU,JAE)
-        PPIZAZ(JL,JK)=PPIZAZ(JL,JK)+PAER(JL,JAE,IKL)&
-         & * RTAUA(KNU,JAE)*RPIZA(KNU,JAE)  
-        PCGAZ(JL,JK) =  PCGAZ(JL,JK) +PAER(JL,JAE,IKL)&
-         & * RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)  
+!        PTAUAZ(JL,JK)=PTAUAZ(JL,JK)+PAER(JL,JAE,IKL)*RTAUA(KNU,JAE)
+        PTAUAZ(JL,JK)=PTAU_DST(JL,IKL)
+!        PPIZAZ(JL,JK)=PPIZAZ(JL,JK)+PAER(JL,JAE,IKL)&
+!         & * RTAUA(KNU,JAE)*RPIZA(KNU,JAE)  
+        PPIZAZ(JL,JK)=PTAU_DST(JL,IKL)*PPIZA_DST(JL,IKL)
+!        PCGAZ(JL,JK) =  PCGAZ(JL,JK) +PAER(JL,JAE,IKL)&
+!         & * RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)  
+        PCGAZ(JL,JK)=PTAU_DST(JL,IKL)*PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)
       ENDDO
-    ENDDO
+!    ENDDO
   ELSE ! MESONH VERSION
-     DO JAE=1,6
+!--OB on utilise directement les aerosols LMDZ
+!     DO JAE=1,6
         DO JL = KIDIA,KFDIA
            !Special optical properties for dust
-           IF (LRDUST.AND.(JAE==3)) THEN
+!           IF (LDDUST.AND.(JAE==3)) THEN
            !Ponderation of aerosol optical properties:first step 
            !ti
-            PTAUAZ(JL,JK)=PTAUAZ(JL,JK) + PAER(JL,JAE,IKL) * PTAUREL_DST(JL,IKL)
+!            PTAUAZ(JL,JK)=PTAUAZ(JL,JK) + PAER(JL,JAE,IKL) * PTAUREL_DST(JL,IKL)
+            PTAUAZ(JL,JK)= PTAU_DST(JL,IKL)
            !wi*ti
-             PPIZAZ(JL,JK)=PPIZAZ(JL,JK) + PAER(JL,JAE,IKL)  &
-                   & *PTAUREL_DST(JL,IKL)*PPIZA_DST(JL,IKL)
+!             PPIZAZ(JL,JK)=PPIZAZ(JL,JK) + PAER(JL,JAE,IKL)  &
+!                   & *PTAUREL_DST(JL,IKL)*PPIZA_DST(JL,IKL)
+             PPIZAZ(JL,JK)=PTAU_DST(JL,IKL)*PPIZA_DST(JL,IKL)
            !wi*ti*gi
-             PCGAZ(JL,JK) = PCGAZ(JL,JK) + PAER(JL,JAE,IKL) &
-                &  *PTAUREL_DST(JL,IKL)*PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)
+!             PCGAZ(JL,JK) = PCGAZ(JL,JK) + PAER(JL,JAE,IKL) &
+!                &  *PTAUREL_DST(JL,IKL)*PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)
+             PCGAZ(JL,JK) = PTAU_DST(JL,IKL)*PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)
            !wi*ti*(gi**2)
-             ZFACOA_NEW(JL,JK)= ZFACOA_NEW(JL,JK)+PAER(JL, JAE, IKL)&
-                & *PTAUREL_DST(JL,IKL) *PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)*&
+!             ZFACOA_NEW(JL,JK)= ZFACOA_NEW(JL,JK)+PAER(JL, JAE, IKL)&
+!                & *PTAUREL_DST(JL,IKL) *PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)*&
+!                & PCGA_DST(JL,IKL)
+             ZFACOA_NEW(JL,JK)= ZFACOA_NEW(JL,JK)+&
+                & PTAU_DST(JL,IKL) *PPIZA_DST(JL,IKL)*PCGA_DST(JL,IKL)*&
                 & PCGA_DST(JL,IKL)
-           ELSE
+!           ELSE
            !Ponderation of aerosol optical properties:first step 
            !ti
-             PTAUAZ(JL,JK)=PTAUAZ(JL,JK)+PAER(JL, JAE, IKL)*RTAUA(KNU,JAE)
+!             PTAUAZ(JL,JK)=PTAUAZ(JL,JK)+PAER(JL, JAE, IKL)*RTAUA(KNU,JAE)
            !wi*ti
-             PPIZAZ(JL,JK)=PPIZAZ(JL,JK)+PAER(JL, JAE, IKL)&
-                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)
+!             PPIZAZ(JL,JK)=PPIZAZ(JL,JK)+PAER(JL, JAE, IKL)&
+!                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)
            !wi*ti*gi
-             PCGAZ(JL,JK) =  PCGAZ(JL,JK) +PAER(JL, JAE, IKL)&
-                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)
+!             PCGAZ(JL,JK) =  PCGAZ(JL,JK) +PAER(JL, JAE, IKL)&
+!                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)
            !wi*ti*(gi**2)
-             ZFACOA_NEW(JL,JK)= ZFACOA_NEW(JL,JK)+PAER(JL, JAE, IKL)&
-                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)*RCGA(KNU,JAE)
-           ENDIF
+!             ZFACOA_NEW(JL,JK)= ZFACOA_NEW(JL,JK)+PAER(JL, JAE, IKL)&
+!                &* RTAUA(KNU,JAE)*RPIZA(KNU,JAE)*RCGA(KNU,JAE)*RCGA(KNU,JAE)
+!           ENDIF
         ENDDO
-     ENDDO
+!     ENDDO
   ENDIF
 !--MODIFCODE  
@@ -217 +228 @@
 !-- bug-fix: ZRATIO must be defined from the transformed value of optical thickness
 ! MPLFH : ZTRAY N'EST PAS INITIALISE !!!!! A REVOIR (MPL)
-      ZTRAY=0.
+      ZTRAY= PRAYL(JL) * PDSIG(JL,JK)
 !     print *,'>>>>>>> swclr: ZTRAY ',ZTRAY
       ZDENB = ZTRAY + PTAUAZ(JL,JK)*(1.0_JPRB-PPIZAZ(JL,JK)*ZFF)