Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/SOL/solver.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/SOL/solver.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90

@@ -59 +59 @@
       !
 
-      IF(lwp) THEN                  !* open elliptic solver statistics file (only on the printing processors)
+      IF(lwp .AND. (ln_ctl .OR. sn_cfctl%l_runstat)) THEN  !* open elliptic solver statistics file (only on the printing processors)
          CALL ctl_opn( numsol, 'solver.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
       ENDIF
@@ -70 +70 @@
       READ  ( numnam_cfg, namsol, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsol in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namsol )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namsol )
 
       IF(lwp) THEN                  !* Control print
@@ -86 +86 @@
          WRITE(numout,*) '      optimal coefficient of sor         rn_sor     = ', rn_sor
          WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
       ENDIF
       eps = rn_eps
@@ -100 +101 @@
       CASE ( 1 )                          ! preconditioned conjugate gradient solver
          IF(lwp) WRITE(numout,*) '   a preconditioned conjugate gradient solver is used'
+         IF(lwp .AND. lflush) CALL flush(numout)
          IF( jpr2di /= 0 .AND. jpr2dj /= 0 )   CALL ctl_stop( ' jpr2di and jpr2dj should be equal to zero' )
          !
@@ -105 +107 @@
          IF(lwp) WRITE(numout,*) '   a successive-over-relaxation solver with extra outer halo is used'
          IF(lwp) WRITE(numout,*) '   with jpr2di =', jpr2di, ' and  jpr2dj =', jpr2dj
+         IF(lwp .AND. lflush) CALL flush(numout)
          IF( .NOT. lk_mpp .AND. jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
              CALL ctl_stop( 'jpr2di and jpr2dj are not equal to zero',   &