Changeset 3630 for LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

Timestamp:

Feb 10, 2020, 11:04:40 AM (4 years ago)

Author:

Laurent Fairhead

Message:

Parameter new_aod is not needed anymore as it is assumed to be true
all the time. This means that we cannot replay AR4 simulations with new
LMDZ sources (we probably couldn't anyway)
LF, OB

File:

• LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -21 +21 @@
    tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,& ! rajoute par OB pour RRTM
    tau_aero_lw_rrtm, &                                   ! rajoute par C. Kleinschmitt pour RRTM
-   cldtaupi, new_aod, &
+   cldtaupi, &
    qsat, flwc, fiwc, &
    ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &
@@ -222 +222 @@
 
   REAL,    INTENT(in)  :: cldtaupi(KLON,KLEV)                            ! cloud optical thickness for pre-industrial aerosol concentrations
-  LOGICAL, INTENT(in)  :: new_aod                                        ! flag pour retrouver les resultats exacts de l'AR4 dans le cas ou l'on ne travaille qu'avec les sulfates
   REAL,    INTENT(in)  :: qsat(klon,klev) ! Variable pour iflag_rrtm=1
   REAL,    INTENT(in)  :: flwc(klon,klev) ! Variable pour iflag_rrtm=1
@@ -652 +651 @@
 !     print *,'Avant SW_LMDAR4: PSCT zrmu0 zfract',PSCT, zrmu0, zfract
        ! daylight ozone, if we have it, for short wave
-       IF (.NOT. new_aod) THEN 
-          ! use old version
-          CALL SW_LMDAR4(PSCT, zrmu0, zfract,&
-               PPMB, PDP, &
-               PPSOL, PALBD, PALBP,&
-               PTAVE, PWV, PQS, POZON(:, :, size(wo, 3)), PAER,&
-               PCLDSW, PTAU, POMEGA, PCG,&
-               zheat, zheat0,&
-               zalbpla,ztopsw,zsolsw,ztopsw0,zsolsw0,&
-               ZFSUP,ZFSDN,ZFSUP0,ZFSDN0,&
-               tauaero(:,:,5,:), pizaero(:,:,5,:), cgaero(:,:,5,:),& 
-               PTAUA, POMEGAA,&
-               ztopswadaero,zsolswadaero,&
-               ztopswaiaero,zsolswaiaero,& 
-               ok_ade, ok_aie) 
-          
-       ELSE ! new_aod=T         
-          CALL SW_AEROAR4(PSCT, zrmu0, zfract,&
+      CALL SW_AEROAR4(PSCT, zrmu0, zfract,&
                PPMB, PDP,&
                PPSOL, PALBD, PALBP,&
@@ -686 +668 @@
                ztopswcf_aero,zsolswcf_aero, & 
                ok_ade, ok_aie, flag_aerosol,flag_aerosol_strat) 
-       ENDIF
 
        ZSWFT0_i(:,:) = ZFSDN0(:,:)-ZFSUP0(:,:)