Changeset 2095 for branches/dev_1784_EVP/NEMO/LIM_SRC_3/limrhg.F90

Timestamp:

2010-09-15T14:10:33+02:00 (14 years ago)

Author:

cbricaud

Message:

add correction from reviewer

File:

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

branches/dev_1784_EVP/NEMO/LIM_SRC_3/limrhg.F90

@@ -4 +4 @@
    !!   Ice rheology : sea ice rheology
    !!======================================================================
-   !! History :   -   !  2007-03  (M.A. Morales Maqueda, S. Bouillon) Original code
-   !!            3.0  !  2008-03  (M. Vancoppenolle) LIM3
+   !! History :  LIM  !  2007-03  (M.A. Morales Maqueda, S. Bouillon) Original code
+   !!            3.0  !  2008-03  (M. Vancoppenolle) LIM 3
    !!             -   !  2008-11  (M. Vancoppenolle, S. Bouillon, Y. Aksenov) add surface tilt in ice rheolohy 
-   !!             -   !  2009-05  (G.Garric) addition of the lim2_evp cas
+   !!            3.3  !  2009-05  (G.Garric) addition of the lim2_evp cas
    !!----------------------------------------------------------------------
 #if defined key_lim3 || (  defined key_lim2 && ! defined key_lim2_vp )
@@ -15 +15 @@
    !!   lim_rhg   : computes ice velocities
    !!----------------------------------------------------------------------
-   !! * Modules used
-   USE phycst
-   USE par_oce
-   USE dom_oce
-   USE sbc_oce         ! Surface boundary condition: ocean fields
-   USE sbc_ice         ! Surface boundary condition: ice fields
-   USE lbclnk
-   USE lib_mpp
-   USE in_out_manager  ! I/O manager
-   USE limitd_me
-   USE prtctl          ! Print control
+   USE phycst           ! physical constants
+   USE par_oce          ! ocean parameters
+   USE dom_oce          ! ocean domain
+   USE sbc_oce          ! Surface boundary condition: ocean fields
+   USE sbc_ice          ! Surface boundary condition: ice fields
+   USE lbclnk           ! lateral boundary condition - MPP exchanges
+   USE lib_mpp          ! MPP library
+   USE in_out_manager   ! I/O manager
+   USE limitd_me        ! LIM3: 
+   USE prtctl           ! control print
 #if defined key_lim3
-   USE dom_ice
-   USE ice
-   USE iceini
+   USE ice              ! LIM3: ice variables
+   USE dom_ice          ! LIM3: ice domain
+   USE iceini           ! LIM3: ice initialisation
 #endif
 #if defined key_lim2 && ! defined key_lim2_vp
-   USE dom_ice_2
-   USE ice_2
-   USE iceini_2
+   USE ice_2            ! LIM2: ice variables
+   USE dom_ice_2        ! LIM2: ice domain
+   USE iceini_2         ! LIM2: ice initialisation
 #endif
 
@@ -40 +39 @@
    PRIVATE
 
-   !! * Routine accessibility
-   PUBLIC lim_rhg  ! routine called by lim_dyn
-
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
+   PUBLIC   lim_rhg   ! routine called by lim_dyn module
 
    !! * Module variables
@@ -50 +45 @@
       rzero   = 0.e0   ,  &
       rone    = 1.e0
+
+   !! * Substitutions
+#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008) 
+   !! NEMO/LIM-3 3.3,  UCL-LOCEAN-IPSL (2010) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
    SUBROUTINE lim_rhg( k_j1, k_jpj )
-
       !!-------------------------------------------------------------------
       !!                 ***  SUBROUTINE lim_rhg  ***
@@ -107 +103 @@
       !!
       !! ** References : Hunke and Dukowicz, JPO97
-      !!                 Bouillon et al., 08, in prep (update this when
-      !!                 published)
-      !!                 Vancoppenolle et al., OM08
+      !!                 Bouillon et al., 2009, Ocean. Modelling, 27, 174-184.
+      !!                 Vancoppenolle et al. 2009, Ocean Modelling, 27, 33-53.
+      !!-------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   k_j1    ! southern j-index for ice computation
+      INTEGER, INTENT(in) ::   k_jpj   ! northern j-index for ice computation
       !!
