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

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (3 diffs)

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

@@ -2 +2 @@
 !
 SUBROUTINE readaerosol_optic_rrtm(debut, aerosol_couple,  &
-     new_aod, flag_aerosol, itap, rjourvrai, &
+     new_aod, flag_aerosol, flag_bc_internal_mixture, itap, rjourvrai, &
      pdtphys, pplay, paprs, t_seri, rhcl, presnivs, &
      tr_seri, mass_solu_aero, mass_solu_aero_pi, &
@@ -32 +32 @@
   LOGICAL, INTENT(IN)                      :: new_aod
   INTEGER, INTENT(IN)                      :: flag_aerosol
+  LOGICAL, INTENT(IN)                      :: flag_bc_internal_mixture
   INTEGER, INTENT(IN)                      :: itap
   REAL, INTENT(IN)                         :: rjourvrai
@@ -303 +304 @@
 !--new aerosol properties
   ! aeropt_6bands for rrtm
-  CALL aeropt_6bands_rrtm( &
-       pdel, m_allaer, pdtphys, rhcl, & 
-       tau_aero, piz_aero, cg_aero,   &
-       m_allaer_pi, flag_aerosol, &
-       zrho ) 
+  CALL aeropt_6bands_rrtm(          &
+       pdel, m_allaer, rhcl,        & 
+       tau_aero, piz_aero, cg_aero, &
+       m_allaer_pi, flag_aerosol,   &
+       flag_bc_internal_mixture, zrho ) 
 
   ! aeropt_5wv only for validation and diagnostics
-  CALL aeropt_5wv_rrtm(                    &
-       pdel, m_allaer,                &
-       pdtphys, rhcl, aerindex,       & 
-       flag_aerosol, pplay, t_seri,   &
+  CALL aeropt_5wv_rrtm(              &
+       pdel, m_allaer,               &
+       rhcl, aerindex,               & 
+       flag_aerosol,                 & 
+       flag_bc_internal_mixture,     & 
+       pplay, t_seri,                &
        tausum_aero, tau3d_aero )