Changeset 888 for trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -45 +45 @@
    USE daymod                       ! date and time info
    USE dom_oce                      ! ocean space and time domain
+   USE sbc_ice                      ! surface boundary condition: ice
    USE in_out_manager               ! I/O manager
    USE par_oce                      !
@@ -50 +51 @@
 
    USE oce, only: tn, un, vn
-   USE ice, only: frld, hicif, hsnif
-   USE flx_oce, only : alb_ice ,  & ! albedo of ice
-                       tn_ice       ! ice surface temperature
+#if defined key_lim2
+   USE ice_2, only: frld, hicif, hsnif
+#endif
 
    IMPLICIT NONE
@@ -116 +117 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -309 +310 @@
 
 #if defined key_cpl_albedo
+# if defined key_lim3
+         Must be adapted for LIM3
+# endif
          tn_ice  = 271.285
     alb_ice =   0.75