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

Timestamp:

Nov 29, 2019, 9:08:29 AM (4 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/radlwsw_m.F90 (modified) (6 diffs)

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

@@ -16 +16 @@
    t,q,wo,&
    cldfra, cldemi, cldtaupd,&
-   ok_ade, ok_aie, ok_volcan, flag_volc_surfstrat, flag_aerosol,&
+   ok_ade, ok_aie, ok_volcan, flag_aerosol,&
    flag_aerosol_strat, flag_aer_feedback, &
    tau_aero, piz_aero, cg_aero,&
@@ -102 +102 @@
   ! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
   ! ok_volcan-input-L- activate volcanic diags (SW heat & LW cool rate, SW & LW flux)
-  ! flag_volc_surfstrat-input-I- activate volcanic surf cooling or strato heating (or nothing)
   ! flag_aerosol-input-I- aerosol flag from 0 to 6
   ! flag_aerosol_strat-input-I- use stratospheric aerosols flag (0, 1, 2)
@@ -201 +200 @@
   LOGICAL, INTENT(in)  :: ok_volcan                                      ! produce volcanic diags (SW/LW heat flux and rate)
   LOGICAL              :: lldebug
-  INTEGER, INTENT(in)  :: flag_volc_surfstrat                            ! allow to impose volcanic cooling rate at surf or heating in strato
   INTEGER, INTENT(in)  :: flag_aerosol                                   ! takes value 0 (no aerosol) or 1 to 6 (aerosols)
   INTEGER, INTENT(in)  :: flag_aerosol_strat                             ! use stratospheric aerosols
@@ -321 +319 @@
   REAL(KIND=8) zswadaero(kdlon,kflev+1)                       ! SW Aerosol direct forcing
   REAL(KIND=8) zlwadaero(kdlon,kflev+1)                       ! LW Aerosol direct forcing
-!-- VolMIP
-  REAL(KIND=8) volmip_solsw(kdlon) ! SW clear sky in the case of VOLMIP
 !-LW by CK
   REAL(KIND=8) ztoplwadaero(kdlon), zsollwadaero(kdlon)     ! LW Aerosol direct forcing at TOAand surface
@@ -879 +875 @@
          ZTOPLWAIAERO,ZSOLLWAIAERO, &
          ZLWADAERO, & !--NL
-         volmip_solsw, flag_volc_surfstrat, & !--VOLMIP
          ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, &
          flag_aer_feedback) ! flags aerosols
@@ -1030 +1025 @@
 !     print*,'OK2'
 
-!!--add VOLMIP (surf cool or strat heat activate)
-      IF (flag_volc_surfstrat > 0) THEN
-         DO i = 1, kdlon
-            zsolsw(i)    = volmip_solsw(i)*fract(i)
-         ENDDO
-      ENDIF
-
 ! extrait de SW_AR4
 !     DO k = 1, KFLEV