Changeset 1130 for trunk/NEMO/OPA_SRC/restart.F90

Timestamp:

2008-06-24T17:00:56+02:00 (16 years ago)

Author:

smasson

Message:

daymod bugfix and enhancement, see ticket #216

File:

• trunk/NEMO/OPA_SRC/restart.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/restart.F90

@@ -18 +18 @@
    USE oce             ! ocean dynamics and tracers 
    USE phycst          ! physical constants
-   USE daymod          ! calendar
    USE cpl_oce, ONLY : lk_cpl              !
    USE in_out_manager  ! I/O manager
@@ -89 +88 @@
             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
+            ELSE                          ;   WRITE(numout,*) '             kt = '             , kt
             ENDIF
          ENDIF
@@ -112 +111 @@
       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
-      CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp) )   ! time-step 
-      CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp) )   ! date
-      CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
       !                                                                     ! the begining of the run [s]
       CALL iom_rstput( kt, nitrst, numrow, 'rdt'    , rdt               )   ! dynamics time step
@@ -179 +167 @@
       !!      for this last three records,  the previous characteristics 
       !!      could be different with those used in the present run. 
-      !!
-      !!   According to namelist parameter nrstdt,
-      !!       nrstdt = 0  no control on the date (nit000 is  arbitrary).
-      !!       nrstdt = 1  we verify that nit000 is equal to the last
-      !!                   time step of previous run + 1.
-      !!       In both those options, the  exact duration of the experiment
-      !!       since the beginning (cumulated duration of all previous restart runs)
-      !!       is not stored in the restart and is assumed to be (nit000-1)*rdt.
-      !!       This is valid is the time step has remained constant.
-      !!
-      !!       nrstdt = 2  the duration of the experiment in days (adatrj)
-      !!                    has been stored in the restart file.
-      !!----------------------------------------------------------------------
-      REAL(wp) ::   zkt, zrdt, zrdttra1, zndastp
+      !!----------------------------------------------------------------------
+      REAL(wp) ::   zrdt, zrdttra1
       !!----------------------------------------------------------------------
 
@@ -198 +174 @@
          WRITE(numout,*)
          SELECT CASE ( jprstlib )
-         CASE ( jpnf90 )
-            WRITE(numout,*) 'rst_read : read oce NetCDF restart file'
-         CASE ( jprstdimg )
-            WRITE(numout,*) 'rst_read : read oce binary restart file'
+         CASE ( jpnf90    )   ;   WRITE(numout,*) 'rst_read : read oce NetCDF restart file'
+         CASE ( jprstdimg )   ;   WRITE(numout,*) 'rst_read : read oce binary restart file'
          END SELECT
          WRITE(numout,*) '~~~~~~~~'
-
-         WRITE(numout,*) ' *** Info on the present job : '
-         WRITE(numout,*) '   time-step           : ', nit000
-         WRITE(numout,*) '   date ndastp         : ', ndastp
-         WRITE(numout,*)
-         WRITE(numout,*) ' *** restart option'
-         SELECT CASE ( nrstdt )
-         CASE ( 0 ) 
-            WRITE(numout,*) ' nrstdt = 0 no control of nit000'
-         CASE ( 1 ) 
-            WRITE(numout,*) ' nrstdt = 1 we control the date of nit000'
-         CASE ( 2 )
-            WRITE(numout,*) ' nrstdt = 2 the date adatrj is read in restart file'
-         CASE DEFAULT
-            WRITE(numout,*) '  ===>>>> nrstdt not equal 0, 1 or 2 : no control of the date'
-            WRITE(numout,*) '  =======                  ========='
-         END SELECT
-         WRITE(numout,*)
       ENDIF
 
       CALL iom_open( 'restart', numror, kiolib = jprstlib )
 
-      ! Calendar informations
-      CALL iom_get( numror, 'kt'     , zkt      )   ! time-step 
-      CALL iom_get( numror, 'ndastp' , zndastp  )   ! date
-      IF(lwp) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) ' *** Info on the restart file read : '
-         WRITE(numout,*) '   time-step           : ', NINT( zkt )
-         WRITE(numout,*) '   date ndastp         : ', NINT( zndastp )
-         WRITE(numout,*)
-      ENDIF
-      ! Control of date
-      IF( nit000 - NINT( zkt )  /= 1 .AND. nrstdt /= 0 ) &
-           & CALL ctl_stop( ' ===>>>> : problem with nit000 for the restart', &
-           & ' verify the restart file or rerun with nrstdt = 0 (namelist)' )
-      ! re-initialisation of  adatrj0
-      adatrj0 = ( REAL( nit000-1, wp ) * rdttra(1) ) / rday
-      IF ( nrstdt == 2 ) THEN
-         ! by default ndatsp has been set to ndate0 in dom_nam
-         ! ndate0 has been read in the namelist (standard OPA 8)
-         ! here when nrstdt=2 we keep the  final date of previous run
-         ndastp = NINT( zndastp )
-         CALL iom_get( numror, 'adatrj', adatrj )   ! number of elapsed days since the begining of last run
-      ENDIF
       ! Check dynamics and tracer time-step consistency and force Euler restart if changed
       IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 )   THEN
@@ -258 +191 @@
          IF( zrdttra1 /= rdttra(1) )   neuler = 0
       ENDIF
-      !
       !                                                       ! Read prognostic variables
       CALL iom_get( numror, jpdom_autoglo, 'ub'   , ub    )        ! before i-component velocity