Ignore:
Timestamp:
Nov 29, 2019, 9:25:41 AM (4 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/rrtm/recmwf_aero.F90

    r3607 r3609  
    3636 & PTOPLWAIAERO,PSOLLWAIAERO,&
    3737 & PLWADAERO,& !--NL
     38!--ajout volmip
     39 & volmip_solsw, flag_volc_surfstrat,&
    3840!..end
    3941 & ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat,flag_aer_feedback)
     
    258260REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCDN(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux down
    259261REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCUP(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux up
     262!--ajout VOLMIP
     263REAL(KIND=JPRB)   ,INTENT(OUT)   :: volmip_solsw(KPROMA) ! SW clear sky in the case of VOLMIP
     264INTEGER, INTENT(IN)              :: flag_volc_surfstrat !--VOlMIP Modif
    260265
    261266!     ==== COMPUTED IN RADITE ===
     
    794799ENDIF
    795800
     801!--VolMIP Strat/Surf
     802!--only ok_ade + ok_aie case treated
     803IF (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
     819ENDIF
     820!--End VolMIP Strat/Surf
     821
    796822IF (swaerofree_diag) THEN
    797823! copy shortwave clear-sky clean (no aerosol) case
Note: See TracChangeset for help on using the changeset viewer.