Changeset 11101 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.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/dommsk.F90 (modified) (7 diffs)

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

@@ -157 +157 @@
       READ  ( numnam_cfg, namlbc, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlbc in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namlbc )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namlbc )
       
       IF(lwp) THEN                  ! control print
@@ -514 +514 @@
       ! CAUTION : The fmask may be further modified in dyn_vor_init ( dynvor.F90 )
             
-      IF( nprint == 1 .AND. lwp ) THEN      ! Control print
+      IF( nprint > 3 .AND. lwp ) THEN      ! Control print
          imsk(:,:) = INT( tmask_i(:,:) )
          WRITE(numout,*) ' tmask_i : '
@@ -561 +561 @@
       CALL wrk_dealloc( jpi, jpj, imsk )
       CALL wrk_dealloc( jpi, jpj, zwf  )
+      !
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
       IF( nn_timing == 1 )  CALL timing_stop('dom_msk')
@@ -640 +642 @@
                   nicoa(inw,1,jk) = ji
                   njcoa(inw,1,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' west  : ', jk, inw, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' west  : ', jk, inw, ji, jj
                ENDIF
                zaa = tmask(ji,jj,jk) + tmask(ji,jj+1,jk)
@@ -647 +649 @@
                   nicoa(ine,2,jk) = ji
                   njcoa(ine,2,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' east  : ', jk, ine, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' east  : ', jk, ine, ji, jj
                ENDIF
             END DO
@@ -667 +669 @@
                   nicoa(ins,3,jk) = ji
                   njcoa(ins,3,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' south : ', jk, ins, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' south : ', jk, ins, ji, jj
                ENDIF
                zaa = tmask(ji+1,jj,jk) + tmask(ji,jj,jk)
@@ -674 +676 @@
                   nicoa(inn,4,jk) = ji
                   njcoa(inn,4,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' north : ', jk, inn, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' north : ', jk, inn, ji, jj
                ENDIF
             END DO