Changeset 1537 for trunk/NEMO/OPA_SRC/ZDF/zdftmx.F90

Timestamp:

2009-07-24T16:22:23+02:00 (15 years ago)

Author:

ctlod

Message:

ensure the restartability of the 2nd order advection scheme,see ticket: 489

File:

• trunk/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -320 +320 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zpc      ! power consumption
       !!
-      NAMELIST/namtmx/ rn_htmx, rn_n2min, rn_tfe, rn_me, ln_tmx_itf, rn_tfe_itf
-      !!----------------------------------------------------------------------
-
-      IF(lwp) THEN
+      NAMELIST/nam_tmx/ rn_htmx, rn_n2min, rn_tfe, rn_me, ln_tmx_itf, rn_tfe_itf
+      !!----------------------------------------------------------------------
+
+      REWIND ( numnam )              ! Read Namelist namtmx : Tidal Mixing
+      READ   ( numnam, nam_tmx )
+
+      IF(lwp) THEN                   ! Control print
          WRITE(numout,*)
          WRITE(numout,*) 'zdf_tmx_init : tidal mixing'
          WRITE(numout,*) '~~~~~~~~~~~~'
+         WRITE(numout,*) '   Namelist namtmx : set tidal mixing parameters'
+         WRITE(numout,*) '      Vertical decay scale for turbulence   = ', rn_htmx 
+         WRITE(numout,*) '      Brunt-Vaisala frequency threshold     = ', rn_n2min
+         WRITE(numout,*) '      Tidal dissipation efficiency          = ', rn_tfe
+         WRITE(numout,*) '      Mixing efficiency                     = ', rn_me
+         WRITE(numout,*) '      ITF specific parameterisation         = ', ln_tmx_itf
+         WRITE(numout,*) '      ITF tidal dissipation efficiency      = ', rn_tfe_itf
       ENDIF
 
-      ! Read Namelist namtmx : Tidal Mixing
-      ! --------------------
-      REWIND ( numnam )
-      READ   ( numnam, namtmx )
-
-      ! Control print
-      IF(lwp) THEN
-         WRITE(numout,*) '          Namelist namtmx : set tidal mixing parameters'
-         WRITE(numout,*) '             Vertical decay scale for turbulence   = ', rn_htmx 
-         WRITE(numout,*) '             Brunt-Vaisala frequency threshold     = ', rn_n2min
-         WRITE(numout,*) '             Tidal dissipation efficiency          = ', rn_tfe
-         WRITE(numout,*) '             Mixing efficiency                     = ', rn_me
-         WRITE(numout,*) '             ITF specific parameterisation         = ', ln_tmx_itf
-         WRITE(numout,*) '             ITF tidal dissipation efficiency      = ', rn_tfe_itf
-         WRITE(numout,*)
-      ENDIF
-
-      IF( ln_tmx_itf ) THEN   ! read the Indonesian Through Flow mask
+      IF( ln_tmx_itf ) THEN          ! read the Indonesian Through Flow mask
          CALL iom_open('mask_itf',inum)
          CALL iom_get (inum, jpdom_data, 'tmaskitf',mask_itf,1) !