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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

@@ -77 +77 @@
       READ  ( numnam_cfg, namtsd, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtsd in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namtsd )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namtsd )
 
       IF( PRESENT( ld_tradmp ) )   ln_tsd_tradmp = .TRUE.     ! forces the initialization when tradmp is used
@@ -93 +93 @@
             WRITE(numout,*) '   T & S data not used'
          ENDIF
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -216 +217 @@
             WRITE(numout,*)
             WRITE(numout,*) 'dta_tsd: interpolates T & S data onto the s- or mixed s-z-coordinate mesh'
+            IF(lflush) CALL flush(numout)
          ENDIF
          !
@@ -275 +277 @@
       ENDIF
       !
-      IF( lwp .AND. kt == nit000 ) THEN
+      IF( lwp .AND. kt == nit000 .AND. nprint > 1) THEN
          WRITE(numout,*) ' temperature Levitus '
          WRITE(numout,*)
@@ -294 +296 @@
          CALL prihre( ptsd(:,:,jpkm1,jp_sal), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
          WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -299 +302 @@
          !                                              (data used only for initialisation)
          IF(lwp) WRITE(numout,*) 'dta_tsd: deallocte T & S arrays as they are only use to initialize the run'
+         IF(lwp .AND. lflush) CALL flush(numout)
                                         DEALLOCATE( sf_tsd(jp_tem)%fnow )     ! T arrays in the structure
          IF( sf_tsd(jp_tem)%ln_tint )   DEALLOCATE( sf_tsd(jp_tem)%fdta )