Changeset 2319 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90

Timestamp:

2010-10-27T15:18:11+02:00 (14 years ago)

Author:

cbricaud

Message:

put new EVP rheology lost during the merge

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90 (modified) (10 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90

@@ -22 +22 @@
    USE dom_ice_2      !
    USE limistate_2    !
+#if defined key_lim2_vp
    USE limrhg_2       ! ice rheology
-
+#else
+   USE limrhg         ! LIM : EVP ice rheology
+#endif
    USE lbclnk         !
    USE lib_mpp        !
@@ -87 +90 @@
             i_jpj = jpj
             IF(ln_ctl)   CALL prt_ctl_info( 'lim_dyn  :    i_j1 = ', ivar1=i_j1, clinfo2=' ij_jpj = ', ivar2=i_jpj )
-            CALL lim_rhg_2( i_j1, i_jpj )
+#if defined key_lim2_vp
+            CALL lim_rhg_2( i_j1, i_jpj )             !  VP rheology
+#else
+            CALL lim_rhg  ( i_j1, i_jpj )             ! EVP rheology
+#endif
             !
          ELSE                                 ! optimization of the computational area
@@ -105 +112 @@
                   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
@@ -110 +118 @@
                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
                i_j1  =  1 
@@ -116 +130 @@
                   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
@@ -121 +136 @@
                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 )
+               ! 
+#endif
+
             ELSE                                 ! local domain extends over one hemisphere only
                !                                 ! Rheology is computed only over the ice cover
@@ -138 +160 @@
                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 )
+#if defined key_lim2_vp
+               i_jpj = MIN( jpj, i_jpj+2)
+               CALL lim_rhg_2( i_j1, i_jpj )                !  VP rheology
+#else
+               i_j1 = MAX( 1, i_j1-2 )
+               i_jpj = MIN( jpj, i_jpj+1)
+               CALL lim_rhg  ( i_j1, i_jpj )                ! EVP rheology
+#endif
                !
             ENDIF
@@ -148 +177 @@
          ! computation of friction velocity
          ! --------------------------------
-         ! ice-ocean velocity at U & V-points (u_ice v_ice at I-point ; ssu_m, ssv_m at U- & V-points)
-         
-         DO jj = 1, jpjm1
-            DO ji = 1, jpim1   ! NO vector opt.
-               zu_io(ji,jj) = 0.5 * ( u_ice(ji+1,jj+1) + u_ice(ji+1,jj  ) ) - ssu_m(ji,jj)
-               zv_io(ji,jj) = 0.5 * ( v_ice(ji+1,jj+1) + v_ice(ji  ,jj+1) ) - ssv_m(ji,jj)
-            END DO
-         END DO
+         SELECT CASE( cl_grid )
+         CASE( 'C' )       ! C-grid ice dynamics (EVP)
+                           ! ice-ocean & ice velocity at  ocean velocity points
+            zu_io(:,:) = u_ice(:,:) - ssu_m(:,:)  
+            zv_io(:,:) = v_ice(:,:) - ssv_m(:,:)
+            !
+         CASE( 'B' )       ! B-grid ice dynamics (VP) 
+                           ! ice-ocean velocity at U & V-points (u_ice v_ice at I-point ; ssu_m, ssv_m at U- & V-points)
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1   ! NO vector opt.
+                  zu_io(ji,jj) = 0.5 * ( u_ice(ji+1,jj+1) + u_ice(ji+1,jj  ) ) - ssu_m(ji,jj)
+                  zv_io(ji,jj) = 0.5 * ( v_ice(ji+1,jj+1) + v_ice(ji  ,jj+1) ) - ssv_m(ji,jj)
+               END DO
+            END DO
+         END SELECT
+
          ! frictional velocity at T-point
          DO jj = 2, jpjm1
@@ -198 +235 @@
       NAMELIST/namicedyn/ epsd, alpha,     &
          &                dm, nbiter, nbitdr, om, resl, cw, angvg, pstar,   &
-         &                c_rhg, etamn, creepl, ecc, ahi0
+         &                c_rhg, etamn, creepl, ecc, ahi0                   &
+         &                nevp, telast,alphaevp
       !!-------------------------------------------------------------------
 
@@ -223 +261 @@
          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