Changeset 900 for trunk/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

Timestamp:

2008-04-22T20:13:41+02:00 (16 years ago)

Author:

rblod

Message:

Update 1D configuration according to SBC and LIM3, see ticket #117

File:

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

trunk/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -12 +12 @@
    !!   'key_lim2' :                                  LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
    !!   sbc_ice_lim_2  : sea-ice model time-stepping and
    !!                    update ocean sbc over ice-covered area
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
+   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE ice_2
@@ -58 +58 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $ Id: $
+   !! NEMO/SBC  3.0 , LOCEAN-IPSL (2008) 
+   !! $Id: $
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -177 +177 @@
          !  Ice model step  !
          ! ---------------- !
-         ;                              CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
-         ;                              CALL lim_dyn_2      ( kt )      ! Ice dynamics    ( rheology/dynamics )
-         ;                              CALL lim_trp_2      ( kt )      ! Ice transport   ( Advection/diffusion )
-         IF( ln_limdmp )                CALL lim_dmp_2      ( kt )      ! Ice damping 
-         ;                              CALL lim_thd_2      ( kt )      ! Ice thermodynamics 
-         ;                              CALL lim_sbc_2      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
+                                        CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
+         IF( .NOT. lk_c1d ) THEN                                        ! Ice dynamics & transport (not in 1D case)
+                                        CALL lim_dyn_2      ( kt )           ! Ice dynamics    ( rheology/dynamics )
+                                        CALL lim_trp_2      ( kt )           ! Ice transport   ( Advection/diffusion )
+            IF( ln_limdmp )             CALL lim_dmp_2      ( kt )           ! Ice damping 
+         ENDIF
+                                        CALL lim_thd_2      ( kt )      ! Ice thermodynamics 
+                                        CALL lim_sbc_2      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
          IF( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR.   &
             &  ntmoy == 1 )             CALL lim_dia_2      ( kt )      ! Ice Diagnostics 
-         ;                              CALL lim_wri_2      ( kt )      ! Ice outputs 
+                                        CALL lim_wri_2      ( kt )      ! Ice outputs 
          IF( lrst_ice )                 CALL lim_rst_write_2( kt )      ! Ice restart file 
          !