Changeset 2530

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

Location:

LMDZ5/trunk/libf/phylmd

Files:

• conf_phys_m.F90 (modified) (3 diffs)
• phys_output_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (4 diffs)
• radlwsw_m.F90 (modified) (2 diffs)
• sw_aeroAR4.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -76 +76 @@
     LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
     INTEGER              :: flag_aerosol
-    LOGICAL              :: flag_aerosol_strat
+    INTEGER              :: flag_aerosol_strat
     LOGICAL              :: new_aod
     REAL                 :: bl95_b0, bl95_b1
@@ -94 +94 @@
     LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp, aerosol_couple_omp
     INTEGER, SAVE       :: flag_aerosol_omp
-    LOGICAL, SAVE       :: flag_aerosol_strat_omp
+    INTEGER, SAVE       :: flag_aerosol_strat_omp
     LOGICAL, SAVE       :: new_aod_omp
     REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
@@ -386 +386 @@
     !
     !Config Key  = flag_aerosol_strat
-    !Config Desc = use stratospheric aerosols T/F
-    !Config Def  = false
+    !Config Desc = use stratospheric aerosols 0, 1, 2
+    ! - 0 = no stratospheric aerosols 
+    ! - 1 = stratospheric aerosols scaled from 550 nm AOD 
+    ! - 2 = stratospheric aerosol properties from CMIP6
+    !Config Def  = 0
     !Config Help = Used in physiq.F
     !
     !
-    flag_aerosol_strat_omp = .false.
+    flag_aerosol_strat_omp = 0
     CALL getin('flag_aerosol_strat',flag_aerosol_strat_omp)
 

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -81 +81 @@
     INTEGER                               :: nlevSTD, radpas
     LOGICAL                               :: ok_mensuel, ok_journe, ok_hf, ok_instan
-    LOGICAL                               :: ok_LES,ok_ade,ok_aie,flag_aerosol_strat
+    LOGICAL                               :: ok_LES,ok_ade,ok_aie
+    INTEGER                               :: flag_aerosol_strat
     LOGICAL                               :: new_aod, aerosol_couple
     INTEGER, INTENT(IN)::  read_climoz ! read ozone climatology

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -302 +302 @@
     REAL, DIMENSION(klon,klev,nqtot) :: qx, d_qx
     REAL, DIMENSION(klon, klev) :: zmasse
-    LOGICAL :: flag_aerosol_strat
+    INTEGER :: flag_aerosol_strat
     INTEGER :: flag_aerosol 
     LOGICAL :: ok_cdnc
@@ -943 +943 @@
              !--STRAT AER
           ENDIF
-          IF (flag_aerosol.GT.0.OR.flag_aerosol_strat) THEN
+          IF (flag_aerosol.GT.0.OR.flag_aerosol_strat.GT.0) THEN
 !             DO naero = 1, naero_spc
 !--correction mini bug OB
@@ -951 +951 @@
              END DO
           ENDIF
-          IF (flag_aerosol_strat) THEN
+          IF (flag_aerosol_strat.GT.0) THEN
              CALL histwrite_phy(o_tausumaero_lw, &
                   tausum_aero(:,6,id_STRAT_phy) )

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -833 +833 @@
     !
     !--STRAT AEROSOL
-    LOGICAL, SAVE :: flag_aerosol_strat
+    INTEGER, SAVE :: flag_aerosol_strat
     !$OMP THREADPRIVATE(flag_aerosol_strat)
     !c-fin STRAT AEROSOL
@@ -3066 +3066 @@
        !--STRAT AEROSOL
        !--updates tausum_aero,tau_aero,piz_aero,cg_aero
-       IF (flag_aerosol_strat) THEN
+       IF (flag_aerosol_strat.GT.0) THEN
           IF (prt_level .GE.10) THEN
              PRINT *,'appel a readaerosolstrat', mth_cur
           ENDIF
           IF (iflag_rrtm.EQ.0) THEN
+           IF (flag_aerosol_strat.EQ.1) THEN
              CALL readaerosolstrato(debut)
+           ELSE
+             abort_message='flag_aerosol_strat must equal 1 for rrtm=0' 
+             call abort_physic(modname,abort_message,1)
+           ENDIF
           ELSE
 #ifdef CPP_RRTM
              CALL readaerosolstrato_rrtm(debut)
 #else
-
              abort_message='You should compile with -rrtm if running ' &
                   // 'with iflag_rrtm=1'
@@ -3484 +3488 @@
                t_seri,q_seri,wo, &
                cldfrarad, cldemirad, cldtaurad, &
-               ok_ade.OR.flag_aerosol_strat, ok_aie, flag_aerosol, &
+               ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, flag_aerosol, &
                flag_aerosol_strat, &
                tau_aero, piz_aero, cg_aero, &
@@ -3546 +3550 @@
                      t_seri,q_seri,wo, &
                      cldfra, cldemi, cldtau, &
-                     ok_ade.OR.flag_aerosol_strat, ok_aie, flag_aerosol, &
+                     ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, flag_aerosol, &
                      flag_aerosol_strat, &
                      tau_aero, piz_aero, cg_aero, &

LMDZ5/trunk/libf/phylmd/radlwsw_m.F90

@@ -101 +101 @@
   ! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
   ! flag_aerosol-input-I- aerosol flag from 0 to 6
-  ! flag_aerosol_strat-input-I- use stratospheric aerosols flag (T/F)
+  ! flag_aerosol_strat-input-I- use stratospheric aerosols flag (0, 1, 2)
   ! tau_ae, piz_ae, cg_ae-input-R- aerosol optical properties (calculated in aeropt.F)
   ! cldtaupi-input-R- epaisseur optique des nuages dans le visible
@@ -190 +190 @@
   LOGICAL              :: lldebug
   INTEGER, INTENT(in)  :: flag_aerosol                                   ! takes value 0 (no aerosol) or 1 to 6 (aerosols)
-  LOGICAL, INTENT(in)  :: flag_aerosol_strat                             ! use stratospheric aerosols
+  INTEGER, INTENT(in)  :: flag_aerosol_strat                             ! use stratospheric aerosols
   REAL,    INTENT(in)  :: cldfra(KLON,KLEV), cldemi(KLON,KLEV), cldtaupd(KLON,KLEV)
   REAL,    INTENT(in)  :: tau_aero(KLON,KLEV,naero_grp,2)                        ! aerosol optical properties (see aeropt.F)

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)