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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -1241 +1241 @@
       READ  ( numnam_cfg, nameos, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nameos in configuration namelist', lwp )
-      IF(lwm) WRITE( numond, nameos )
+      IF(lwm .AND. nprint > 2) WRITE( numond, nameos )
       !
       rau0        = 1026._wp                 !: volumic mass of reference     [kg/m3]
@@ -1258 +1258 @@
             WRITE(numout,*) '             model does not use Conservative Temperature'
          ENDIF
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -1272 +1273 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          use of TEOS-10 equation of state (cons. temp. and abs. salinity)'
+         IF(lwp .AND. lflush) CALL flush(numout)
          !
          rdeltaS = 32._wp
@@ -1462 +1464 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          use of EOS-80 equation of state (pot. temp. and pract. salinity)'
+         IF(lwp .AND. lflush) CALL flush(numout)
          !
          rdeltaS = 20._wp
@@ -1662 +1665 @@
             WRITE(numout,*) '             2nd cabbel. coef.     rn_nu      = ', rn_nu
             WRITE(numout,*) '               Caution: rn_beta0=0 incompatible with ddm parameterization '
+            IF(lflush) CALL flush(numout)
          ENDIF
          !
@@ -1681 +1685 @@
       IF(lwp) WRITE(numout,*) '          rau0 * rcp                       rau0_rcp = ', rau0_rcp
       IF(lwp) WRITE(numout,*) '          1. / ( rau0 * rcp )           r1_rau0_rcp = ', r1_rau0_rcp
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
    END SUBROUTINE eos_init