Changeset 833 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

2008-03-07T14:51:35+01:00 (16 years ago)

Author:

rblod

Message:

Merge branche dev_002_LIM back to trunk ticket #70 and #71

File:

• trunk/NEMO/OPA_SRC/opa.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/opa.F90

@@ -59 +59 @@
 
    USE phycst          ! physical constant                  (par_cst routine)
+#if defined key_lim3
    USE iceini          ! initialization of sea-ice         (ice_init routine)
+#endif
+#if defined key_lim2
+   USE iceini_2        ! initialization of sea-ice         (ice_init_2 routine)
+#endif
    USE cpl             ! coupled ocean/atmos.              (cpl_init routine)
    USE ocfzpt          ! ocean freezing point              (oc_fz_pt routine)
@@ -282 +287 @@
       CALL oc_fz_pt                         ! Surface freezing point
 
-#if defined key_ice_lim
-      CALL ice_init                         ! Sea ice model
+#if defined key_lim3
+      CALL ice_init                         ! Sea ice model LIM3
+#endif
+
+#if defined key_lim2
+      CALL ice_init_2                       ! Sea ice model LIM2
 #endif