Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

Timestamp:

2020-03-13T17:33:02+01:00 (4 years ago)

Author:

charris

Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 ​svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

File:

• branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) (8 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -1214 +1214 @@
          IF(lwp) WRITE(numout,*) 'tra_kpp : KPP non-local tracer fluxes'
          IF(lwp) WRITE(numout,*) '~~~~~~~   '
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -1286 +1287 @@
          IF(lwp) WRITE(numout,*) 'trc_kpp : KPP non-local tracer fluxes'
          IF(lwp) WRITE(numout,*) '~~~~~~~   '
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -1369 +1371 @@
       READ  ( numnam_cfg, namzdf_kpp, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_kpp in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namzdf_kpp )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namzdf_kpp )
 
       IF(lwp) THEN                    ! Control print
@@ -1384 +1386 @@
          WRITE(numout,*) '     max. mix. in interior convec.                 rn_difcon   = ', rn_difcon
          WRITE(numout,*) '     horizontal average flag                       nn_ave      = ', nn_ave
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -1410 +1413 @@
          ENDIF
       ENDIF
+    
+      IF(lwp .AND. lflush) CALL flush(numout)
       
 
@@ -1421 +1426 @@
          WRITE(numout,*) '     Constant value for unreso. turbul. velocity shear Vtc = ', Vtc
          WRITE(numout,*) '     Non-dimensional coef. for nonlocal transport      rcg = ', rcg
+         IF(lflush) CALL flush(numout)
        ENDIF
 
@@ -1438 +1444 @@
          IF(lwp) WRITE(numout,*) '          no horizontal average on avt, avmu, avmv'
          IF(lwp) WRITE(numout,*) '          only in very high horizontal resolution !'
+         IF(lwp .AND. lflush) CALL flush(numout)
          ! weighting mean arrays etmean, eumean and evmean
          !           ( 1  1 )                                          ( 1 )
@@ -1464 +1471 @@
       CASE ( 1 )                ! horizontal average 
          IF(lwp) WRITE(numout,*) '          horizontal average on avt, avmu, avmv'
+         IF(lwp .AND. lflush) CALL flush(numout)
          ! weighting mean arrays etmean, eumean and evmean
          !           ( 1/2  1  1/2 )              ( 1/2  1/2 )             ( 1/2  1  1/2 )