Changeset 811 for branches/dev_001_SBC/NEMO/OPA_SRC/restart.F90

Timestamp:

2008-02-07T17:00:12+01:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: merge with the trunk last changesets: #780, 782, 783, 784, 785, 788, 789, 793, 794

File:

• branches/dev_001_SBC/NEMO/OPA_SRC/restart.F90 (modified) (3 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/restart.F90

@@ -63 +63 @@
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 ) THEN   ! default initialization, to do: should be read in the namelist...
-         nitrst = nitend        ! to do: should be read in the namelist in a cleaver way...
-         lrst_oce = .FALSE.
-      ENDIF
-
-      IF    ( kt == nitrst-1 .AND. lrst_oce         ) THEN
-         CALL ctl_stop( 'rst_opn: we cannot create an ocean restart at every time step',    &
-            &           'if the run has more than one time step!!!' )
-         numrow = 0
-      ELSEIF( kt == nitrst-1 .OR.  nitend == nit000 ) THEN   ! beware if model runs only one time step
-         ! 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
-         ELSE
-            WRITE(clkt,'(i8.8)') nitrst
+      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
+
+      ! 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
+         ! beware of the format used to write kt (default is i8.8, that should be large enough...)
+         IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
+         ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst
          ENDIF
          ! create the file
@@ -84 +86 @@
             WRITE(numout,*)
             SELECT CASE ( jprstlib )
-            CASE ( jpnf90 )
-               WRITE(numout,*) '             open ocean restart.output NetCDF file: '//clname
-            CASE ( jprstdimg )
-               WRITE(numout,*) '             open ocean restart.output binary file: '//clname
+            CASE ( jprstdimg )   ;   WRITE(numout,*) '             open ocean restart binary file: '//clname
+            CASE DEFAULT         ;   WRITE(numout,*) '             open ocean restart NetCDF file: '//clname
             END SELECT
-            IF( kt == nitrst-1 ) THEN
-               WRITE(numout,*) '             kt = nitrst - 1 = ', kt,' date= ', ndastp
-            ELSE
-               WRITE(numout,*) '             kt = ', kt,' date= ', ndastp
+            IF( kt == nitrst - 1 ) THEN   ;   WRITE(numout,*) '             kt = nitrst - 1 = ', kt,' date= ', ndastp
+            ELSE                          ;   WRITE(numout,*) '             kt = '             , kt,' date= ', ndastp
             ENDIF
          ENDIF
@@ -114 +112 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step
       !!----------------------------------------------------------------------
+
+      IF( kt == nitrst ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'rst_write : write oce restart file  kt =', kt
+         IF(lwp) WRITE(numout,*) '~~~~~~~'         
+      ENDIF
 
       ! calendar control