Changeset 2530 for LMDZ5/trunk/libf/phylmd/physiq_mod.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/physiq_mod.F90 (modified) (4 diffs)

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, &