Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

Timestamp:

2017-12-26T17:32:56+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: all SRC: finalize the removal of useless warning when reading namelist_cfg + remove all nn_closea + nn_msh replaced by a logical

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (7 diffs)

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

@@ -678 +678 @@
          WRITE(numout,*) '          type of tke penetration profile            nn_htau   = ', nn_htau
          WRITE(numout,*) '          fraction of TKE that penetrates            rn_efr    = ', rn_efr
-         WRITE(numout,*)
          IF( ln_drg ) THEN
+            WRITE(numout,*)
             WRITE(numout,*) '   Namelist namdrg_top/_bot:   used values:'
             WRITE(numout,*) '      top    ocean cavity roughness (m)          rn_z0(_top)= ', r_z0_top
@@ -685 +685 @@
          ENDIF
          WRITE(numout,*)
-         WRITE(numout,*)
-         WRITE(numout,*) '   ==>> critical Richardson nb with your parameters  ri_cri = ', ri_cri
+         WRITE(numout,*) '   ==>>   critical Richardson nb with your parameters  ri_cri = ', ri_cri
          WRITE(numout,*)
       ENDIF
@@ -693 +692 @@
          rn_emin  = 1.e-10_wp             ! specific values of rn_emin & rmxl_min are used
          rmxl_min = 1.e-03_wp             ! associated avt minimum = molecular salt diffusivity (10^-9 m2/s)
-         IF(lwp) WRITE(numout,*) '      Internal wave-driven mixing case:   force   rn_emin = 1.e-10 and rmxl_min = 1.e-3 '
+         IF(lwp) WRITE(numout,*) '   ==>>   Internal wave-driven mixing case:   force   rn_emin = 1.e-10 and rmxl_min = 1.e-3'
       ELSE                          ! standard case : associated avt minimum = molecular viscosity (10^-6 m2/s)
          rmxl_min = 1.e-6_wp / ( rn_ediff * SQRT( rn_emin ) )    ! resulting minimum length to recover molecular viscosity
-         IF(lwp) WRITE(numout,*) '      minimum mixing length with your parameters rmxl_min = ', rmxl_min
+         IF(lwp) WRITE(numout,*) '   ==>>   minimum mixing length with your parameters rmxl_min = ', rmxl_min
       ENDIF
       !
@@ -709 +708 @@
       !
       IF( ln_mxl0 ) THEN
-         IF(lwp) WRITE(numout,*) '   use a surface mixing length = F(stress) :   set rn_mxl0 = rmxl_min'
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) '   ==>>   use a surface mixing length = F(stress) :   set rn_mxl0 = rmxl_min'
          rn_mxl0 = rmxl_min
       ENDIF
@@ -763 +763 @@
                CALL iom_get( numror, jpdom_autoglo, 'dissl', dissl )
             ELSE                                          ! start TKE from rest
+               IF(lwp) WRITE(numout,*)
                IF(lwp) WRITE(numout,*) '   ==>>   previous run without TKE scheme, set en to background values'
                en   (:,:,:) = rn_emin * wmask(:,:,:)
@@ -769 +770 @@
             ENDIF
          ELSE                                   !* Start from rest
+            IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) '   ==>>   start from rest: set en to the background value'
             en   (:,:,:) = rn_emin * wmask(:,:,:)
@@ -777 +779 @@
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
          !                                   ! -------------------
-         IF(lwp) WRITE(numout,*) '---- tke-rst ----'
+         IF(lwp) WRITE(numout,*) '---- tke_rst ----'
          CALL iom_rstput( kt, nitrst, numrow, 'en'   , en    )
          CALL iom_rstput( kt, nitrst, numrow, 'avt_k', avt_k )