Changeset 10770 for branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

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

Author:

andmirek

Message:

GMED 450 changes for writing to numout

Location:

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• daymod.F90 (modified) (2 diffs)
• domcfg.F90 (modified) (1 diff)
• domvvl.F90 (modified) (2 diffs)
• dtatsd.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -253 +253 @@
          CALL ymds2ju( nyear, 01, 01, 0.0, fjulstartyear )
          !
-         IF(lwp) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt,   &
+         IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt,   &
               &   '      New day, DATE Y/M/D = ', nyear, '/', nmonth, '/', nday, '      nday_year = ', nday_year
-         IF(lwp) WRITE(numout,'(a,i8,a,i7,a,i5)') '         nsec_year = ', nsec_year,   &
+         IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i8,a,i7,a,i5)') '         nsec_year = ', nsec_year,   &
               &   '   nsec_month = ', nsec_month, '   nsec_day = ', nsec_day, '   nsec_week = ', nsec_week
       ENDIF
@@ -357 +357 @@
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN
          !
-         IF( kt == nitrst ) THEN
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) 'rst_write : write oce restart file  kt =', kt
-            IF(lwp) WRITE(numout,*) '~~~~~~~'
+         IF( kt == nitrst .AND. lwp .AND. nprint > 0) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'rst_write : write oce restart file  kt =', kt
+            WRITE(numout,*) '~~~~~~~'
          ENDIF
          ! calendar control

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90

@@ -105 +105 @@
         mj1(jj) = MAX( 0, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj   ) )
       END DO
-      IF(lwp) THEN                   ! control print
+      IF(lwp .AND. nprint > 0) THEN                   ! control print
          WRITE(numout,*)
          WRITE(numout,*) 'dom_glo : domain: data / local '

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -483 +483 @@
       IF( ln_vvl_dbg .AND. .NOT. ll_do_bclinic ) THEN   ! - ML - test: control prints for debuging
          !
-         IF( lwp ) WRITE(numout, *) 'kt =', kt
+         IF( lwp .AND. nprint > 2) WRITE(numout, *) 'kt =', kt
          IF ( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN
             z_tmax = MAXVAL( tmask(:,:,1) * tmask_i(:,:) * ABS( zht(:,:) ) )
@@ -907 +907 @@
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
          !                                   ! ===================
-         IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----'
+         IF(lwp .AND. nprint > 0) WRITE(numout,*) '---- dom_vvl_rst ----'
          !                                           ! --------- !
          !                                           ! all cases !

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

@@ -275 +275 @@
       ENDIF
       !
-      IF( lwp .AND. kt == nit000 ) THEN
+      IF( lwp .AND. kt == nit000 .AND. nprint > 1) THEN
          WRITE(numout,*) ' temperature Levitus '
          WRITE(numout,*)