Changeset 12060

Timestamp:

2019-12-05T09:36:39+01:00 (5 years ago)

Author:

andmirek

Message:

GMED 450 print only with lwp/lwm

Location:

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC

Files:

• ICB/icbclv.F90 (modified) (1 diff)
• stpctl.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90

@@ -69 +69 @@
       ! nn_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
       IF( nn_coupled_iceshelf_fluxes .gt. 0 ) THEN
-        ll_write = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend ) .AND. lwp
+        ll_write = ((MOD( kt, sn_cfctl%ptimincr ) == 0) .OR. ( kt == nitend )) .AND. lwp
         ! Adjust total calving rates so that sum of iceberg calving and iceshelf melting in the northern
         ! and southern hemispheres equals rate of increase of mass of greenland and antarctic ice sheets

branches/UKMO/dev_r5518_GO6_package_text_diagnostics/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

@@ -100 +100 @@
       IF( lk_mpp )   CALL mpp_max( zumax )                 ! max over the global domain
       !
-      IF( ll_colruns )   THEN
+      IF( ll_colruns .AND. lwp )   THEN
          WRITE(numout,*) ' ==>> time-step= ',kt,' abs(U) max: ', zumax
          IF(lflush) CALL flush(numout)
@@ -250 +250 @@
          ENDIF
          !
-         IF( ll_colruns ) THEN
+         IF( ll_wrtruns ) THEN
             zssh2 = SUM( sshn(:,:) * sshn(:,:) * tmask_i(:,:) )
             IF( lk_mpp )   CALL mpp_sum( zssh2 )      ! sum over the global domain