Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

Timestamp:

2020-03-13T17:33:02+01:00 (4 years ago)

Author:

charris

Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 ​svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

File:

• branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) (9 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

@@ -61 +61 @@
                                             ! values and warn if they're out of Range
       INTEGER, DIMENSION(3) ::   ilocu      ! 
-      INTEGER, DIMENSION(2) ::   ilocs      ! 
+      INTEGER, DIMENSION(2) ::   ilocs      !
+      LOGICAL                ::   ll_wrtstp, ll_colruns, ll_wrtruns
       !!----------------------------------------------------------------------
-
+      ll_wrtstp  = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
+      ll_colruns = ll_wrtstp .AND. ( ln_ctl .OR. sn_cfctl%l_runstat )
+      ll_wrtruns = ll_colruns .AND. lwm
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
          WRITE(numout,*) 'stp_ctl : time-stepping control'
          WRITE(numout,*) '~~~~~~~'
+         IF(lflush) CALL flush(numout)
          ! open time.step file with special treatment for SAS
          IF ( nn_components == jp_iam_sas ) THEN
@@ -74 +78 @@
             clfname = 'time.step'
          ENDIF
-         CALL ctl_opn( numstp, TRIM(clfname), 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
-      ENDIF
-
-      IF(lwp) WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp
-      IF(lwp) REWIND( numstp )                       !  --------------------------
+         IF( lwm ) &
+     &    CALL ctl_opn( numstp, TRIM(clfname), 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
+      ENDIF
+
+      IF(lwm .AND. ll_wrtstp) THEN
+         WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp
+         REWIND( numstp )                       !  --------------------------
+      ENDIF
 
       !                                              !* Test maximum of velocity (zonal only)
@@ -93 +100 @@
       IF( lk_mpp )   CALL mpp_max( zumax )                 ! max over the global domain
       !
-      IF( MOD( kt, nwrite ) == 1 .AND. lwp )   WRITE(numout,*) ' ==>> time-step= ',kt,' abs(U) max: ', zumax
+      IF( ll_colruns )   THEN
+         WRITE(numout,*) ' ==>> time-step= ',kt,' abs(U) max: ', zumax
+         IF(lflush) CALL flush(numout)
+      ENDIF
       !
       IF( zumax > 20.e0 ) THEN
@@ -111 +121 @@
             WRITE(numout,*)
             WRITE(numout,*) '          output of last fields in numwso'
+            IF(lflush) CALL flush(numout)
          ENDIF
          kindic = -3
@@ -127 +138 @@
       IF( lk_mpp )   CALL mpp_min( zsmin )                ! min over the global domain
       !
-      IF( MOD( kt, nwrite ) == 1 .AND. lwp )   WRITE(numout,*) ' ==>> time-step= ',kt,' SSS min:', zsmin
+      IF( MOD( kt, nwrite ) == 1 .AND. lwp )   THEN
+         WRITE(numout,*) ' ==>> time-step= ',kt,' SSS min:', zsmin
+         IF(lflush) CALL flush(numout)
+      ENDIF
       !
       IF( zsmin < 0.) THEN 
@@ -182 +196 @@
             WRITE(numout,9600) kt, ztmax, ii, ij
             WRITE(numout,*) 'stp_ctl:tracer anomaly: ***** END OF WARNING *****'
+            IF(lflush) CALL flush(numout)
          ENDIF
       ENDIF
@@ -199 +214 @@
             WRITE(numout,9700) kt, ztmin, ii, ij
             WRITE(numout,*) 'stp_ctl:tracer anomaly: ***** END OF WARNING *****'
+            IF(lflush) CALL flush(numout)
          ENDIF
       ENDIF
@@ -212 +228 @@
       IF( lk_dynspg_flt ) THEN      ! elliptic solver statistics (if required)
          !
-         IF(lwp) WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps       ! Solver
+         IF(ll_wrtruns) THEN
+            WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps       ! Solver
+            IF(lflush) CALL flush(numsol)
+         ENDIF
          !
          IF( kindic < 0 .AND. zsmin > 0.e0 .AND. zumax <= 20.e0 ) THEN   ! create a abort file if problem found 
@@ -222 +241 @@
                WRITE(numout,*) ' stpctl: output of last fields'
                WRITE(numout,*) ' ======  '
+               IF(lflush) CALL flush(numout)
             ENDIF
          ENDIF
          !
       ELSE                                   !* ssh statistics (and others...)
-         IF( kt == nit000 .AND. lwp ) THEN   ! open ssh statistics file (put in solver.stat file)
+         IF( kt == nit000 .AND. lwm ) THEN   ! open ssh statistics file (put in solver.stat file)
             CALL ctl_opn( numsol, 'solver.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
          ENDIF
          !
-         zssh2 = SUM( sshn(:,:) * sshn(:,:) * tmask_i(:,:) )
-         IF( lk_mpp )   CALL mpp_sum( zssh2 )      ! sum over the global domain
-         !
-         IF(lwp) WRITE(numsol,9300) kt, zssh2, zumax, zsmin      ! ssh statistics
+         IF( ll_colruns ) THEN
+            zssh2 = SUM( sshn(:,:) * sshn(:,:) * tmask_i(:,:) )
+            IF( lk_mpp )   CALL mpp_sum( zssh2 )      ! sum over the global domain
+         !
+            WRITE(numsol,9300) kt, zssh2, zumax, zsmin      ! ssh statistics
+            IF(lflush) CALL flush(numsol)
+         ENDIF
          !
       ENDIF