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 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 – NEMO

Ignore:
Timestamp:
2013-11-04T12:51:55+01:00 (10 years ago)
Author:
cetlod
Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

    r3802 r4147  
    4545   PUBLIC   dyn_vor_init   ! routine called by opa.F90 
    4646 
    47    !                                             !!* Namelist namdyn_vor: vorticity term 
    48    LOGICAL, PUBLIC ::   ln_dynvor_ene = .FALSE.   !: energy conserving scheme 
    49    LOGICAL, PUBLIC ::   ln_dynvor_ens = .TRUE.    !: enstrophy conserving scheme 
    50    LOGICAL, PUBLIC ::   ln_dynvor_mix = .FALSE.   !: mixed scheme 
    51    LOGICAL, PUBLIC ::   ln_dynvor_een = .FALSE.   !: energy and enstrophy conserving scheme 
     47   !                                   !!* Namelist namdyn_vor: vorticity term 
     48   LOGICAL, PUBLIC ::   ln_dynvor_ene   !: energy conserving scheme 
     49   LOGICAL, PUBLIC ::   ln_dynvor_ens   !: enstrophy conserving scheme 
     50   LOGICAL, PUBLIC ::   ln_dynvor_mix   !: mixed scheme 
     51   LOGICAL, PUBLIC ::   ln_dynvor_een   !: energy and enstrophy conserving scheme 
    5252 
    5353   INTEGER ::   nvor = 0   ! type of vorticity trend used 
     
    710710      INTEGER ::   ioptio          ! local integer 
    711711      INTEGER ::   ji, jj, jk      ! dummy loop indices 
     712      INTEGER ::   ios             ! Local integer output status for namelist read 
    712713      !! 
    713714      NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een 
    714715      !!---------------------------------------------------------------------- 
    715716 
    716       REWIND ( numnam )               ! Read Namelist namdyn_vor : Vorticity scheme options 
    717       READ   ( numnam, namdyn_vor ) 
     717      REWIND( numnam_ref )              ! Namelist namdyn_vor in reference namelist : Vorticity scheme options 
     718      READ  ( numnam_ref, namdyn_vor, IOSTAT = ios, ERR = 901) 
     719901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_vor in reference namelist', lwp ) 
     720 
     721      REWIND( numnam_cfg )              ! Namelist namdyn_vor in configuration namelist : Vorticity scheme options 
     722      READ  ( numnam_cfg, namdyn_vor, IOSTAT = ios, ERR = 902 ) 
     723902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_vor in configuration namelist', lwp ) 
     724      WRITE ( numond, namdyn_vor ) 
    718725 
    719726      IF(lwp) THEN                    ! Namelist print 
     
    721728         WRITE(numout,*) 'dyn_vor_init : vorticity term : read namelist and control the consistency' 
    722729         WRITE(numout,*) '~~~~~~~~~~~~' 
    723          WRITE(numout,*) '        Namelist namdyn_vor : oice of the vorticity term scheme' 
     730         WRITE(numout,*) '        Namelist namdyn_vor : choice of the vorticity term scheme' 
    724731         WRITE(numout,*) '           energy    conserving scheme                ln_dynvor_ene = ', ln_dynvor_ene 
    725732         WRITE(numout,*) '           enstrophy conserving scheme                ln_dynvor_ens = ', ln_dynvor_ens 
Note: See TracChangeset for help on using the changeset viewer.