Changeset 2104 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90 (modified) (5 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90

@@ -4 +4 @@
    !! Ocean restart :  write the ocean restart file
    !!======================================================================
-   !! History :        !  99-11  (M. Imbard)  Original code
-   !!             8.5  !  02-08  (G. Madec)  F90: Free form
-   !!             9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
-   !!             9.0  !  06-07  (S. Masson)  use IOM for restart
+   !! History :  OPA  !  1999-11  (M. Imbard)  Original code
+   !!   NEMO     1.0  !  2002-08  (G. Madec)  F90: Free form
+   !!            2.0  !  2006-07  (S. Masson)  use IOM for restart
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) TRC-TRA merge (T-S in 4D)
    !!----------------------------------------------------------------------
 
@@ -26 +26 @@
    USE zdfmxl          ! mixed layer depth
    USE trdmld_oce      ! ocean active mixed layer tracers trends variables
-#if defined key_zdfkpp
-   USE traswap
-#endif
+   USE traswp          ! swap from 4D T-S to 3D T & S and vice versa
+
    IMPLICIT NONE
    PRIVATE
@@ -36 +35 @@
    PUBLIC   rst_read   ! routine called by opa  module
 
-   LOGICAL, PUBLIC ::   lrst_oce =  .FALSE.       !: logical to control the oce restart write 
-   INTEGER, PUBLIC ::   numror, numrow            !: logical unit for cean restart (read and write)
+   LOGICAL, PUBLIC ::   lrst_oce =  .FALSE.   !: logical to control the oce restart write 
+   INTEGER, PUBLIC ::   numror, numrow        !: logical unit for cean restart (read and write)
 
    !! * Substitutions
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
+   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -109 +108 @@
       !!
       !! ** Method  :   Write in numrow when kt == nitrst in NetCDF
-      !!      file, save fields which are necessary for restart
+      !!              file, save fields which are necessary for restart
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step
@@ -135 +134 @@
       CALL iom_rstput( kt, nitrst, numrow, 'rhop'   , rhop    )
 #if defined key_zdfkpp
-      CALL iom_rstput( kt, nitrst, numrow, 'rhd'  , rhd   )
+      CALL iom_rstput( kt, nitrst, numrow, 'rhd'    , rhd     )
 #endif