Changeset 2978 for branches

Timestamp:

2011-10-22T16:05:57+02:00 (13 years ago)

Author:

cetlod

Message:

Add in changes from the trunk between revisions 2787 and 2855, see ticket #877

Location:

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO

Files:

• LIM_SRC_2/iceini_2.F90 (modified) (2 diffs)
• LIM_SRC_2/limistate_2.F90 (modified) (2 diffs)
• NST_SRC/agrif_opa_update.F90 (modified) (1 diff)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

@@ -23 +23 @@
    USE par_ice_2        ! LIM2 parameters
    USE thd_ice_2        ! LIM2 thermodynamical variables
-   USE limrhg           ! LIM2 rheology
+   USE limrhg           ! LIM2 EVP rheology
+   USE limrhg_2         ! LIM2  VP rheology (requires "key_lim2_vp")
    USE ice_2            ! LIM2 ice variable
    USE limmsh_2         ! LIM2 mesh
@@ -65 +66 @@
 #if ! defined key_lim2_vp
       ierr = ierr + lim_rhg_alloc  ()
+#else
+      ierr = ierr + lim_rhg_alloc_2  ()
 #endif
       IF( lk_mpp    )   CALL mpp_sum( ierr )

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90

@@ -33 +33 @@
    PUBLIC lim_istate_2      ! routine called by lim_init_2.F90
 
-!!! ** init namelist (namiceini) **
+   !!! ** init namelist (namiceini) **
    LOGICAL  ::   ln_limini = .FALSE.  !: Ice initialization state
    REAL(wp) ::   ttest     = 2.0      ! threshold water temperature for initial sea ice
@@ -124 +124 @@
       syyst (:,:)  = 0.e0
       sxyst (:,:)  = 0.e0
+#if ! defined key_lim2_vp
+      stress1_i (:,:) = 0._wp                          ! EVP rheology
+      stress2_i (:,:) = 0._wp
+      stress12_i(:,:) = 0._wp
+#endif
 
       !-- lateral boundary conditions

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -9 +9 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp
-
+   
    IMPLICIT NONE
    PRIVATE