Changeset 2077 for branches/devmercator2010/NEMO/LIM_SRC_2/dom_ice_2.F90

Timestamp:

2010-09-09T10:43:51+02:00 (14 years ago)

Author:

cbricaud

Message:

commit change from DEV_r1784_3DF

File:

• branches/devmercator2010/NEMO/LIM_SRC_2/dom_ice_2.F90 (modified) (2 diffs)

branches/devmercator2010/NEMO/LIM_SRC_2/dom_ice_2.F90

@@ -5 +5 @@
    !!======================================================================
    !! History :   2.0  !  03-08  (C. Ethe)  Free form and module
-   !!             3.3  !  09-05 (G.Garric) addition of the lim2_evp cas
    !!----------------------------------------------------------------------
 #if defined key_lim2
@@ -27 +26 @@
       &                                              area   ,         &  !: surface of grid cell 
       &                                              tms    , tmu        !: temperature and velocity points masks
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,2,2)     ::   wght                !: weight of the 4 neighbours to compute averages
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,2,2)     ::   wght   ,         &  !: weight of the 4 neighbours to compute averages
+      &                                              akappa , bkappa     !: first and third group of metric coefficients
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,2,2,2,2) ::   alambd   !: second group of metric coefficients
 
-#if defined key_lim2_vp
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,2,2)     ::                     &
-      &                                              akappa , bkappa     !: first and third group of metric coefficients
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,2,2,2,2) ::   alambd              !: second group of metric coefficients
-#else
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)         ::   tmv    , tmf        !: y-velocity and F-points masks
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)         ::   tmi                 !: ice mask: =1 if ice thick > 0
-#endif
    !!======================================================================
 #endif