Ignore:
Timestamp:
Jun 11, 2014, 3:46:46 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1997:2055 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/thermcell.h

    r1910 r2056  
    99      real,parameter     :: r_aspect_thermals=2.,l_mix_thermals=30.
    1010      real               :: alp_bl_k
    11       real               :: tau_thermals
     11      real               :: tau_thermals,fact_thermals_ed_dz
    1212      integer,parameter  :: w2di_thermals=0
    1313      integer            :: isplit
    1414
    1515      integer            :: iflag_coupl,iflag_clos,iflag_wake
    16       integer            :: iflag_thermals_ed,iflag_thermals_optflux
     16      integer            :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
    1717
    18       common/ctherm1/iflag_thermals,nsplit_thermals
    19       common/ctherm2/tau_thermals,alp_bl_k
     18      common/ctherm1/iflag_thermals,nsplit_thermals,iflag_thermals_closure
     19      common/ctherm2/tau_thermals,alp_bl_k,fact_thermals_ed_dz
    2020      common/ctherm4/iflag_coupl,iflag_clos,iflag_wake
    2121      common/ctherm5/iflag_thermals_ed,iflag_thermals_optflux
Note: See TracChangeset for help on using the changeset viewer.