Changeset 2870 for LMDZ5/branches/testing/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

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/readaerosol_optic_rrtm.F90 (modified) (5 diffs)

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