Changeset 2077 for branches/devmercator2010/NEMO/LIM_SRC_2/limmsh_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/limmsh_2.F90 (modified) (7 diffs)

branches/devmercator2010/NEMO/LIM_SRC_2/limmsh_2.F90

@@ -47 +47 @@
       !!         original    : 01-04 (LIM)
       !!         addition    : 02-08 (C. Ethe, G. Madec)
-      !!         additions   : 2009-05 (addition of the lim2_evp case, G. Garric)
       !!--------------------------------------------------------------------- 
       !! * Local variables
       INTEGER :: ji, jj      ! dummy loop indices
 
-      REAL(wp) ::         &
-         zusden              ! temporary scalars
-#if defined key_lim2_vp
       REAL(wp), DIMENSION(jpi,jpj) ::  &
          zd2d1 , zd1d2       ! Derivative of zh2 (resp. zh1) in the x direction
@@ -61 +57 @@
          zh1p  , zh2p   , &  ! Idem zh1, zh2 for the bottom left corner of the grid
          zd2d1p, zd1d2p , &  ! Idem zd2d1, zd1d2 for the bottom left corner of the grid
-         zusden2             ! temporary scalars
-#endif
+         zusden, zusden2     ! temporary scalars
       !!---------------------------------------------------------------------
 
@@ -117 +112 @@
       !-------------------
 !!ibug ???
+      akappa(:,:,:,:) = 0.e0
       wght(:,:,:,:) = 0.e0
-      tmu(:,:)      = 0.e0
-#if defined key_lim2_vp 
-      akappa(:,:,:,:)     = 0.e0
       alambd(:,:,:,:,:,:) = 0.e0
-#else
-      tmv(:,:) = 0.e0
-      tmf(:,:) = 0.e0
-#endif
+      tmu(:,:) = 0.e0
 !!i
       
-#if defined key_lim2_vp
+      
       ! metric coefficients for sea ice dynamic
       !----------------------------------------
@@ -162 +152 @@
       CALL lbc_lnk( wght(:,:,2,1), 'I', 1. )      ! but it is never used
       CALL lbc_lnk( wght(:,:,2,2), 'I', 1. )
-#else
-      !                                                      ! weights (wght)
-      DO jj = 2, jpj-1
-         DO ji = 2, jpi-1
-            zusden = 1. / (  ( e1t(ji+1,jj) + e1t(ji,jj  ) )   &
-               &           * ( e2t(ji,jj+1) + e2t(ji  ,jj) ) ) 
-            wght(ji,jj,1,1) = zusden * e1t(ji+1,jj) * e2t(ji,jj+1)
-            wght(ji,jj,1,2) = zusden * e1t(ji+1,jj) * e2t(ji,jj  )
-            wght(ji,jj,2,1) = zusden * e1t(ji  ,jj) * e2t(ji,jj+1)
-            wght(ji,jj,2,2) = zusden * e1t(ji  ,jj) * e2t(ji,jj  )
-         END DO
-      END DO
-
-      !With EVP, the weights are calculated on 'F' points
-      CALL lbc_lnk( wght(:,:,1,1), 'F', 1. )      ! CAUTION: even with the lbc_lnk at ice U-V-point
-      CALL lbc_lnk( wght(:,:,1,2), 'F', 1. )      ! the value of wght at jpj is wrong
-      CALL lbc_lnk( wght(:,:,2,1), 'F', 1. )      ! but it is never used
-      CALL lbc_lnk( wght(:,:,2,2), 'F', 1. )
-
-#endif
     
       ! Coefficients for divergence of the stress tensor
       !-------------------------------------------------
 
-#if defined key_lim2_vp
       DO jj = 2, jpj
          DO ji = 2, jpi   ! NO vector opt.
@@ -254 +223 @@
       CALL lbc_lnk( alambd(:,:,2,1,1,1), 'I', 1. )      !
       CALL lbc_lnk( alambd(:,:,2,1,1,2), 'I', 1. )      !
-#endif
             
 
@@ -265 +233 @@
       tmu(:,1) = 0.e0
       tmu(1,:) = 0.e0
-
-#if defined key_lim2_vp
       DO jj = 2, jpj               ! ice U.V-point: computed from ice T-point mask
          DO ji = 2, jpim1   ! NO vector opt.
@@ -275 +241 @@
       !--lateral boundary conditions    
       CALL lbc_lnk( tmu(:,:), 'I', 1. )
-#else
-      tmv(:,1) = 0.e0 !SB
-      tmv(1,:) = 0.e0 !SB
-      tmf(1,:) = 0.e0
-      tmf(:,1) = 0.e0
-      DO jj = 1, jpj - 1
-         DO ji = 1 , jpi - 1
-            tmu(ji,jj) =  tms(ji,jj) * tms(ji+1,jj)
-            tmv(ji,jj) =  tms(ji,jj) * tms(ji,jj+1)
-            tmf(ji,jj) =  tms(ji,jj) * tms(ji+1,jj) * tms(ji,jj+1) * &
-               tms(ji+1,jj+1)
-         END DO
-      END DO
-
-      !--lateral boundary conditions
-      CALL lbc_lnk( tmu(:,:), 'U', 1. )
-      CALL lbc_lnk( tmv(:,:), 'V', 1. )
-      CALL lbc_lnk( tmf(:,:), 'F', 1. )
-#endif
       
       ! unmasked and masked area of T-grid cell