Changeset 888 for trunk/NEMO/OPA_SRC/restart.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/restart.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/restart.F90

@@ -19 +19 @@
    USE phycst          ! physical constants
    USE daymod          ! calendar
-   USE ice_oce         ! ice variables
-   USE blk_oce         ! bulk variables
    USE cpl_oce, ONLY : lk_cpl              !
    USE in_out_manager  ! I/O manager
@@ -43 +41 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/restart.F90,v 1.27 2007/06/05 10:35:19 opalod Exp $ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -143 +141 @@
       CALL iom_rstput( kt, nitrst, numrow, 'rotn'   , rotn    )
       CALL iom_rstput( kt, nitrst, numrow, 'hdivn'  , hdivn   )
-
-#if defined key_lim3 || defined key_lim2
-      CALL iom_rstput( kt, nitrst, numrow, 'nfice'  , REAL( nfice, wp) )   !  ice computation frequency
-      CALL iom_rstput( kt, nitrst, numrow, 'sst_io' , sst_io  )
-      CALL iom_rstput( kt, nitrst, numrow, 'sss_io' , sss_io  )
-      CALL iom_rstput( kt, nitrst, numrow, 'u_io'   , u_io    )
-      CALL iom_rstput( kt, nitrst, numrow, 'v_io'   , v_io    )
-# if defined key_coupled
-      CALL iom_rstput( kt, nitrst, numrow, 'alb_ice', alb_ice )
-# endif
-#endif
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core 
-      CALL iom_rstput( kt, nitrst, numrow, 'nfbulk' , REAL( nfbulk, wp) )   !  bulk computation frequency
-      CALL iom_rstput( kt, nitrst, numrow, 'gsst'   , gsst    )
-#endif
 
       IF( nn_dynhpg_rst == 1 .OR. lk_vvl ) THEN
@@ -209 +192 @@
       !!                    has been stored in the restart file.
       !!----------------------------------------------------------------------
-      REAL(wp) ::   zcoef, zkt, zrdt, zrdttra1, zndastp, znfice, znfbulk
-#if defined key_lim3 || defined key_lim2
-      INTEGER  ::   ji, jj
-#endif
+      REAL(wp) ::   zkt, zrdt, zrdttra1, zndastp
       !!----------------------------------------------------------------------
 
@@ -304 +284 @@
       ENDIF
 
-      !!sm: TO BE MOVED IN NEW SURFACE MODULE...
-
-#if defined key_lim3 || defined key_lim2
-      ! Louvain La Neuve Sea Ice Model
-      IF( iom_varid( numror, 'nfice', ldstop = .FALSE. ) > 0 ) then 
-         CALL iom_get( numror             , 'nfice'  , znfice  )   ! ice computation frequency
-         CALL iom_get( numror, jpdom_autoglo, 'sst_io' , sst_io  )
-         CALL iom_get( numror, jpdom_autoglo, 'sss_io' , sss_io  )
-         CALL iom_get( numror, jpdom_autoglo, 'u_io'   , u_io    )
-         CALL iom_get( numror, jpdom_autoglo, 'v_io'   , v_io    )
-# if defined key_coupled
-         CALL iom_get( numror, jpdom_autoglo, 'alb_ice', alb_ice )
-# endif
-         IF( znfice /= REAL( nfice, wp ) ) THEN      ! if nfice changed between 2 runs
-            zcoef = REAL( nfice-1, wp ) / znfice
-            sst_io(:,:) = zcoef * sst_io(:,:)
-            sss_io(:,:) = zcoef * sss_io(:,:)
-            u_io  (:,:) = zcoef * u_io  (:,:)
-            v_io  (:,:) = zcoef * v_io  (:,:)
-         ENDIF
-      ELSE
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'rst_read :  LLN sea Ice Model => Ice initialization'
-         IF(lwp) WRITE(numout,*)
-         zcoef = REAL( nfice-1, wp )
-         sst_io(:,:) = zcoef *( tn(:,:,1) + rt0 )          !!bug a explanation is needed here!
-         sss_io(:,:) = zcoef *  sn(:,:,1)
-         zcoef = 0.5 * REAL( nfice-1, wp )
-         DO jj = 2, jpj
-            DO ji = fs_2, jpi   ! vector opt.
-               u_io(ji,jj) = zcoef * ( un(ji-1,jj  ,1) + un(ji-1,jj-1,1) )
-               v_io(ji,jj) = zcoef * ( vn(ji  ,jj-1,1) + vn(ji-1,jj-1,1) )
-            END DO
-         END DO
-# if defined key_coupled
-         alb_ice(:,:) = 0.8 * tmask(:,:,1)
-# endif
-      ENDIF
-#endif
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core 
-      ! Louvain La Neuve Sea Ice Model
-      IF( iom_varid( numror, 'nfbulk', ldstop = .FALSE. ) > 0 ) THEN 
-         CALL iom_get( numror             , 'nfbulk', znfbulk )   ! bulk computation frequency
-         CALL iom_get( numror, jpdom_autoglo, 'gsst'  , gsst    )
-         IF( znfbulk /= REAL(nfbulk, wp) ) THEN      ! if you change nfbulk between 2 runs
-            zcoef = REAL( nfbulk-1, wp ) / znfbulk
-            gsst(:,:) = zcoef * gsst(:,:)
-         ENDIF
-      ELSE
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'rst_read :  LLN sea Ice Model => Ice initialization'
-         IF(lwp) WRITE(numout,*)
-         gsst(:,:) = REAL( nfbulk - 1, wp )*( tn(:,:,1) + rt0 )
-      ENDIF
-#endif
-
-      !!sm: end of TO BE MOVED IN NEW SURFACE MODULE...
-
       IF( iom_varid( numror, 'rhd', ldstop = .FALSE. ) > 0 ) THEN
          CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )