Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/rrtm/radlsw.F90

    r2056 r2160  
    1111 & PFRSOD,PSUDU , PUVDF, PPARF, PPARCF, PTINCF,&
    1212 & PSFSWDIR, PSFSWDIF,PFSDNN,PFSDNV ,& 
    13  & LRDUST,PPIZA_DST,PCGA_DST,PTAUREL_DST,PFLUX,PFLUC,&
    14  & PFSDN ,PFSUP , PFSCDN , PFSCUP)
     13 & LRDUST,PPIZA_DST,PCGA_DST,PTAUREL_DST,&
     14 & PTAU_LW,&
     15 & PFLUX,PFLUC,PFSDN ,PFSUP , PFSCDN , PFSCUP)
    1516
    1617use write_field_phy
     
    5758! PCGA_DST   : (KPROMA,KLEV,NSW); Assymetry factor for dust
    5859! PTAUREL_DST: (KPROMA,KLEV,NSW); Optical depth of dust relative to at 550nm
     60! PTAU_LW  (KPROMA,KLEV,NLW); LW Optical depth of aerosols
    5961! PREF_LIQ (KPROMA,KLEV)        ; Liquid droplet radius (um)
    6062! PREF_ICE (KPROMA,KLEV)        ; Ice crystal radius (um)
     
    127129!USE YOERAD   , ONLY : NSW      ,LRRTM    ,LCCNL    ,LCCNO, LDIFFC, &
    128130! NSW mis dans .def MPL 20140211
    129 USE YOERAD   , ONLY : LRRTM    ,LCCNL    ,LCCNO, LDIFFC, &
     131USE YOERAD   , ONLY : NLW, LRRTM    ,LCCNL    ,LCCNO, LDIFFC, &
    130132 & NRADIP , NRADLP , NICEOPT, NLIQOPT, NINHOM ,NLAYINH ,&
    131133 & RCCNLND, RCCNSEA, RLWINHF, RSWINHF, RRe2De ,& 
     
    154156
    155157include "clesphys.h"
     158!!include "clesrrtm.h"
    156159include "YOETHF.h"
    157160INTEGER(KIND=JPIM),INTENT(IN)    :: KLON
     
    192195REAL(KIND=JPRB)   ,INTENT(IN)    :: PCGA_DST(KLON,KLEV,NSW)
    193196REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAUREL_DST(KLON,KLEV,NSW)
     197!--C.Kleinschmitt
     198REAL(KIND=JPRB)   ,INTENT(IN)    :: PTAU_LW(KLON,KLEV,NLW)
     199!--end
    194200REAL(KIND=JPRB)   ,INTENT(IN)    :: PREF_LIQ(KLON,KLEV)
    195201REAL(KIND=JPRB)   ,INTENT(IN)    :: PREF_ICE(KLON,KLEV)
     
    11011107     & PTS   , PTH   , PT,&
    11021108     & ZEMIS , ZEMIW,&
    1103      & PQ    , PCCO2 , ZOZN  , ZCLDSW  , ZTAUCLD,&
    1104      & ZEMIT , PFLUX , PFLUC , ZTCLEAR &
    1105      & ) 
     1109     & PQ    , PCCO2 , ZOZN  ,&
     1110     & ZCLDSW  , ZTAUCLD,&
     1111     & PTAU_LW,&
     1112     & ZEMIT , PFLUX , PFLUC , ZTCLEAR )
    11061113    print *,'RADLSW: apres CALL RRTM_RRTM_140GP'
    11071114
Note: See TracChangeset for help on using the changeset viewer.