Changeset 2208 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.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_2.F90 (modified) (3 diffs)

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

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
-   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE lib_mpp
@@ -61 +60 @@
    !! NEMO/SBC  3.0 , 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)
    !!----------------------------------------------------------------------
 
@@ -174 +173 @@
 
                                         CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
-         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_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
+#endif
 #if defined key_coupled
          IF( ksbc == 5    )             CALL sbc_cpl_ice_flx( reshape( frld, (/jpi,jpj,1/) ),        &