Changeset 15140 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ICB

Timestamp:

2021-07-23T15:51:15+02:00 (3 years ago)

Author:

frrh

Message:

Merge changes from Tim Graham's
​http://fcm3/projects/NEMO.xm/log/branches/UKMO/dev_r5518_GO6_package_isfprint at
revision 13073.
GMED ticket 454 refers. See ​https://code.metoffice.gov.uk/trac/gmed/ticket/545

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/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 .AND. sn_cfctl%l_sbcisf
         ! 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