Changeset 12849 for NEMO/branches

Timestamp:

2020-05-01T17:33:09+02:00 (4 years ago)

Author:

dancopsey

Message:

Do not output iceberg and icesheet info when nn_print is zero.

Location:

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE

Files:

• ICB/icbclv.F90 (modified) (1 diff)
• SBC/sbccpl.F90 (modified) (1 diff)
• SBC/sbcisf.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/ICB/icbclv.F90

@@ -73 +73 @@
         ! 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 .AND. ((nn_print>0))
           ! 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

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90

@@ -1198 +1198 @@
       !!----------------------------------------------------------------------
       !
-      ll_wrtstp  = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
+      ll_wrtstp  = (( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )) .AND. (nn_print>0)
       !
       IF( ln_mixcpl )   zmsk(:,:) = 1. - xcplmask(:,:,0)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbcisf.F90

@@ -99 +99 @@
       !!---------------------------------------------------------------------
       !
-      ll_wrtstp  = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
+      ll_wrtstp  = (( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )) .AND. (nn_print>0)
       IF( MOD( kt-1, nn_fsbc) == 0 ) THEN    ! compute salt and heat flux
          !