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 5075 for branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OFF_SRC/domain.F90 – NEMO

Ignore:
Timestamp:
2015-02-11T11:50:34+01:00 (9 years ago)
Author:
timgraham
Message:

Upgraded branch to current head of trunk (r5072) so it can be used with the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OFF_SRC/domain.F90

    r4811 r5075  
    337337      INTEGER ::   ios 
    338338      !! 
    339       NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco 
     339      NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco, ln_isfcav 
    340340      !!---------------------------------------------------------------------- 
    341341 
     
    354354         WRITE(numout,*) '~~~~~~~' 
    355355         WRITE(numout,*) '          Namelist namzgr : set vertical coordinate' 
    356          WRITE(numout,*) '             z-coordinate - full steps      ln_zco = ', ln_zco 
    357          WRITE(numout,*) '             z-coordinate - partial steps   ln_zps = ', ln_zps 
    358          WRITE(numout,*) '             s- or hybrid z-s-coordinate    ln_sco = ', ln_sco 
     356         WRITE(numout,*) '             z-coordinate - full steps      ln_zco    = ', ln_zco 
     357         WRITE(numout,*) '             z-coordinate - partial steps   ln_zps    = ', ln_zps 
     358         WRITE(numout,*) '             s- or hybrid z-s-coordinate    ln_sco    = ', ln_sco 
     359         WRITE(numout,*) '             ice shelf cavity               ln_isfcav = ', ln_isfcav 
    359360      ENDIF 
    360361 
     
    363364      IF( ln_zps ) ioptio = ioptio + 1 
    364365      IF( ln_sco ) ioptio = ioptio + 1 
    365       IF ( ioptio /= 1 )   CALL ctl_stop( ' none or several vertical coordinate options used' ) 
     366      IF( ln_isfcav ) ioptio = 33 
     367      IF ( ioptio /= 1  )   CALL ctl_stop( ' none or several vertical coordinate options used' ) 
     368      IF ( ioptio == 33 )   CALL ctl_stop( ' isf cavity with off line module not yet done    ' ) 
    366369 
    367370   END SUBROUTINE dom_zgr 
Note: See TracChangeset for help on using the changeset viewer.