Changeset 3294 for trunk/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

@@ -23 +23 @@
    USE par_ice_2        ! LIM2 parameters
    USE thd_ice_2        ! LIM2 thermodynamical variables
-   USE limrhg           ! LIM2 EVP rheology
-   USE limrhg_2         ! LIM2  VP rheology (requires "key_lim2_vp")
    USE ice_2            ! LIM2 ice variable
    USE limmsh_2         ! LIM2 mesh
@@ -64 +62 @@
       ierr = ierr + sbc_ice_alloc  ()       ! surface forcing
       ierr = ierr + thd_ice_alloc_2()       ! thermodynamics
-#if ! defined key_lim2_vp
-      ierr = ierr + lim_rhg_alloc  ()
-#else
-      ierr = ierr + lim_rhg_alloc_2  ()
-#endif
+
       IF( lk_mpp    )   CALL mpp_sum( ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ice_init_2 : unable to allocate ice arrays' )