Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/sw_aeroAR4.F90

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/phylmd/sw_aeroAR4.F90

@@ -18 +18 @@
      PSOLSWAERO,PSOLSW0AERO,&
      PTOPSWCFAERO,PSOLSWCFAERO,&
-     ok_ade, ok_aie, flag_aerosol )
+     ok_ade, ok_aie, flag_aerosol, flag_aerosol_strat )
 
   USE dimphy
@@ -138 +138 @@
 
   LOGICAL ok_ade, ok_aie    ! use aerosol forcings or not?
+  LOGICAL flag_aerosol_strat ! use stratospehric aerosols
   INTEGER flag_aerosol      ! global flag for aerosol 0 (no aerosol) or 1-5 (aerosols)
   REAL(KIND=8) tauaero(kdlon,kflev,9,2)  ! aerosol optical properties
@@ -307 +308 @@
      ENDIF ! swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE
 
-     IF (flag_aerosol .GT. 0 ) THEN
+     IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
 
      IF (ok_ade.and.swaero_diag .or. .not. ok_ade) THEN
@@ -498 +499 @@
      ENDIF ! ok_aie      
 
-     ENDIF !--if flag_aerosol GT 0
+     ENDIF !--if flag_aerosol GT 0 OR flag_aerosol_strat
 
      itapsw = 0
@@ -504 +505 @@
   itapsw = itapsw + 1
 
-  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. flag_aerosol .GT. 0 ) THEN
+  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) ) THEN
   IF ( ok_ade .and. ok_aie  ) THEN
     ZFSUP(:,:) =    ZFSUP_AERO(:,:,4)