Changeset 3594 for branches/2012/dev_r3452_UKMO9_RESTART/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

Timestamp:

2012-11-19T13:28:55+01:00 (11 years ago)

Author:

rfurner

Message:

code not tested through SETTEE, builds and runs, but has not been thoroughly tested, so will not be included in 2012 merge, however submitted back to keep record of work done for 2013 developments

File:

• branches/2012/dev_r3452_UKMO9_RESTART/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) (2 diffs)

branches/2012/dev_r3452_UKMO9_RESTART/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -57 +57 @@
       INTEGER, INTENT(in) ::   kt     ! ocean time-step
       !!
-      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character
-      CHARACTER(LEN=50)   ::   clname   ! ice output restart file name
+      CHARACTER(LEN=20)   ::   clkt   ! ocean time-step defined as a character
+      CHARACTER(LEN=50)   ::   clname ! ice output restart file name
+      INTEGER             ::   js     ! dummy loop variable
       !!----------------------------------------------------------------------
       !
       IF( kt == nit000 ) THEN   ! default definitions
          lrst_oce = .FALSE.   
-         nitrst = nitend
-      ENDIF
-      IF( MOD( kt - 1, nstock ) == 0 ) THEN   
-         ! we use kt - 1 and not kt - nit000 to keep the same periodicity from the beginning of the experiment
-         nitrst = kt + nstock - 1                  ! define the next value of nitrst for restart writing
-         IF( nitrst > nitend )   nitrst = nitend   ! make sure we write a restart at the end of the run
-      ENDIF
+         nrst = 1
+         nitrst = nn_stock( nrst )
+      ENDIF
+
       ! to get better performances with NetCDF format:
       ! 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. nstock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN
+      ! except if we are at the first time step, or if the previous time step we outputted a restart
+      IF ( kt == nitrst - 1 .OR. nn_stock(nrst) == 1 .OR. nn_stock(nrst)==nn_stock(nrst-1)+1 ) THEN
          ! beware of the format used to write kt (default is i8.8, that should be large enough...)
          IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
@@ -135 +133 @@
 #endif
       IF( kt == nitrst ) THEN
-         CALL iom_close( numrow )     ! close the restart file (only at last time step)
-         IF( .NOT. lk_trdmld )   lrst_oce = .FALSE.
+         CALL iom_close( numrow )     ! close the restart file (only on the dump time step)
+         IF( .NOT. lk_trdmld ) THEN
+            lrst_oce = .FALSE.
+            nrst = nrst + 1   
+            nitrst = nn_stock( nrst ) 
+         ENDIF
       ENDIF
       !