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

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90

@@ -106 +106 @@
 
 
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'ldf_dyn_smag : 3D lateral eddy viscosity coefficient'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
-     
+         IF(lwp) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'ldf_dyn_smag : 3D lateral eddy viscosity coefficient'
+            WRITE(numout,*) '~~~~~~~~~~~'
+            IF(lflush) CALL flush(numout)
+         ENDIF
+
       ENDIF
       
@@ -172 +175 @@
 
          ENDDO ! jpk
-            ahm1(:,:,jpk) = ahm1(:,:,jpkm1)
-            ahm2(:,:,jpk) = ahm2(:,:,jpkm1)
-            IF(lwp.and.kt==nit000) WRITE(numout,'(36x," ahm ", 7x)')
+
+         ahm1(:,:,jpk) = ahm1(:,:,jpkm1)
+         ahm2(:,:,jpk) = ahm2(:,:,jpkm1)
+
+         IF(lwp.and.kt==nit000) THEN
+            WRITE(numout,'(36x," ahm ", 7x)') 
+            IF(lflush) CALL flush(numout)
+         ENDIF
+
+         IF(lwp.and.kt==nit000) THEN
             DO jk = 1, jpk
-
-               IF(lwp.and.kt==nit000) WRITE(numout,'(30x,E10.2,8x,i3)') ahm1(jpi/2,jpj/2,jk), jk
+               WRITE(numout,'(30x,E10.2,8x,i3)') ahm1(jpi/2,jpj/2,jk), jk
             END DO
+            IF(lflush) CALL flush(numout)
+         ENDIF
+
       CALL lbc_lnk( ahm1, 'T', 1. )   ! Lateral boundary conditions on ( ahtt )
       CALL lbc_lnk( ahm2, 'F', 1. )   ! Lateral boundary conditions on ( ahtt )
@@ -245 +257 @@
             ahm4(:,:,jpk) = ahm4(:,:,jpkm1)
 
-      DO jk = 1, jpk
-      IF(  kt == nit000 ) THEN
-
-               IF(lwp) WRITE(numout,'(30x,E10.2,8x,i3)') ahm3(jpi/2,jpj/2,jk), jk
+      IF(  kt == nit000 .AND. lwp) THEN
+         DO jk = 1, jpk
+               WRITE(numout,'(30x,E10.2,8x,i3)') ahm3(jpi/2,jpj/2,jk), jk
+               IF(lflush) CALL flush(numout)
+         END DO
       ENDIF   
-      END DO
+
       CALL lbc_lnk( ahm3, 'U', 1. )   ! Lateral boundary conditions
       CALL lbc_lnk( ahm4, 'V', 1. )
@@ -269 +282 @@
       IF( lk_mpp )   CALL mpp_max( zdeltat )                 ! max over the global domain
       !
-      IF( MOD( kt, nwrite ) == 1 .AND. lwp )   WRITE(numout,*) ' ==>> time-step= ',kt,'dynlap:  abs(ahm) max: ', zdeltat
+      IF( MOD( kt, nwrite ) == 1 .AND. lwp )  THEN
+         WRITE(numout,*) ' ==>> time-step= ',kt,'dynlap:  abs(ahm) max: ', zdeltat
+         IF(lflush) CALL flush(numout)
+      ENDIF
     ENDIF
     If(ln_dynldf_bilap)THEN
@@ -282 +298 @@
       IF( lk_mpp )   CALL mpp_max( zdeltat )                 ! max over the global domain
       !
-      IF( MOD( kt, nwrite ) == 1 .AND. lwp )   WRITE(numout,*) ' ==>> time-step= ',kt,'dyn_bilap abs(ahm) max: ', zdeltat
+      IF( MOD( kt, nwrite ) == 1 .AND. lwp )  THEN
+         WRITE(numout,*) ' ==>> time-step= ',kt,'dyn_bilap abs(ahm) max: ', zdeltat
+         IF(lflush) CALL flush(numout)
+      ENDIF
       !
    ENDIF