Changeset 15596

Timestamp:

2021-12-13T17:28:47+01:00 (2 years ago)

Author:

acc

Message:

Changes to restart.F90 and trcrst.F90 to address #2735 and cope with requests in nn_stocklist outside the simulation period. These changes also enable a restart file to be generated on nit000, if requested, and will force a restart at nitend even if it is not explicitly listed in nn_stocklist. This closes #2735

Location:

NEMO/releases/r4.0/r4.0-HEAD/src

Files:

• OCE/IOM/restart.F90 (modified) (3 diffs)
• TOP/trcrst.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/IOM/restart.F90

@@ -69 +69 @@
          lrst_oce = .FALSE.   
          IF( ln_rst_list ) THEN
-            nrst_lst = 1
-            nitrst = nn_stocklist( nrst_lst )
+            ! Protect against user requests outside of simulation period (#2735)
+            nitrst   = MIN( nitend, MINVAL( nn_stocklist, MASK=nn_stocklist.ge.nit000) )  
+            nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
          ELSE
             nitrst = nitend
@@ -87 +88 @@
       ! we open and define the ocean restart file one time step before writing the data (-> at nitrst - 1)
       ! except if we write ocean restart files every time step or if an ocean restart file was writen at nitend - 1
-      IF( kt == nitrst - 1 .OR. nn_stock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN
+      ! or if nit000 is requested in the nn_stocklist
+      IF( kt == nitrst - 1 .OR. nn_stock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) &
+      &                                       .OR. ( kt == nit000 .AND. nitrst == nit000 ) ) THEN
          IF( nitrst <= nitend .AND. nitrst > 0 ) THEN 
             ! beware of the format used to write kt (default is i8.8, that should be large enough...)
@@ -188 +191 @@
                nrst_lst = MIN(nrst_lst + 1, SIZE(nn_stocklist,1))
                nitrst = nn_stocklist( nrst_lst )
+               IF( nitrst == 0 ) nitrst = nitend    ! Force a restart at the end of the run
             ENDIF
       ENDIF

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/trcrst.F90

@@ -57 +57 @@
             lrst_trc = .FALSE.
             IF( ln_rst_list ) THEN
-               nrst_lst = 1
-               nitrst = nn_stocklist( nrst_lst )
+               ! Protect against user requests outside of simulation period (#2735)
+               nitrst   = MIN( nitend, MINVAL( nn_stocklist, MASK=nn_stocklist.ge.nit000) )
+               nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
             ELSE
                nitrst = nitend
@@ -78 +79 @@
       ! we open and define the tracer restart file one tracer time step before writing the data (-> at nitrst - 2*nn_dttrc + 1)
       ! except if we write tracer restart files every tracer time step or if a tracer restart file was writen at nitend - 2*nn_dttrc + 1
-      IF( kt == nitrst - 2*nn_dttrc .OR. nn_stock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN
+      ! or if nit000 is requested in the nn_stocklist
+      IF( kt == nitrst - 2*nn_dttrc .OR. nn_stock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) &
+      &                                                       .OR. ( kt == nit000 .AND. nitrst == nit000 ) ) THEN
          ! beware of the format used to write kt (default is i8.8, that should be large enough)
          IF( nitrst > 1.0e9 ) THEN   ;   WRITE(clkt,*       ) nitrst