Changeset 2870 for LMDZ5/branches/testing/libf/phylmd/rrtm

Timestamp:

May 4, 2017, 9:31:05 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2842:2865 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/aeropt_5wv_rrtm.F90 (modified) (8 diffs)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (5 diffs)
• libf/phylmd/rrtm/rrtm_init_140gp.F90 (modified) (1 diff)
• libf/phylmd/rrtm/yoerrtbg2.F90 (modified) (1 diff)

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

@@ -8 +8 @@
    flag_bc_internal_mixture, & 
    pplay, t_seri,            &
-   tausum, tau )
+   tausum, drytausum, tau )
 
   USE DIMPHY
   USE aero_mod
-  USE phys_local_var_mod, ONLY: od443aer,od550aer,od865aer,ec550aer,od550lt1aer,abs550aer
+  USE phys_local_var_mod, ONLY: od443aer,od550aer,dryod550aer,od865aer,ec550aer,od550lt1aer,abs550aer
+  USE phys_output_var_mod, ONLY: dryaod_diag
   USE YOMCST, ONLY: RD,RG
 
@@ -67 +68 @@
   REAL, DIMENSION(klon), INTENT(OUT)                      :: ai      ! POLDER aerosol index 
   REAL, DIMENSION(klon,nwave,naero_tot), INTENT(OUT)      :: tausum
+  REAL, DIMENSION(klon,naero_tot), INTENT(OUT)            :: drytausum
   REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(OUT) :: tau
   !
@@ -342 +344 @@
   ! Initialisations
   ai(:) = 0.
+  abs550aer(:)=0.0
+  drytausum(:,:) = 0.
   tausum(:,:,:) = 0.
   tau(:,:,:,:)=0.
-
-  abs550aer(:)=0.0
 
   DO k=1, klev
@@ -476 +478 @@
     DO la=1,las
 
-    !--only 443, 550, 670 and 865 nm are used
+    !--only 443, 550, and 865 nm are used
     !--to save time 670 and AI are not computed for CMIP6
     !IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la670.AND.la.NE.la865) CYCLE
@@ -511 +513 @@
              tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
+             IF (la.EQ.la550.AND.dryaod_diag) THEN 
+                tau_ae5wv_int = alpha_MG_5wv(1,la,classbc)
+                drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
+             ENDIF
+
              IF (la.EQ.la550) THEN 
                 abs_ae5wv_int = abs_MG_5wv(RH_num(i,k),la,classbc)+DELTA(i,k)* &
@@ -532 +539 @@
               tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
+              IF (la.EQ.la550.AND.dryaod_diag) THEN 
+                 tau_ae5wv_int = alpha_aers_5wv(1,la,spsol)
+                 drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
+              ENDIF
+
               IF (la.EQ.la550) THEN 
                  abs_ae5wv_int = abs_aers_5wv(RH_num(i,k),la,spsol)+DELTA(i,k)* &
@@ -554 +566 @@
             tausum(i,la,aerindex)= tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
+            IF (la.EQ.la550.AND.dryaod_diag) THEN 
+              drytausum(i,aerindex)= drytausum(i,aerindex)+tau(i,k,la,aerindex)
+            ENDIF
+
             IF (la.EQ.la550) THEN 
-               abs_ae5wv_int = abs_aeri_5wv(la,spsol)
+               abs_ae5wv_int = abs_aeri_5wv(la,spinsol)
                abs550aer(i)=abs550aer(i)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*abs_ae5wv_int*fac
             ENDIF 
@@ -573 +589 @@
   od865aer(:)=SUM(tausum(:,la865,:),dim=2)
 
+!--dry AOD calculation for diagnostics la=la550
+  dryod550aer(:)=SUM(drytausum(:,:),dim=2)
+
 !--extinction coefficient for diagnostic
   ec550aer(:,:)=SUM(tau(:,:,la550,:),dim=3)/zdh(:,:)

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

@@ -6 +6 @@
      tr_seri, mass_solu_aero, mass_solu_aero_pi, &
      tau_aero, piz_aero, cg_aero, &
-     tausum_aero, tau3d_aero )
+     tausum_aero, drytausum_aero, tau3d_aero )
 
   ! This routine will :
@@ -52 +52 @@
   REAL, DIMENSION(klon,klev,2,NSW), INTENT(OUT) :: cg_aero     ! asymmetry parameter aerosol
   REAL, DIMENSION(klon,nwave,naero_tot), INTENT(OUT)       :: tausum_aero
+  REAL, DIMENSION(klon,naero_tot), INTENT(OUT)             :: drytausum_aero
   REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(OUT)  :: tau3d_aero
 
@@ -231 +232 @@
      ENDIF
      !
-     ! Read and interpolate cidustm
+     ! Read and interpolate asno3m, csno3m, cino3m
      IF (flag_aerosol .EQ. 6) THEN 
 
@@ -240 +241 @@
         CALL readaerosol_interp(id_CINO3M_phy, itap, pdtphys, rjourvrai, & 
         debut, pplay, paprs, t_seri, nitrinscoarse, nitrinscoarse_pi, load_tmp3) 
-        loadss(:)=load_tmp1(:)+load_tmp2(:)+load_tmp3(:)
+        loadno3(:)=load_tmp1(:)+load_tmp2(:)+load_tmp3(:)
 
      ELSE
@@ -320 +321 @@
        flag_bc_internal_mixture,     & 
        pplay, t_seri,                &
-       tausum_aero, tau3d_aero )
+       tausum_aero, drytausum_aero, tau3d_aero )
 
   !--call LW optical properties for tropospheric aerosols 

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

@@ -82 +82 @@
 
 CORR1(0) = 1.0_JPRB
-CORR1(200) = 1.0_JPRB
+CORR1(400) = 1.0_JPRB
 CORR2(0) = 1.0_JPRB
-CORR2(200) = 1.0_JPRB
-DO I = 1,199
-  Z_FP = 0.005_JPRB*REAL(I)
+CORR2(400) = 1.0_JPRB
+DO I = 1,399
+  Z_FP = 0.0025_JPRB*REAL(I)
   Z_RTFP = SQRT(Z_FP)
   CORR1(I) = Z_RTFP/Z_FP

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

@@ -13 +13 @@
 !    -------------------------------------------------------------------
 
-REAL(KIND=JPRB) :: CORR1(0:200)
-REAL(KIND=JPRB) :: CORR2(0:200)
+REAL(KIND=JPRB) :: CORR1(0:400)
+REAL(KIND=JPRB) :: CORR2(0:400)
 
 !     -----------------------------------------------------------------