Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/ener_conserv.F90

    r3356 r3411  
    222222      DO k=1,klev
    223223        bils_ec(:)=bils_ec(:)-d_t_ec(:,k)*masse(:,k)
     224        bils_tke(:)=bils_tke(:)+0.5*(dtke(:,k)+dtke(:,k+1))*masse(:,k)
    224225        bils_diss(:)=bils_diss(:)-d_t_diss(:,k)*masse(:,k)
    225226        bils_kinetic(:)=bils_kinetic(:)+masse(:,k)* &
    … …  
    234235      ENDDO
    235236      bils_ec(:)=rcpd*bils_ec(:)/pdtphys
     237      bils_tke(:)=bils_tke(:)/pdtphys
    236238      bils_diss(:)=rcpd*bils_diss(:)/pdtphys
    237239      bils_kinetic(:)= 0.5*bils_kinetic(:)/pdtphys
    238240      bils_enthalp(:)=rcpd*bils_enthalp(:)/pdtphys
    239241      bils_latent(:)=rlvtt*bils_latent(:)/pdtphys
    240 !jyg<
    241       IF (iflag_pbl > 1) THEN
    242         DO k=1,klev
    243           bils_tke(:)=bils_tke(:)+0.5*(dtke(:,k)+dtke(:,k+1))*masse(:,k)
    244         ENDDO
    245         bils_tke(:)=bils_tke(:)/pdtphys
    246       ENDIF  ! (iflag_pbl > 1)
    247 !>jyg
    248242
    249243IF (iflag_ener_conserv>=1) THEN
Note: See TracChangeset for help on using the changeset viewer.