Ignore:
Timestamp:
Nov 29, 2019, 9:25:41 AM (5 years ago)
Author:
jghattas
Message:

Put back changes done in commit [3604] which were removed temporary in commit [3607].

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/radlwsw_m.F90

    r3607 r3609  
    1616   t,q,wo,&
    1717   cldfra, cldemi, cldtaupd,&
    18    ok_ade, ok_aie, ok_volcan, flag_aerosol,&
     18   ok_ade, ok_aie, ok_volcan, flag_volc_surfstrat, flag_aerosol,&
    1919   flag_aerosol_strat, flag_aer_feedback, &
    2020   tau_aero, piz_aero, cg_aero,&
     
    102102  ! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
    103103  ! ok_volcan-input-L- activate volcanic diags (SW heat & LW cool rate, SW & LW flux)
     104  ! flag_volc_surfstrat-input-I- activate volcanic surf cooling or strato heating (or nothing)
    104105  ! flag_aerosol-input-I- aerosol flag from 0 to 6
    105106  ! flag_aerosol_strat-input-I- use stratospheric aerosols flag (0, 1, 2)
     
    200201  LOGICAL, INTENT(in)  :: ok_volcan                                      ! produce volcanic diags (SW/LW heat flux and rate)
    201202  LOGICAL              :: lldebug
     203  INTEGER, INTENT(in)  :: flag_volc_surfstrat                            ! allow to impose volcanic cooling rate at surf or heating in strato
    202204  INTEGER, INTENT(in)  :: flag_aerosol                                   ! takes value 0 (no aerosol) or 1 to 6 (aerosols)
    203205  INTEGER, INTENT(in)  :: flag_aerosol_strat                             ! use stratospheric aerosols
     
    319321  REAL(KIND=8) zswadaero(kdlon,kflev+1)                       ! SW Aerosol direct forcing
    320322  REAL(KIND=8) zlwadaero(kdlon,kflev+1)                       ! LW Aerosol direct forcing
     323!-- VolMIP
     324  REAL(KIND=8) volmip_solsw(kdlon) ! SW clear sky in the case of VOLMIP
    321325!-LW by CK
    322326  REAL(KIND=8) ztoplwadaero(kdlon), zsollwadaero(kdlon)     ! LW Aerosol direct forcing at TOAand surface
     
    875879         ZTOPLWAIAERO,ZSOLLWAIAERO, &
    876880         ZLWADAERO, & !--NL
     881         volmip_solsw, flag_volc_surfstrat, & !--VOLMIP
    877882         ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, &
    878883         flag_aer_feedback) ! flags aerosols
     
    10251030!     print*,'OK2'
    10261031
     1032!!--add VOLMIP (surf cool or strat heat activate)
     1033      IF (flag_volc_surfstrat > 0) THEN
     1034         DO i = 1, kdlon
     1035            zsolsw(i)    = volmip_solsw(i)*fract(i)
     1036         ENDDO
     1037      ENDIF
     1038
    10271039! extrait de SW_AR4
    10281040!     DO k = 1, KFLEV
Note: See TracChangeset for help on using the changeset viewer.