Changeset 3594 for branches/2012/dev_r3452_UKMO9_RESTART/NEMOGCM/NEMO/TOP_SRC/trcrst.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/TOP_SRC/trcrst.F90 (modified) (3 diffs)

branches/2012/dev_r3452_UKMO9_RESTART/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -66 +66 @@
          ENDIF
 
-         IF( MOD( kt - 1, nstock ) == 0 ) THEN
-            ! we use kt - 1 and not kt - nittrc000 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
+         IF ( kt == 0 ) THEN
+            nrst = 1   
+            nitrst = nn_stock( nrst )   
+            lrst_trc = .FALSE.   
          ENDIF
       ELSE
@@ -77 +77 @@
       ! to get better performances with NetCDF format:
       ! 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. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN
+      ! except if we are at the first time step, or if the previous time step we outputted a restart
+      IF( kt == nitrst - 2*nn_dttrc .OR. nn_stock(nitrst) == nn_dttrc .OR. ( nn_stock(nrst)==nn_stock(nrst-1)+nn_dttrc ) ) 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
@@ -161 +161 @@
 #if ! defined key_trdmld_trc
           lrst_trc = .FALSE.
+          nrst = nrst + 1
+          nitrst = nn_stock(nrst)
 #endif
       ENDIF