Changeset 4899 for branches/2014/dev_r4743_NOC2_ZTS/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90

Timestamp:

2014-11-27T16:21:44+01:00 (9 years ago)

Author:

acc

Message:

Branch 2014/dev_r4743_NOC2_ZTS. Merged in trunk changes from r4743 to r4879 in preparation for the annual merge. See ticket #1367 and https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/1367_NOC2_ZTS

File:

• branches/2014/dev_r4743_NOC2_ZTS/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) (1 diff)

branches/2014/dev_r4743_NOC2_ZTS/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90

@@ -24 +24 @@
    USE par_ice_2
    USE ice_2           ! LIM_2 ice variables
+   USE dom_ice_2       ! sea-ice domain
 #elif defined key_lim3
    USE par_ice
    USE ice             ! LIM_3 ice variables
+   USE dom_ice         ! sea-ice domain
 #endif 
    USE par_oce         ! ocean parameters
    USE dom_oce         ! ocean space and time domain variables 
-   USE dom_ice          ! sea-ice domain
    USE sbc_oce         ! Surface boundary condition: ocean fields
    USE bdy_oce         ! ocean open boundary conditions