Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/thermcell_dq.F90

    r1999 r2408  
    11      subroutine thermcell_dq(ngrid,nlay,impl,ptimestep,fm,entr,  &
    22     &           masse,q,dq,qa,lev_out)
     3      USE print_control_mod, ONLY: prt_level
    34      implicit none
    45
    5 #include "iniprint.h"
    66!=======================================================================
    77!
     
    5555               print*,'entr*dt>m,1',k,entr(ig,k)*ptimestep,masse(ig,k)
    5656               abort_message = 'entr dt > m, 1st'
    57                CALL abort_gcm (modname,abort_message,1)
     57               CALL abort_physic (modname,abort_message,1)
    5858            endif
    5959         enddo
     
    152152      subroutine thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
    153153     &           masse,q,dq,qa,lev_out)
     154      USE print_control_mod, ONLY: prt_level
    154155      implicit none
    155156
    156 #include "iniprint.h"
    157157!=======================================================================
    158158!
     
    196196               print*,'entr*dt>m,2',k,entr(ig,k)*ptimestep,masse(ig,k)
    197197               abort_message = 'entr dt > m, 2nd'
    198                CALL abort_gcm (modname,abort_message,1)
     198               CALL abort_physic (modname,abort_message,1)
    199199            endif
    200200         enddo
Note: See TracChangeset for help on using the changeset viewer.