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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -275 +275 @@
             !
             IF( sd(jf)%ln_tint ) THEN              ! temporal interpolation
-               IF(lwp .AND. kt - nit000 <= 100 ) THEN 
+               IF(lwp .AND. nprint > 1 ) THEN 
                   clfmt = "('fld_read: var ', a, ' kt = ', i8, ' (', f9.4,' days), Y/M/D = ', i4.4,'/', i2.2,'/', i2.2," //   &
                      &    "', records b/a: ', i6.4, '/', i6.4, ' (days ', f9.4,'/', f9.4, ')')"
@@ -281 +281 @@
                      & sd(jf)%nrec_b(1), sd(jf)%nrec_a(1), REAL(sd(jf)%nrec_b(2),wp)/rday, REAL(sd(jf)%nrec_a(2),wp)/rday
                   WRITE(numout, *) 'it_offset is : ',it_offset
+                  IF(lflush) CALL flush(numout)
                ENDIF
                ! temporal interpolation weights
@@ -288 +289 @@
                sd(jf)%fnow(:,:,:) = ztintb * sd(jf)%fdta(:,:,:,1) + ztinta * sd(jf)%fdta(:,:,:,2)
             ELSE   ! nothing to do...
-               IF(lwp .AND. kt - nit000 <= 100 ) THEN
+               IF(lwp .AND. nprint > 1 ) THEN
                   clfmt = "('fld_read: var ', a, ' kt = ', i8,' (', f9.4,' days), Y/M/D = ', i4.4,'/', i2.2,'/', i2.2," //   &
                      &    "', record: ', i6.4, ' (days ', f9.4, ' <-> ', f9.4, ')')"
                   WRITE(numout, clfmt) TRIM(sd(jf)%clvar), kt, REAL(isecsbc,wp)/rday, nyear, nmonth, nday,    &
                      &                 sd(jf)%nrec_a(1), REAL(sd(jf)%nrec_b(2),wp)/rday, REAL(sd(jf)%nrec_a(2),wp)/rday
+                  IF(lflush) CALL flush(numout)
                ENDIF
             ENDIF
@@ -414 +416 @@
 
          clfmt = "('fld_init : time-interpolation for ', a, ' read previous record = ', i6, ' at time = ', f7.2, ' days')"
-         IF(lwp) WRITE(numout, clfmt) TRIM(sdjf%clvar), sdjf%nrec_a(1), REAL(sdjf%nrec_a(2),wp)/rday
+         IF(lwp .AND. nprint > 0) THEN
+            WRITE(numout, clfmt) TRIM(sdjf%clvar), sdjf%nrec_a(1), REAL(sdjf%nrec_a(2),wp)/rday
+         ENDIF
 
       ENDIF
@@ -708 +712 @@
       IF(lwp) WRITE(numout,*) 'Dim size for ',TRIM(clvar),' is ', ilendta
       IF(lwp) WRITE(numout,*) 'Number of levels for ',TRIM(clvar),' is ', ipk
+      IF(lwp .AND. lflush) CALL flush(numout)
 
       SELECT CASE( ipk )
@@ -779 +784 @@
                      END DO
                      sd(ju)%rotn(jn) = .TRUE.               ! vector was rotated 
-                     IF( lwp .AND. kt == nit000 )   WRITE(numout,*)   &
+                     IF( lwp .AND. kt == nit000 )   THEN
+                        WRITE(numout,*)   &
                         &   'fld_read: vector pair ('//TRIM(sd(ju)%clvar)//', '//TRIM(sd(iv)%clvar)//') rotated on to model grid'
+                        IF(lflush) CALL flush(numout)
+                     ENDIF
                   ENDIF
                ENDIF
@@ -941 +949 @@
                &                          ' data type: '      ,       sdf(jf)%cltype      ,   &
                &                          ' land/sea mask:'   , TRIM( sdf(jf)%lsmname    )
-            call flush(numout)
          END DO
+         IF(lflush) CALL flush(numout)
       ENDIF
       
@@ -1000 +1008 @@
       !!----------------------------------------------------------------------
       !
-      DO kw = 1, nxt_wgt-1
-         WRITE(numout,*) 'weight file:  ',TRIM(ref_wgts(kw)%wgtname)
-         WRITE(numout,*) '      ddims:  ',ref_wgts(kw)%ddims(1),ref_wgts(kw)%ddims(2)
-         WRITE(numout,*) '     numwgt:  ',ref_wgts(kw)%numwgt
-         WRITE(numout,*) '     jpiwgt:  ',ref_wgts(kw)%jpiwgt
-         WRITE(numout,*) '     jpjwgt:  ',ref_wgts(kw)%jpjwgt
-         WRITE(numout,*) '    botleft:  ',ref_wgts(kw)%botleft
-         WRITE(numout,*) '   topright:  ',ref_wgts(kw)%topright
-         IF( ref_wgts(kw)%cyclic ) THEN
-            WRITE(numout,*) '       cyclical'
-            IF( ref_wgts(kw)%overlap > 0 ) WRITE(numout,*) '              with overlap of ', ref_wgts(kw)%overlap
-         ELSE
-            WRITE(numout,*) '       not cyclical'
-         ENDIF
-         IF( ASSOCIATED(ref_wgts(kw)%data_wgt) )  WRITE(numout,*) '       allocated'
-      END DO
+      IF(nprint > 0) THEN
+         DO kw = 1, nxt_wgt-1
+            WRITE(numout,*) 'weight file:  ',TRIM(ref_wgts(kw)%wgtname)
+            IF(nprint > 1) THEN
+                WRITE(numout,*) '      ddims:  ',ref_wgts(kw)%ddims(1),ref_wgts(kw)%ddims(2)
+                WRITE(numout,*) '     numwgt:  ',ref_wgts(kw)%numwgt
+                WRITE(numout,*) '     jpiwgt:  ',ref_wgts(kw)%jpiwgt
+                WRITE(numout,*) '     jpjwgt:  ',ref_wgts(kw)%jpjwgt
+                WRITE(numout,*) '    botleft:  ',ref_wgts(kw)%botleft
+                WRITE(numout,*) '   topright:  ',ref_wgts(kw)%topright
+                IF( ref_wgts(kw)%cyclic ) THEN
+                   WRITE(numout,*) '       cyclical'
+                   IF( ref_wgts(kw)%overlap > 0 ) WRITE(numout,*) '              with overlap of ', ref_wgts(kw)%overlap
+                ELSE
+                   WRITE(numout,*) '       not cyclical'
+                ENDIF
+                IF( ASSOCIATED(ref_wgts(kw)%data_wgt) )  WRITE(numout,*) '       allocated'
+            ENDIF
+         END DO
+ 
+        IF(lflush) CALL flush(numout)
+
+      ENDIF
       !
    END SUBROUTINE wgt_print