Changeset 3607 for LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/conf_phys_m.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/conf_phys_m.F90 (modified) (8 diffs)

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

@@ -17 +17 @@
        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, &
@@ -64 +64 @@
     ! bl95_b*: parameters in the formula to link CDNC to aerosol mass conc 
     ! ok_volcan: activate volcanic diags (SW heat & LW cool rate, SW & LW flux)
-    ! flag_volc_surfstrat: VolMIP flag, activate forcing surface cooling rate (=1), strato heating rate (=2) or nothing (=0, default)
     !
 
@@ -78 +77 @@
     INTEGER              :: flag_aerosol
     INTEGER              :: flag_aerosol_strat
-    INTEGER              :: flag_volc_surfstrat !VolMIP flag for surf/strat runs
     LOGICAL              :: flag_aer_feedback
     LOGICAL              :: flag_bc_internal_mixture
@@ -101 +99 @@
     INTEGER, SAVE       :: flag_aerosol_omp
     INTEGER, SAVE       :: flag_aerosol_strat_omp
-    INTEGER, SAVE       :: flag_volc_surfstrat_omp !VolMIP flag for surf/strat runs
     LOGICAL, SAVE       :: flag_aer_feedback_omp
     LOGICAL, SAVE       :: flag_bc_internal_mixture_omp
@@ -410 +407 @@
 
     !
-    !Config Key  = flag_volc_surfstrat
-    !Config Desc = impose cooling rate at the surface (=1), 
-    !              heating rate in the strato (=2), or nothing (=0)
-    !Config Def  = 0
-    !Config Help = Used in radlwsw_m.F
-    !
-    flag_volc_surfstrat_omp = 0
-    CALL getin('flag_volc_surfstrat', flag_volc_surfstrat_omp)
-    
-    !
     !Config Key  = aerosol_couple
     !Config Desc = read aerosol in file or calcul by inca
@@ -2317 +2304 @@
     ok_cdnc = ok_cdnc_omp
     ok_volcan = ok_volcan_omp
-    flag_volc_surfstrat=flag_volc_surfstrat_omp
     aerosol_couple = aerosol_couple_omp
     chemistry_couple = chemistry_couple_omp
@@ -2536 +2522 @@
     IF (flag_bc_internal_mixture .AND. flag_aerosol.NE.6) THEN 
        CALL abort_physic('conf_phys', 'flag_bc_internal_mixture can only be activated with flag_aerosol=6',1)
-    ENDIF
-
-    IF (flag_volc_surfstrat.LT.0.OR.flag_volc_surfstrat.GT.2) THEN
-       CALL abort_physic('conf_phys', 'flag_volc_surfstrat can only be 0 1 or 2',1)
     ENDIF
 
@@ -2655 +2637 @@
     WRITE(lunout,*)' ok_ade = ',ok_ade
     WRITE(lunout,*)' ok_volcan = ',ok_volcan
-    WRITE(lunout,*)' flag_volc_surfstrat = ',flag_volc_surfstrat
     WRITE(lunout,*)' ok_aie = ',ok_aie
     WRITE(lunout,*)' ok_alw = ',ok_alw