Ignore:
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:
1 edited

Legend:

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

    r3604 r3607  
    3636 & PTOPLWAIAERO,PSOLLWAIAERO,&
    3737 & PLWADAERO,& !--NL
    38 !--ajout volmip
    39  & volmip_solsw, flag_volc_surfstrat,&
    4038!..end
    4139 & ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat,flag_aer_feedback)
     
    260258REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCDN(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux down
    261259REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCUP(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux up
    262 !--ajout VOLMIP
    263 REAL(KIND=JPRB)   ,INTENT(OUT)   :: volmip_solsw(KPROMA) ! SW clear sky in the case of VOLMIP
    264 INTEGER, INTENT(IN)              :: flag_volc_surfstrat !--VOlMIP Modif
    265260
    266261!     ==== COMPUTED IN RADITE ===
     
    799794ENDIF
    800795
    801 !--VolMIP Strat/Surf
    802 !--only ok_ade + ok_aie case treated
    803 IF (ok_ade.AND.ok_aie.AND.ok_volcan) THEN
    804    !--in this case the fluxes used for the heating rates come from case 4 but SW surface radiation is kept from case 2
    805    IF (flag_volc_surfstrat.EQ.2) THEN ! STRAT HEATING
    806       volmip_solsw(:)= ZFSDN_AERO(:,1,2)-ZFSUP_AERO(:,1,2)
    807    ELSEIF (flag_volc_surfstrat.EQ.1) THEN ! SURF COOLING
    808       !--in this case the fluxes used for the heating rates come from case 2 but SW surface radiation is kept from case 4
    809       PFSUP(:,:) =    ZFSUP_AERO(:,:,2)
    810       PFSDN(:,:) =    ZFSDN_AERO(:,:,2)
    811       PFSCUP(:,:) =   ZFSUP0_AERO(:,:,2)
    812       PFSCDN(:,:) =   ZFSDN0_AERO(:,:,2)
    813       PFLUX(:,1,:) =  LWUP_AERO(:,:,2)
    814       PFLUX(:,2,:) =  LWDN_AERO(:,:,2)
    815       PFLUC(:,1,:) =  LWDN0_AERO(:,:,2)
    816       PFLUC(:,2,:) =  LWDN0_AERO(:,:,2)
    817       volmip_solsw(:)= ZFSDN_AERO(:,1,4)-ZFSUP_AERO(:,1,4)
    818    ENDIF
    819 ENDIF
    820 !--End VolMIP Strat/Surf
    821 
    822796IF (swaerofree_diag) THEN
    823797! copy shortwave clear-sky clean (no aerosol) case
Note: See TracChangeset for help on using the changeset viewer.