Changeset 4161 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

Timestamp:

2013-11-07T11:01:27+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013 : merge in the 3rd dev branch dev_r4028_CNRS_LIM3, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) (6 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

@@ -38 +38 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/LIM3 3.4 , UCL - NEMO Consortium (2011)
+   !! NEMO/LIM3 4.0 , UCL - NEMO Consortium (2011)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -162 +162 @@
       CALL iom_rstput( iter, nitrst, numriw, 'v_ice'     , v_ice      )
       CALL iom_rstput( iter, nitrst, numriw, 'fsbbq'     , fsbbq      )
+      CALL iom_rstput( iter, nitrst, numriw, 'iatte'     , iatte      ) ! clem modif
+      CALL iom_rstput( iter, nitrst, numriw, 'oatte'     , oatte      ) ! clem modif
       CALL iom_rstput( iter, nitrst, numriw, 'stress1_i' , stress1_i  )
       CALL iom_rstput( iter, nitrst, numriw, 'stress2_i' , stress2_i  )
@@ -340 +342 @@
       !Control of date
 
-      IF( ( nit000 - INT(ziter) ) /= 1 .AND. ABS( nrstdt ) == 1 )   &
+      IF( ( nit000 - NINT(ziter) ) /= 1 .AND. ABS( nrstdt ) == 1 )   &
          &     CALL ctl_stop( 'lim_rst_read ===>>>> : problem with nit000 in ice restart',  &
          &                   '   verify the file or rerun with the value 0 for the',        &
          &                   '   control of time parameter  nrstdt' )
-      IF( INT(zfice) /= nn_fsbc          .AND. ABS( nrstdt ) == 1 )   &
+      IF( NINT(zfice) /= nn_fsbc          .AND. ABS( nrstdt ) == 1 )   &
          &     CALL ctl_stop( 'lim_rst_read ===>>>> : problem with nn_fsbc in ice restart',  &
          &                   '   verify the file or rerun with the value 0 for the',         &
@@ -369 +371 @@
          CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
          t_su(:,:,jl) = z2d(:,:)
+         tn_ice (:,:,:) = t_su (:,:,:)
       END DO
 
@@ -437 +440 @@
       CALL iom_get( numrir, jpdom_autoglo, 'v_ice'     , v_ice      )
       CALL iom_get( numrir, jpdom_autoglo, 'fsbbq'     , fsbbq      )
+      CALL iom_get( numrir, jpdom_autoglo, 'iatte'     , iatte      ) ! clem modif
+      CALL iom_get( numrir, jpdom_autoglo, 'oatte'     , oatte      ) ! clem modif
       CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i  )
       CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i  )
@@ -563 +568 @@
       END DO
       !
-      CALL iom_close( numrir )
+      !clem CALL iom_close( numrir )
       !
       CALL wrk_dealloc( nlay_i, zs_zero )