Changeset 10986 for NEMO/branches/UKMO/NEMO_4.0_mirror_text_diagnostics/src/OCE/ZDF/zdfosm.F90

Timestamp:

2019-05-16T15:23:56+02:00 (5 years ago)

Author:

andmirek

Message:

GMED 462 add flush

File:

• NEMO/branches/UKMO/NEMO_4.0_mirror_text_diagnostics/src/OCE/ZDF/zdfosm.F90 (modified) (11 diffs)

NEMO/branches/UKMO/NEMO_4.0_mirror_text_diagnostics/src/OCE/ZDF/zdfosm.F90

@@ -1418 +1418 @@
         WRITE(numout,*) '     Use large mixing below BL when unstable       ln_convmix = ', ln_convmix
         WRITE(numout,*) '     diffusivity when unstable below BL     (m2/s) rn_difconv = ', rn_difconv
+        IF(lflush) CALL FLUSH(numout)
      ENDIF
 
@@ -1430 +1431 @@
            WRITE(numout,*) '    Double diffusion mixing on temperature and salinity '
            WRITE(numout,*) '    CAUTION : done in routine zdfosm, not in routine zdfddm '
+           IF(lflush) CALL FLUSH(numout)
         ENDIF
      ENDIF
@@ -1439 +1441 @@
      IF(lwp) THEN
         WRITE(numout,*)
+        IF(lflush) CALL FLUSH(numout)
      ENDIF
 
@@ -1495 +1498 @@
 
      END SELECT
-
+     IF(lwp .AND. lflush) CALL FLUSH(numout)
      ! Initialization of vertical eddy coef. to the background value
      ! -------------------------------------------------------------
@@ -1546 +1549 @@
         IF( id1 > 0 ) THEN                       ! 'wn' exists; read
            CALL iom_get( numror, jpdom_autoglo, 'wn', wn, ldxios = lrxios )
-           WRITE(numout,*) ' ===>>>> :  wn read from restart file'
+           IF(lwp) THEN
+              WRITE(numout,*) ' ===>>>> :  wn read from restart file'
+              IF(lflush) CALL FLUSH(numout)
+           ENDIF
         ELSE
            wn(:,:,:) = 0._wp
-           WRITE(numout,*) ' ===>>>> :  wn not in restart file, set to zero initially'
+           IF(lwp) THEN
+              WRITE(numout,*) ' ===>>>> :  wn not in restart file, set to zero initially'
+              IF(lflush) CALL FLUSH(numout)
+           ENDIF
         END IF
         id1 = iom_varid( numror, 'hbl'   , ldstop = .FALSE. )
@@ -1556 +1565 @@
            CALL iom_get( numror, jpdom_autoglo, 'hbl' , hbl , ldxios = lrxios )
            CALL iom_get( numror, jpdom_autoglo, 'hbli', hbli, ldxios = lrxios  )
-           WRITE(numout,*) ' ===>>>> :  hbl & hbli read from restart file'
+           IF(lwp) THEN
+              WRITE(numout,*) ' ===>>>> :  hbl & hbli read from restart file'
+              IF(lflush) CALL FLUSH(numout)
+           ENDIF
            RETURN
         ELSE                      ! 'hbl' & 'hbli' not in restart file, recalculate
-           WRITE(numout,*) ' ===>>>> : previous run without osmosis scheme, hbl computed from stratification'
+           IF(lwp) THEN
+              WRITE(numout,*) ' ===>>>> : previous run without osmosis scheme, hbl computed from stratification'
+              IF(lflush) CALL FLUSH(numout)
+           ENDIF
         END IF
      END IF
@@ -1567 +1582 @@
      !!-----------------------------------------------------------------------------
      IF( TRIM(cdrw) == 'WRITE') THEN     !* Write hbli into the restart file, then return
-        IF(lwp) WRITE(numout,*) '---- osm-rst ----'
+         IF(lwp .AND. nprint > 0) THEN
+            WRITE(numout,*) '---- osm-rst ----'
+            IF(lflush) CALL FLUSH(numout)
+         ENDIF
          CALL iom_rstput( kt, nitrst, numrow, 'wn'     , wn  , ldxios = lwxios )
          CALL iom_rstput( kt, nitrst, numrow, 'hbl'    , hbl , ldxios = lwxios )
@@ -1577 +1595 @@
      ! Getting hbl, no restart file with hbl, so calculate from surface stratification
      !!-----------------------------------------------------------------------------
-     IF( lwp ) WRITE(numout,*) ' ===>>>> : calculating hbl computed from stratification'
+     IF( lwp ) THEN
+        WRITE(numout,*) ' ===>>>> : calculating hbl computed from stratification'
+        IF(lflush) CALL FLUSH(numout)
+     ENDIF
      ALLOCATE( imld_rst(jpi,jpj) )
      ! w-level of the mixing and mixed layers
@@ -1606 +1627 @@
      hbli(:,:) = hbl(:,:)
      DEALLOCATE( imld_rst )
-     WRITE(numout,*) ' ===>>>> : hbl computed from stratification'
+     IF(lwp) THEN
+        WRITE(numout,*) ' ===>>>> : hbl computed from stratification'
+        IF(lflush) CALL FLUSH(numout)
+     ENDIF
    END SUBROUTINE osm_rst
 
@@ -1623 +1647 @@
       INTEGER :: ji, jj, jk
       !
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'tra_osm : OSM non-local tracer fluxes'
-         IF(lwp) WRITE(numout,*) '~~~~~~~   '
+      IF( kt == nit000 .AND. lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'tra_osm : OSM non-local tracer fluxes'
+         WRITE(numout,*) '~~~~~~~   '
+         IF(lflush) CALL FLUSH(numout)
       ENDIF
 
@@ -1698 +1723 @@
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'dyn_osm : OSM non-local velocity'
-         IF(lwp) WRITE(numout,*) '~~~~~~~   '
+      IF( kt == nit000 .AND. lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dyn_osm : OSM non-local velocity'
+         WRITE(numout,*) '~~~~~~~   '
+         IF(lflush) CALL FLUSH(numout)
       ENDIF
       !code saving tracer trends removed, replace with trdmxl_oce