Changeset 2895 for LMDZ5/trunk


Ignore:
Timestamp:
May 30, 2017, 5:56:34 PM (7 years ago)
Author:
fhourdin
Message:

Correction pour l'option ... 11 de la conservation de l'energie.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/phylmd/ener_conserv.F90

    r2894 r2895  
    127127   ELSEIF (iflag_ener_conserv==11) THEN
    128128      d_t(:,:)=d_t_vdf(:,:)
    129       d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)+d_u_oro(:,:)+d_u_lif(:,:) &
    130    &  +du_gwd_hines(:,:)+du_gwd_front(:,:)+du_gwd_rando(:,:)
    131       d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)+d_v_oro(:,:)+d_v_lif(:,:) &
    132    &     +dv_gwd_hines(:,:)+dv_gwd_front(:,:)+dv_gwd_rando(:,:)
     129      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)+d_u_oro(:,:)+d_u_lif(:,:)
     130      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)+d_v_oro(:,:)+d_v_lif(:,:)
     131      IF (ok_hines) THEN
     132         d_u_vdf(:,:)=d_u_vdf(:,:)+du_gwd_hines(:,:)
     133         d_v_vdf(:,:)=d_v_vdf(:,:)+dv_gwd_hines(:,:)
     134      ENDIF
     135      IF (.not. ok_hines .and. ok_gwd_rando) THEN
     136         d_u_vdf(:,:)=d_u_vdf(:,:)+du_gwd_front(:,:)
     137         d_v_vdf(:,:)=d_v_vdf(:,:)+dv_gwd_front(:,:)
     138      ENDIF
     139      IF (ok_gwd_rando) THEN
     140         d_u_vdf(:,:)=d_u_vdf(:,:)+du_gwd_rando(:,:)
     141         d_v_vdf(:,:)=d_v_vdf(:,:)+dv_gwd_rando(:,:)
     142      ENDIF
    133143   ELSE
    134144      abort_message = 'iflag_ener_conserv non prevu'
Note: See TracChangeset for help on using the changeset viewer.