Changeset 10770 for branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

Timestamp:

2019-03-15T17:03:41+01:00 (5 years ago)

Author:

andmirek

Message:

GMED 450 changes for writing to numout

File:

• branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/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, ')')"
@@ -288 +288 @@
                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, ')')"
@@ -414 +414 @@
 
          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) WRITE(numout, clfmt) TRIM(sdjf%clvar), sdjf%nrec_a(1), REAL(sdjf%nrec_a(2),wp)/rday
 
       ENDIF
@@ -941 +941 @@
                &                          ' data type: '      ,       sdf(jf)%cltype      ,   &
                &                          ' land/sea mask:'   , TRIM( sdf(jf)%lsmname    )
-            call flush(numout)
+            IF(nprint > 4) call flush(numout)
          END DO
       ENDIF
@@ -1000 +1000 @@
       !!----------------------------------------------------------------------
       !
-      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
+      ENDIF
       !
    END SUBROUTINE wgt_print