New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5260 for branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 – NEMO

Ignore:
Timestamp:
2015-05-12T12:37:15+02:00 (9 years ago)
Author:
deazer
Message:

Merged branch with Trunk at revision 5253.
Checked with SETTE, passes modified iodef.xml for AMM12 experiment

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90

    r4624 r5260  
    117117      IF( ioptio == 0 .OR. ioptio > 1 .AND. .NOT. lk_esopa )   & 
    118118         &   CALL ctl_stop( ' one and only one vertical diffusion option has to be defined ' ) 
     119      IF( ( lk_zdfric .OR. lk_zdfgls .OR. lk_zdfkpp ) .AND. ln_isfcav )   & 
     120         &   CALL ctl_stop( ' only zdfcst and zdftke were tested with ice shelves cavities ' ) 
    119121      ! 
    120122      !                               ! ... Convection 
    121123      IF(lwp) WRITE(numout,*) 
    122124      IF(lwp) WRITE(numout,*) '   convection :' 
     125      ! 
     126      IF( ln_zdfnpc )   CALL ctl_stop( ' zdf_init: non penetrative convective scheme is not working',   & 
     127         &                                       ' set ln_zdfnpc to FALSE' ) 
     128      ! 
    123129      ioptio = 0 
    124130      IF( ln_zdfnpc ) THEN 
Note: See TracChangeset for help on using the changeset viewer.