Changeset 2530 for LMDZ5/trunk/libf/phylmd/sw_aeroAR4.F90

Timestamp:

May 31, 2016, 1:34:05 PM (8 years ago)

Author:

oboucher

Message:

Changing flag_aerosol_strat from logical (y/n) to
an integer (0/1/2) for CMIP6 needs

File:

• LMDZ5/trunk/libf/phylmd/sw_aeroAR4.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/sw_aeroAR4.F90

@@ -139 +139 @@
 
   LOGICAL ok_ade, ok_aie    ! use aerosol forcings or not?
-  LOGICAL flag_aerosol_strat ! use stratospehric aerosols
+  INTEGER 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,naero_grp,2)  ! aerosol optical properties
@@ -309 +309 @@
      ENDIF ! swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE
 
-     IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
+     IF (flag_aerosol.GT.0 .OR. flag_aerosol_strat.GT.0) THEN
 
      IF (ok_ade.and.swaero_diag .or. .not. ok_ade) THEN
@@ -500 +500 @@
      ENDIF ! ok_aie      
 
-     ENDIF !--if flag_aerosol GT 0 OR flag_aerosol_strat
+     ENDIF !--if flag_aerosol GT 0 OR flag_aerosol_strat GT 0
 
      itapsw = 0
@@ -506 +506 @@
   itapsw = itapsw + 1
 
-  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) ) THEN
+  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol.GT.0 .OR. flag_aerosol_strat.GT.0) ) THEN
   IF ( ok_ade .and. ok_aie  ) THEN
     ZFSUP(:,:) =    ZFSUP_AERO(:,:,4)