Changeset 9328 for branches

Timestamp:

2018-02-15T18:01:10+01:00 (6 years ago)

Author:

davestorkey

Message:

Fix iceberg restarting to always be consistent with ocean/ice restarting.
Ticket #2007 (also addresses one of Pierre's points in ticket #1595).

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90

@@ -138 +138 @@
       CALL icb_dia( ll_budget )
       !
-      IF( MOD(kt,nn_stock) == 0 ) THEN    !* restart
+      IF( lrst_oce ) THEN    !* restart
          CALL icb_rst_write( kt )
          IF( nn_sample_rate > 0 )   CALL icb_trj_sync()
@@ -158 +158 @@
       !!----------------------------------------------------------------------
       !
-      ! only write a restart if not done in icb_stp
-      IF( MOD(kt,nn_stock) /= 0 )   CALL icb_rst_write( kt )
-
       ! finish with trajectories if they were written
       IF( nn_sample_rate > 0 )   CALL icb_trj_end()