-      !!-------------------------------------------------------------------
-      ! * Arguments
-      !
-      INTEGER, INTENT(in) :: &
-         k_j1 ,                      & !: southern j-index for ice computation
-         k_jpj                         !: northern j-index for ice computation
-
-      ! * Local variables
-      INTEGER ::   ji, jj              !: dummy loop indices
-
-      INTEGER  :: &
-         jter                          !: temporary integers
-
-      CHARACTER (len=50) ::   charout
-
-      REAL(wp) :: &
-         zt11, zt12, zt21, zt22,     & !: temporary scalars
-         ztagnx, ztagny,             & !: wind stress on U/V points                       
-         delta                         !
-
-      REAL(wp) :: &
-         za,                         & !:
-         zstms,                      & !: temporary scalar for ice strength
-         zsang,                      & !: temporary scalar for coriolis term
-         zmask                         !: mask for the computation of ice mass
-
-      REAL(wp),DIMENSION(jpi,jpj) :: &
-         zpresh        ,             & !: temporary array for ice strength
-         zpreshc       ,             & !: Ice strength on grid cell corners (zpreshc)
-         zfrld1, zfrld2,             & !: lead fraction on U/V points                                    
-         zmass1, zmass2,             & !: ice/snow mass on U/V points                                    
-         zcorl1, zcorl2,             & !: coriolis parameter on U/V points
-         za1ct, za2ct  ,             & !: temporary arrays
-         zc1           ,             & !: ice mass
-         zusw          ,             & !: temporary weight for the computation
-                                !: of ice strength
-         u_oce1, v_oce1,             & !: ocean u/v component on U points                           
-         u_oce2, v_oce2,             & !: ocean u/v component on V points
-         u_ice2,                     & !: ice u component on V point
-         v_ice1                        !: ice v component on U point
+      INTEGER  ::   ji, jj   ! dummy loop indices
+      INTEGER  ::   jter     ! local integers
+      CHARACTER (len=50) ::   charout   ! local character
+      REAL(wp) ::   zt11, zt12, zt21, zt22   ! local scalars
+      REAL(wp) ::   ztagnx, ztagny, delta    !   -      -
+      REAL(wp) ::   za, zstms, zsang, zmask  !   -      -
+      REAL(wp) ::   zresm, zindb, zdummy     !   -    -
+
+      REAL(wp),DIMENSION(jpi,jpj) ::   zpresh , zfrld1, zmass1, zcorl1, za1ct    ! 2D workspace
+      REAL(wp),DIMENSION(jpi,jpj) ::   zpreshc, zfrld2, zmass2, zcorl2, za2ct    !  -      -
+      REAL(wp),DIMENSION(jpi,jpj) ::   u_oce1, v_oce1, u_ice2, zc1               !  -      -                          
+      REAL(wp),DIMENSION(jpi,jpj) ::   u_oce2, v_oce2, v_ice1, zusw              !  -      -
+      REAL(wp),DIMENSION(jpi,jpj) ::   zf1, zf2                                  !  -      -
 
       REAL(wp) :: &
@@ -166 +137 @@
          sigma1, sigma2                !: internal ice stress
 
-      REAL(wp),DIMENSION(jpi,jpj) :: &
-         zf1, zf2                      !: arrays for internal stresses
 
       REAL(wp),DIMENSION(jpi,jpj) :: &
@@ -177 +146 @@
          zs12                          !: Non-diagonal stress tensor component zs12
 
-      REAL(wp) :: &
-         zresm            ,          & !: Maximal error on ice velocity
-         zindb            ,          & !: ice (1) or not (0)      
-         zdummy                        !: dummy argument
-
-      REAL(wp),DIMENSION(jpi,jpj) :: &
-         zu_ice           ,          & !: Ice velocity on previous time step
-         zv_ice           ,          &
-         zresr                         !: Local error on velocity
+
+      REAL(wp),DIMENSION(jpi,jpj) ::   zu_ice, zv_ice, zresr   !
+      !!-------------------------------------------------------------------
 
 #if  defined key_lim2 && ! defined key_lim2_vp