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

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -13 +13 @@
    USE oce             ! 
    USE dom_oce         ! ocean space and time domain
+   USE ice_oce         ! ice variables
+   USE sbc_oce         ! surface boundary condition: ocean
    USE phycst          ! physical constants
+   USE daymod          ! calendar
    USE in_out_manager  ! I/O manager
-   USE ice_oce         ! ice variables
-   USE blk_oce         ! bulk variables
-   USE flxrnf          ! runoffs
-   USE daymod          ! calendar
    USE lib_mpp         ! distributed memory computing library
 
@@ -39 +38 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Id$
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
@@ -144 +143 @@
       NAMELIST/namrun/ no    , cexper   , ln_rstart , nrstdt , nit000,         &
          &             nitend, ndate0   , nleapy   , ninist , nstock,          &
-         &             nwrite, nrunoff  , ln_dimgnnn
+         &             nwrite, ln_dimgnnn
 
       NAMELIST/namdom/ ntopo , e3zps_min, e3zps_rat, ngrid  , nmsh  ,   &
          &             nacc  , atfp     , rdt      , rdtmin , rdtmax,   &
-         &             rdth  , rdtbt    , nfice    , nfbulk , nclosea
+         &             rdth  , rdtbt    , nclosea
       NAMELIST/namcla/ n_cla
       !!----------------------------------------------------------------------
@@ -175 +174 @@
          WRITE(numout,*) '           frequency of restart file       nstock    = ', nstock
          WRITE(numout,*) '           frequency of output file        nwrite    = ', nwrite
-         WRITE(numout,*) '           runoff option                   nrunoff   = ', nrunoff
          WRITE(numout,*) '           multi file dimgout           ln_dimgnnn   = ', ln_dimgnnn
       ENDIF
@@ -257 +255 @@
       ENDIF
 
-      IF( lk_lim3 .OR. lk_lim2 ) THEN
-         IF(lwp) WRITE(numout,*) '           ice model coupling frequency      nfice  = ', nfice
-         IF( MOD( nitend - nit000 + 1, nfice) /= 0 ) THEN 
-            WRITE(ctmp1,*) 'experiment length (', nitend - nit000 + 1, ') is NOT a multiple of nfice (', nfice, ')'
-            CALL ctl_stop( ctmp1, 'Impossible to do proper restart files' )
-         ENDIF
-         IF( MOD( nstock             , nfice) /= 0 ) THEN 
-            WRITE(ctmp1,*) 'nstock ('           , nstock             , ') is NOT a multiple of nfice (', nfice, ')'
-            CALL ctl_stop( ctmp1, 'Impossible to do proper restart files' )
-         ENDIF
-         nfbulk = nfice
-         IF( MOD( rday, nfice*rdt ) /= 0 )   CALL ctl_warn( 'nfice is NOT a multiple of the number of time steps in a day' )
-         IF(lwp) WRITE(numout,*) '           bulk computation frequency       nfbulk  = ', nfbulk, ' = nfice if ice model used'
-         IF(lwp) WRITE(numout,*) '           flag closed sea or not           nclosea = ', nclosea
-      ENDIF
-
       ! Default values
       n_cla = 0