Changeset 833 for trunk/NEMO/OPA_SRC/ice_oce.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/ice_oce.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/ice_oce.F90

@@ -11 +11 @@
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
-#if defined key_ice_lim
+#if defined key_lim2 || defined key_lim3
    !!----------------------------------------------------------------------
-   !!   'key_ice_lim'   :                                     LIM ice model
+   !!   'key_lim2 or key_lim3 '   :             LIM 2.0 or 3.0 ice model
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -23 +23 @@
  
    !! Shared module variables
-   LOGICAL, PUBLIC, PARAMETER ::   lk_ice_lim = .TRUE.    !: LIM ice model
+# if defined  key_lim2
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim2        = .TRUE.    !: LIM2 ice model
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim3        = .FALSE.   !: LIM3 ice model
+# else
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim2        = .FALSE.   !: LIM2 ice model
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim3        = .TRUE.    !: LIM3 ice model
+# endif
 
    !!----------------------------------------------------------------------
@@ -31 +37 @@
    REAL(wp), PUBLIC, DIMENSION(jpiglo,jpjglo) ::   &  !: cumulated fields
       fqsr_oce ,      &   !: Net short wave heat flux on free ocean 
-      fqsr_ice ,      &   !: Net short wave het flux on sea ice 
+      fqsr_ice ,      &   !: Net short wave heat flux on sea ice 
       fqnsr_oce,      &   !: Net longwave heat flux on free ocean
       fqnsr_ice,      &   !: Net longwave heat flux on sea ice
@@ -48 +54 @@
       ftaux , ftauy  , &  !: wind stresses
       gtaux , gtauy       !: wind stresses
+
+# if defined key_lim3
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &  !: field exchanges with ice model to ocean
+      catm_ice       , &  !: cloud cover
+      tatm_ice       , &  !: air temperature
+      icethi              !: icethickness
+# endif
    
    REAL(wp), PUBLIC ::   &  !:
@@ -57 +70 @@
    !!   Default option                                 NO LIM sea-ice model
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_ice_lim = .FALSE.  !: No LIM ice model
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim2        = .FALSE.  !: No LIM 2.0 ice model
+   LOGICAL, PUBLIC, PARAMETER ::   lk_lim3        = .FALSE.  !: No LIM 3.0 ice model
 #endif