Changeset 1669 for LMDZ5/branches/testing/libf/phylmd/radlwsw.F90

Timestamp:

Oct 16, 2012, 2:41:50 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1668

http://lmdz.lmd.jussieu.fr/utilisateurs/distribution-du-modele/versions-intermediaires

---

Testing release based on r1668

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/radlwsw.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/radlwsw.F90

@@ -10 +10 @@
    t,q,wo,&
    cldfra, cldemi, cldtaupd,&
-   ok_ade, ok_aie,&
+   ok_ade, ok_aie, flag_aerosol,&
    tau_aero, piz_aero, cg_aero,&
    cldtaupi, new_aod, &
@@ -56 +56 @@
   ! ok_ade---input-L- apply the Aerosol Direct Effect or not?
   ! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
+  ! flag_aerosol-input-I- aerosol flag from 0 to 6
   ! tau_ae, piz_ae, cg_ae-input-R- aerosol optical properties (calculated in aeropt.F)
   ! cldtaupi-input-R- epaisseur optique des nuages dans le visible
@@ -119 +120 @@
 
   LOGICAL, INTENT(in)  :: ok_ade, ok_aie                                 ! switches whether to use aerosol direct (indirect) effects or not
+  INTEGER, INTENT(in)  :: flag_aerosol                                   ! takes value 0 (no aerosol) or 1 to 6 (aerosols)
   REAL,    INTENT(in)  :: cldfra(KLON,KLEV), cldemi(KLON,KLEV), cldtaupd(KLON,KLEV)
   REAL,    INTENT(in)  :: tau_aero(KLON,KLEV,9,2)                        ! aerosol optical properties (see aeropt.F)
@@ -354 +356 @@
                zalbpla,ztopsw,zsolsw,ztopsw0,zsolsw0,&
                ZFSUP,ZFSDN,ZFSUP0,ZFSDN0,&
-               tau_aero(:,:,5,:), piz_aero(:,:,5,:), cg_aero(:,:,5,:),& 
+               tauaero(:,:,5,:), pizaero(:,:,5,:), cgaero(:,:,5,:),& 
                PTAUA, POMEGAA,&
                ztopswadaero,zsolswadaero,&
                ztopswaiaero,zsolswaiaero,& 
-               ok_ade, ok_aie) 
+               ok_ade, ok_aie, flag_aerosol) 
           
        ELSE ! new_aod=T         
@@ -377 +379 @@
                zsolsw_aero,zsolsw0_aero,&
                ztopswcf_aero,zsolswcf_aero, & 
-               ok_ade, ok_aie) 
-          
+               ok_ade, ok_aie, flag_aerosol) 
        ENDIF