Changeset 9343

Timestamp:

2018-02-21T16:52:13+01:00 (7 years ago)

Author:

acc

Message:

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

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90

@@ -401 +401 @@
       REAL(wp) ::   zbot, zpyc, zcri   ! local scalars
       !!
-      NAMELIST/namzdf_iwm_new/ nn_zpyc, ln_mevar, ln_tsdiff
+      NAMELIST/namzdf_iwm/ nn_zpyc, ln_mevar, ln_tsdiff
       !!----------------------------------------------------------------------
       !
       REWIND( numnam_ref )              ! Namelist namzdf_iwm in reference namelist : Wave-driven mixing
-      READ  ( numnam_ref, namzdf_iwm_new, IOSTAT = ios, ERR = 901)
+      READ  ( numnam_ref, namzdf_iwm, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namzdf_iwm in reference namelist', lwp )
       !
       REWIND( numnam_cfg )              ! Namelist namzdf_iwm in configuration namelist : Wave-driven mixing
-      READ  ( numnam_cfg, namzdf_iwm_new, IOSTAT = ios, ERR = 902 )
+      READ  ( numnam_cfg, namzdf_iwm, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namzdf_iwm in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namzdf_iwm_new )
+      IF(lwm) WRITE ( numond, namzdf_iwm )
       !
       IF(lwp) THEN                  ! Control print
@@ -417 +417 @@
          WRITE(numout,*) 'zdf_iwm_init : internal wave-driven mixing'
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '   Namelist namzdf_iwm_new : set wave-driven mixing parameters'
+         WRITE(numout,*) '   Namelist namzdf_iwm : set wave-driven mixing parameters'
          WRITE(numout,*) '      Pycnocline-intensified diss. scales as N (=1) or N^2 (=2) = ', nn_zpyc
          WRITE(numout,*) '      Variable (T) or constant (F) mixing efficiency            = ', ln_mevar