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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -154 +154 @@
       READ  ( numnam_cfg, nam_asminc, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_asminc in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, nam_asminc )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, nam_asminc )
 
       ! Control print
@@ -176 +176 @@
          WRITE(numout,*) '      Logical switch for ensuring that the sa > salfixmin      ln_salfix = ', ln_salfix
          WRITE(numout,*) '      Minimum salinity after applying the increments           salfixmin = ', salfixmin
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -221 +222 @@
          WRITE(numout,*) '       ditiaustr_date = ', ditiaustr_date
          WRITE(numout,*) '       ditiaufin_date = ', ditiaufin_date
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -334 +336 @@
              WRITE(numout,*) '         Time-integrated weight = ', ztotwgt
              WRITE(numout,*) '         ==================================='
+             IF(lflush) CALL flush(numout)
           ENDIF
          
@@ -546 +549 @@
       ENDIF
       !
+      IF(lflush) CALL flush(numout)
+
    END SUBROUTINE asm_inc_init
 
@@ -588 +593 @@
                WRITE(numout,*) 'tra_asm_inc : Tracer IAU at time step = ', kt,' with IAU weight = ', wgtiau(it)
                WRITE(numout,*) '~~~~~~~~~~~~'
+               IF(lflush) CALL flush(numout)
             ENDIF
 
@@ -717 +723 @@
                   &  kt,' with IAU weight = ', wgtiau(it)
                WRITE(numout,*) '~~~~~~~~~~~~'
+               IF(lflush) CALL flush(numout)
             ENDIF
 
@@ -793 +800 @@
                   &  kt,' with IAU weight = ', wgtiau(it)
                WRITE(numout,*) '~~~~~~~~~~~~'
+               IF(lflush) CALL flush(numout)
             ENDIF
 
@@ -883 +891 @@
                   &  kt,' with IAU weight = ', wgtiau(it)
                WRITE(numout,*) '~~~~~~~~~~~~'
+               IF(lflush) CALL flush(numout)
             ENDIF