Changeset 12365

Timestamp:

2020-02-11T10:24:44+01:00 (5 years ago)

Author:

timgraham

Message:

Bug fix for iceberg restart files

File:

• branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90

@@ -60 +60 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! time step index
+      INTEGER             ::   ii   ! loop index
       !
       LOGICAL ::   ll_sample_traj, ll_budget, ll_verbose   ! local logical
@@ -140 +141 @@
       CALL icb_dia( ll_budget )
 
-      IF( MOD(kt,nn_stock) == 0 ) THEN
+      IF( ln_rst_list ) THEN
+         DO ii=1,10
+            IF(nstocklist(ii)==kt) THEN 
+               CALL icb_rst_write( kt )
+               EXIT
+            END IF
+         END DO
+      ELSE IF( MOD(kt,nn_stock) == 0 ) THEN
          CALL icb_rst_write( kt )
          IF( nn_sample_rate > 0 )   CALL icb_trj_sync()
@@ -160 +168 @@
       !!----------------------------------------------------------------------
 
-      ! only write a restart if not done in icb_stp
-      IF( MOD(kt,nn_stock) .NE. 0 ) CALL icb_rst_write( kt )
+      ! only write a restart if not done in icb_stp and not using restart list
+      IF( ( MOD(kt,nn_stock) .NE. 0 ) .AND. (.NOT. ln_rst_list) )      &
+           CALL icb_rst_write( kt )
 
       ! finish with trajectories if they were written