Changeset 9343


Ignore:
Timestamp:
2018-02-21T16:52:13+01:00 (2 years ago)
Author:
acc
Message:

Branch 2017/dev_merge_2017. Correct mis-named namelist in zdfiwm.F90 (#2027)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90

    r9125 r9343  
    401401      REAL(wp) ::   zbot, zpyc, zcri   ! local scalars 
    402402      !! 
    403       NAMELIST/namzdf_iwm_new/ nn_zpyc, ln_mevar, ln_tsdiff 
     403      NAMELIST/namzdf_iwm/ nn_zpyc, ln_mevar, ln_tsdiff 
    404404      !!---------------------------------------------------------------------- 
    405405      ! 
    406406      REWIND( numnam_ref )              ! Namelist namzdf_iwm in reference namelist : Wave-driven mixing 
    407       READ  ( numnam_ref, namzdf_iwm_new, IOSTAT = ios, ERR = 901) 
     407      READ  ( numnam_ref, namzdf_iwm, IOSTAT = ios, ERR = 901) 
    408408901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namzdf_iwm in reference namelist', lwp ) 
    409409      ! 
    410410      REWIND( numnam_cfg )              ! Namelist namzdf_iwm in configuration namelist : Wave-driven mixing 
    411       READ  ( numnam_cfg, namzdf_iwm_new, IOSTAT = ios, ERR = 902 ) 
     411      READ  ( numnam_cfg, namzdf_iwm, IOSTAT = ios, ERR = 902 ) 
    412412902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namzdf_iwm in configuration namelist', lwp ) 
    413       IF(lwm) WRITE ( numond, namzdf_iwm_new ) 
     413      IF(lwm) WRITE ( numond, namzdf_iwm ) 
    414414      ! 
    415415      IF(lwp) THEN                  ! Control print 
     
    417417         WRITE(numout,*) 'zdf_iwm_init : internal wave-driven mixing' 
    418418         WRITE(numout,*) '~~~~~~~~~~~~' 
    419          WRITE(numout,*) '   Namelist namzdf_iwm_new : set wave-driven mixing parameters' 
     419         WRITE(numout,*) '   Namelist namzdf_iwm : set wave-driven mixing parameters' 
    420420         WRITE(numout,*) '      Pycnocline-intensified diss. scales as N (=1) or N^2 (=2) = ', nn_zpyc 
    421421         WRITE(numout,*) '      Variable (T) or constant (F) mixing efficiency            = ', ln_mevar 
Note: See TracChangeset for help on using the changeset viewer.