Changeset 3607 for LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

Timestamp:

Nov 29, 2019, 9:08:29 AM (5 years ago)

Author:

jghattas

Message:

Revert commit [3604]. This is only done temporary because we need to make a correction for Jean-Zay and to have a revision without these changes to go into IPSLCM6.1.10.

File:

• LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

@@ -331 +331 @@
     !======================================================================
     LOGICAL, SAVE :: ok_volcan ! pour activer les diagnostics volcaniques
-    !$OMP THREADPRIVATE(ok_volcan)
-    INTEGER, SAVE :: flag_volc_surfstrat ! pour imposer le cool/heat rate à la surf/strato
-    !$OMP THREADPRIVATE(flag_volc_surfstrat)
     LOGICAL ok_cvl  ! pour activer le nouveau driver pour convection KE
     PARAMETER (ok_cvl=.TRUE.)
     LOGICAL ok_gust ! pour activer l'effet des gust sur flux surface
     PARAMETER (ok_gust=.FALSE.)
-    INTEGER iflag_radia     ! active ou non le rayonnement (MPL)
-    SAVE iflag_radia
+    integer iflag_radia     ! active ou non le rayonnement (MPL)
+    save iflag_radia
     !$OMP THREADPRIVATE(iflag_radia)
     !======================================================================
@@ -1241 +1238 @@
             fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
             iflag_cld_th,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-            ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, &
+            ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, aerosol_couple, &
             chemistry_couple, flag_aerosol, flag_aerosol_strat,         &
             flag_aer_feedback, new_aod, &
@@ -3916 +3913 @@
                t_seri,q_seri,wo, &
                cldfrarad, cldemirad, cldtaurad, &
-               ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, ok_volcan, flag_volc_surfstrat, &
+               ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, ok_volcan, &
                flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                tau_aero, piz_aero, cg_aero, &
@@ -4002 +3999 @@
                      t_seri,q_seri,wo, &
                      cldfrarad, cldemirad, cldtaurad, &
-                     ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, ok_volcan, flag_volc_surfstrat, &
+                     ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie, ok_volcan, &
                      flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                      tau_aero, piz_aero, cg_aero, &