Changeset 2076 for branches/devmercator2010/NEMO/LIM_SRC_3

Timestamp:

2010-09-08T18:17:25+02:00 (14 years ago)

Author:

cbricaud

Message:

add change dev_1784_EVP

File:

• branches/devmercator2010/NEMO/LIM_SRC_3/limrhg.F90 (modified) (7 diffs)

branches/devmercator2010/NEMO/LIM_SRC_3/limrhg.F90

@@ -7 +7 @@
    !!            3.0  !  2008-03  (M. Vancoppenolle) LIM3
    !!             -   !  2008-11  (M. Vancoppenolle, S. Bouillon, Y. Aksenov) add surface tilt in ice rheolohy 
+   !!             -   !  2009-05  (G.Garric) addition of the lim2_evp cas
    !!----------------------------------------------------------------------
-#if defined key_lim3
+#if defined key_lim3 || (  defined key_lim2 && ! defined key_lim2_vp )
    !!----------------------------------------------------------------------
    !!   'key_lim3'                                      LIM3 sea-ice model
@@ -18 +19 @@
    USE par_oce
    USE dom_oce
-   USE dom_ice
    USE sbc_oce         ! Surface boundary condition: ocean fields
    USE sbc_ice         ! Surface boundary condition: ice fields
-   USE ice
-   USE iceini
    USE lbclnk
    USE lib_mpp
@@ -28 +26 @@
    USE limitd_me
    USE prtctl          ! Print control
-
+#if defined key_lim3
+   USE dom_ice
+   USE ice
+   USE iceini
+#endif
+#if defined key_lim2 && ! defined key_lim2_vp
+   USE dom_ice_2
+   USE ice_2
+   USE iceini_2
+#endif
 
    IMPLICIT NONE
@@ -180 +187 @@
          zresr                         !: Local error on velocity
 
+#if  defined key_lim2 && ! defined key_lim2_vp
+     vt_s => hsnm
+     vt_i => hicm
+     at_i(:,:) = 1. - frld(:,:)
+#endif
       !
       !------------------------------------------------------------------------------!
@@ -190 +202 @@
       u_ice2(:,:)  = 0.0 ; v_ice1(:,:)  = 0.0
       zdd(:,:)     = 0.0 ; zdt(:,:)     = 0.0 ; zds(:,:)     = 0.0
-
+#if defined key_lim3
       ! Ice strength on T-points
       CALL lim_itd_me_icestrength(ridge_scheme_swi)
+#endif
 
       ! Ice mass and temp variables
@@ -200 +213 @@
          DO ji = 1 , jpi
             zc1(ji,jj)    = tms(ji,jj) * ( rhosn * vt_s(ji,jj) + rhoic * vt_i(ji,jj) )
+#if defined key_lim3
             zpresh(ji,jj) = tms(ji,jj) *  strength(ji,jj) / 2.
+#else
+            zpresh(ji,jj) = tms(ji,jj) *  2. * pstar * hicm(ji,jj) * EXP( -c_rhg * frld(ji,jj) )
+#endif
             ! tmi = 1 where there is ice or on land
             tmi(ji,jj)    = 1.0 - ( 1.0 - MAX( 0.0 , SIGN ( 1.0 , vt_i(ji,jj) - &
@@ -269 +286 @@
                / ( e2t(ji,jj+1) + e2t(ji,jj) + epsd )
             !
+            ! Mass, coriolis coeff. and currents
             u_oce1(ji,jj)  = u_oce(ji,jj)
             v_oce2(ji,jj)  = v_oce(ji,jj)