Changeset 2208 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2010-10-12T11:20:53+02:00 (14 years ago)

Author:

rblod

Message:

Put FCM NEMO code changes in DEV_r2191_3partymerge2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (4 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -19 +19 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
-   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE lib_mpp
@@ -65 +64 @@
    !! NEMO/LIM 3.0 , UCL-LOCEAN-IPSL  (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -196 +195 @@
          IF( ln_nicep )   CALL lim_prt_state( jiindx, jjindx, 1, ' - Beginning the time step - ' )   ! control print
          !
-         IF( .NOT. lk_c1d ) THEN                     ! Ice dynamics & transport (not in 1D case)
+#if ! defined key_c1d
+         ! Ice dynamics & transport (not in 1D case)
                           CALL lim_dyn( kt )              ! Ice dynamics    ( rheology/dynamics )
                           CALL lim_trp( kt )              ! Ice transport   ( Advection/diffusion )
@@ -203 +203 @@
          IF( ln_nicep )   CALL lim_prt_state( jiindx, jjindx,-1, ' - ice dyn & trp - ' )   ! control print
                           CALL lim_itd_me                 ! Mechanical redistribution ! (ridging/rafting)
-         ENDIF
+#endif
          !
          !                                           ! Ice thermodynamics