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

branches/devmercator2010/NEMO/LIM_SRC_2/limdyn_2.F90

@@ -8 +8 @@
    !!             2.0  !  03-08  (C. Ethe) add lim_dyn_init
    !!             2.0  !  06-07  (G. Madec)  Surface module
-   !!             3.3  !  09-05  (G.Garric) addition of the lim2_evp cas
    !!---------------------------------------------------------------------
 #if defined key_lim2
@@ -23 +22 @@
    USE dom_ice_2      !
    USE limistate_2    !
-#if defined key_lim2_vp
    USE limrhg_2       ! ice rheology
-#else
-   USE limrhg         ! ice rheology
-#endif
+
    USE lbclnk         !
    USE lib_mpp        !
@@ -91 +87 @@
             i_jpj = jpj
             IF(ln_ctl)   CALL prt_ctl_info( 'lim_dyn  :    i_j1 = ', ivar1=i_j1, clinfo2=' ij_jpj = ', ivar2=i_jpj )
-#if defined key_lim2_vp
             CALL lim_rhg_2( i_j1, i_jpj )
-#else
-            CALL lim_rhg( i_j1, i_jpj ) !!!!cbr CALL lim_rhg( i_j1, i_jpj, kt )
-#endif
             !
          ELSE                                 ! optimization of the computational area
@@ -113 +105 @@
                   i_j1 = i_j1 + 1
                END DO
-#if defined key_lim2_vp
                i_j1 = MAX( 1, i_j1-1 )
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : NH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
                CALL lim_rhg_2( i_j1, i_jpj )
-#else
-               i_j1 = MAX( 1, i_j1-2 )
-               IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : NH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
-               CALL lim_rhg( i_j1, i_jpj )
-#endif
                ! 
                ! Southern hemisphere
@@ -130 +116 @@
                   i_jpj = i_jpj - 1
                END DO
-#if defined key_lim2_vp
                i_jpj = MIN( jpj, i_jpj+2 )
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : SH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
                CALL lim_rhg_2( i_j1, i_jpj )
-#else
-               i_jpj = MIN( jpj, i_jpj+1 )
-               IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : SH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
-               CALL lim_rhg( i_j1, i_jpj ) !!!!cbr CALL lim_rhg( i_j1, i_jpj, kt )
-#endif
                ! 
             ELSE                                 ! local domain extends over one hemisphere only
@@ -154 +134 @@
                   i_jpj = i_jpj - 1
                END DO
-#if defined key_lim2_vp
                i_jpj = MIN( jpj, i_jpj+2)
-
+    
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : one hemisphere: i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
                CALL lim_rhg_2( i_j1, i_jpj )
-#else
-               i_j1 = MAX( 1, i_j1-2 )
-               i_jpj = MIN( jpj, i_jpj+1)
-               IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : one hemisphere: i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
-               CALL lim_rhg( i_j1, i_jpj ) !!!!cbr CALL lim_rhg( i_j1, i_jpj, kt )
-#endif
                !
             ENDIF
@@ -175 +148 @@
          ! computation of friction velocity
          ! --------------------------------
-
-     SELECT CASE( cl_grid )
-
-      CASE( 'C' )                          ! C-grid ice dynamics
-         !?????????????????????????????????
-         ! ice-ocean velocity at U & V-points (u_ice vi_ice at U- & V-points ; ssu_m, ssv_m at U- & V-points)
-         zu_io(:,:) = u_ice(:,:) - ssu_m(:,:)
-         zv_io(:,:) = v_ice(:,:) - ssv_m(:,:)
-
-
-      CASE( 'B' )                          ! B-grid ice dynamics
          ! ice-ocean velocity at U & V-points (u_ice v_ice at I-point ; ssu_m, ssv_m at U- & V-points)
          
@@ -194 +156 @@
             END DO
          END DO
-
-      END SELECT
-
          ! frictional velocity at T-point
          DO jj = 2, jpjm1
@@ -239 +198 @@
       NAMELIST/namicedyn/ epsd, alpha,     &
          &                dm, nbiter, nbitdr, om, resl, cw, angvg, pstar,   &
-         &                c_rhg, etamn, creepl, ecc, ahi0, &
-         &                nevp, telast, alphaevp
+         &                c_rhg, etamn, creepl, ecc, ahi0
       !!-------------------------------------------------------------------
 
@@ -265 +223 @@
          WRITE(numout,*) '       eccentricity of the elliptical yield curve       ecc    = ', ecc
          WRITE(numout,*) '       horizontal diffusivity coeff. for sea-ice        ahi0   = ', ahi0
-         WRITE(numout,*) '       number of iterations for subcycling              nevp   = ', nevp
-         WRITE(numout,*) '       timescale for elastic waves                      telast = ', telast
-         WRITE(numout,*) '       coefficient for the solution of int. stresses  alphaevp = ', alphaevp
       ENDIF