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

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90

@@ -65 +65 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
       IF(lwp) WRITE(numout,*) '           jpnfl = ',jpnfl
+      IF(lwp .AND. lflush) CALL flush(numout)
       
       !-------------------------!
@@ -72 +73 @@
 
          IF(lwp) WRITE(numout,*) '        float restart file read'
+         IF(lwp .AND. lflush) CALL flush(numout)
          
          ! open the restart file 
@@ -93 +95 @@
 
             IF(lwp) WRITE(numout,*) '        add new floats'
+            IF(lwp .AND. lflush) CALL flush(numout)
 
             IF( ln_ariane )THEN  !Add new floats with ariane convention
@@ -148 +151 @@
       DO jfl = kfl_start,kfl_end
          READ(inum,*) flxx(jfl),flyy(jfl),flzz(jfl), nisobfl(jfl),ngrpfl(jfl),itrash
-         if(lwp)write(numout,*)'read:',jfl,flxx(jfl),flyy(jfl),flzz(jfl), nisobfl(jfl),ngrpfl(jfl),itrash ; call flush(numout)
+         IF (lwp) THEN
+            write(numout,*)'read:',jfl,flxx(jfl),flyy(jfl),flzz(jfl), nisobfl(jfl),ngrpfl(jfl),itrash
+            IF(lflush) CALL flush(numout)
+         ENDIF
       END DO
       CLOSE(inum)
@@ -275 +281 @@
                IF(lwp) WRITE(numout,*)'geographical position',flxx(jfl),flyy(jfl),flzz(jfl)
                IF(lwp) WRITE(numout,*)'index position',tpifl(jfl),tpjfl(jfl),tpkfl(jfl)
+               IF(lwp .AND. lflush) CALL flush(numout)
             ENDIF
          END DO