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

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/rrtm/recmwf_aero.F90

@@ -36 +36 @@
  & PTOPLWAIAERO,PSOLLWAIAERO,&
  & PLWADAERO,& !--NL
-!--ajout volmip 
- & volmip_solsw, flag_volc_surfstrat,&
 !..end
  & ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat,flag_aer_feedback)
@@ -260 +258 @@
 REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCDN(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux down
 REAL(KIND=JPRB)   ,INTENT(OUT)   :: PFLCCUP(KPROMA,KLEV+1) ! LW clear sky clean (no aerosol) flux up
-!--ajout VOLMIP
-REAL(KIND=JPRB)   ,INTENT(OUT)   :: volmip_solsw(KPROMA) ! SW clear sky in the case of VOLMIP
-INTEGER, INTENT(IN)              :: flag_volc_surfstrat !--VOlMIP Modif
 
 !     ==== COMPUTED IN RADITE ===
@@ -799 +794 @@
 ENDIF
 
-!--VolMIP Strat/Surf
-!--only ok_ade + ok_aie case treated
-IF (ok_ade.AND.ok_aie.AND.ok_volcan) THEN
-   !--in this case the fluxes used for the heating rates come from case 4 but SW surface radiation is kept from case 2
-   IF (flag_volc_surfstrat.EQ.2) THEN ! STRAT HEATING
-      volmip_solsw(:)= ZFSDN_AERO(:,1,2)-ZFSUP_AERO(:,1,2)
-   ELSEIF (flag_volc_surfstrat.EQ.1) THEN ! SURF COOLING
-      !--in this case the fluxes used for the heating rates come from case 2 but SW surface radiation is kept from case 4
-      PFSUP(:,:) =    ZFSUP_AERO(:,:,2)
-      PFSDN(:,:) =    ZFSDN_AERO(:,:,2)
-      PFSCUP(:,:) =   ZFSUP0_AERO(:,:,2)
-      PFSCDN(:,:) =   ZFSDN0_AERO(:,:,2)
-      PFLUX(:,1,:) =  LWUP_AERO(:,:,2)
-      PFLUX(:,2,:) =  LWDN_AERO(:,:,2)
-      PFLUC(:,1,:) =  LWDN0_AERO(:,:,2) 
-      PFLUC(:,2,:) =  LWDN0_AERO(:,:,2)
-      volmip_solsw(:)= ZFSDN_AERO(:,1,4)-ZFSUP_AERO(:,1,4)
-   ENDIF
-ENDIF
-!--End VolMIP Strat/Surf
-
 IF (swaerofree_diag) THEN
 ! copy shortwave clear-sky clean (no aerosol) case