Changeset 888 for trunk/NEMO/OPA_SRC/istate.F90

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/OPA_SRC/istate.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/istate.F90

@@ -55 +55 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/istate.F90,v 1.20 2007/06/06 20:25:36 opalod Exp $ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -81 +81 @@
          neuler = 1                              ! Set time-step indicator at nit000 (leap-frog)
          CALL rst_read                           ! Read the restart file
+         CALL day( -1 )                          ! model calendar (using both namelist and restart infos)
       ELSE
          !                                    ! Start from rest
@@ -86 +87 @@
          neuler = 0                              ! Set time-step indicator at nit000 (euler forward)
          adatrj = 0._wp
+         CALL day( -1 )                          ! model calendar (using namelist infos)
          numror = 0                              ! define numror = 0 -> no restart file to read
          !                                       ! Initialization of ocean to zero