Changeset 11101 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2019-06-11T16:10:28+02:00 (5 years ago)

Author:

frrh

Message:

Merge changes from Met Office GMED ticket 450 to reduce unnecessary
text output from NEMO.
This output, which is typically not switchable, is rarely of interest
in normal (non-debugging) runs and simply redunantley consumes extra
file space.
Further, the presence of this text output has been shown to
significantly degrade performance of models which are run during
Met Office HPC RAID (disk) checks.
The new code introduces switches which are configurable via the
changes made in the associated Met Office MOCI ticket 399.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (9 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -133 +133 @@
       IF(lwp) WRITE(numout,*) 'dom_vvl_init : Variable volume activated'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
+      IF(lwp .AND. lflush) CALL flush(numout)
 
       ! choose vertical coordinate (z_star, z_tilde or layer)
@@ -292 +293 @@
          IF(lwp) WRITE(numout,*) 'dom_vvl_sf_nxt : compute after scale factors'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~'
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -483 +485 @@
       IF( ln_vvl_dbg .AND. .NOT. ll_do_bclinic ) THEN   ! - ML - test: control prints for debuging
          !
-         IF( lwp ) WRITE(numout, *) 'kt =', kt
+         IF( lwp .AND. nprint > 2) WRITE(numout, *) 'kt =', kt
          IF ( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN
             z_tmax = MAXVAL( tmask(:,:,1) * tmask_i(:,:) * ABS( zht(:,:) ) )
@@ -525 +527 @@
          IF( lk_mpp ) CALL mpp_max( z_tmax )                                ! max over the global domain
          IF( lwp    ) WRITE(numout, *) kt,' MAXVAL(abs(ssha))) =', z_tmax
+         IF(lflush) CALL flush(numout)
       END IF
 
@@ -593 +596 @@
          IF(lwp) WRITE(numout,*) 'dom_vvl_sf_swp : - time filter and swap of scale factors'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~   - interpolate scale factors and compute depths for next time step'
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -866 +870 @@
                neuler = 0
             ENDIF
+            !
+            IF(lwp .AND. lflush) CALL flush(numout)
             !                             ! ----------- !
             IF( ln_vvl_zstar ) THEN       ! z_star case !
@@ -907 +913 @@
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
          !                                   ! ===================
-         IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----'
+         IF(lwp .AND. nprint > 0) WRITE(numout,*) '---- dom_vvl_rst ----'
          !                                           ! --------- !
          !                                           ! all cases !
@@ -955 +961 @@
       READ  ( numnam_cfg, nam_vvl, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_vvl in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, nam_vvl )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, nam_vvl )
 
       IF(lwp) THEN                    ! Namelist print
@@ -1008 +1014 @@
          ! IF(       ln_vvl_kepe ) WRITE(numout,*) '              kinetic to potential energy transfer : option used'
          ! IF( .NOT. ln_vvl_kepe ) WRITE(numout,*) '              kinetic to potential energy transfer : option not used'
+         IF(lflush) CALL flush(numout)
       ENDIF