Changeset 14003 for NEMO/branches/2020/SI3_vp_rheology/src/ICE/ice.F90

Timestamp:

2020-12-02T15:12:08+01:00 (4 years ago)

Author:

clem

Message:

update to trunk

File:

• NEMO/branches/2020/SI3_vp_rheology/src/ICE/ice.F90 (modified) (4 diffs)

NEMO/branches/2020/SI3_vp_rheology/src/ICE/ice.F90

@@ -151 +151 @@
    !                                     !!** ice-rheology namelist (namdyn_rhg) **
    ! -- evp
+   LOGICAL , PUBLIC ::   ln_rhg_EVP       ! EVP rheology switch, used for rdgrft and rheology
+   LOGICAL , PUBLIC ::   ln_rhg_EAP       ! EAP rheology switch, used for rdgrft and rheology
    LOGICAL , PUBLIC ::   ln_aEVP          !: using adaptive EVP (T or F) 
    REAL(wp), PUBLIC ::   rn_creepl        !: creep limit (has to be low enough, circa 10-9 m/s, depending on rheology)
@@ -158 +160 @@
    INTEGER , PUBLIC ::   nn_rhg_chkcvg    !: check ice rheology convergence 
    ! -- vp
+   LOGICAL , PUBLIC ::   ln_rhg_VP        !: VP rheology
    INTEGER , PUBLIC ::   nn_vp_nout       !: Number of outer iterations
    INTEGER , PUBLIC ::   nn_vp_ninn       !: Number of inner iterations (linear system solver)
@@ -251 +254 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   divu_i          !: Divergence of the velocity field             [s-1]
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   shear_i         !: Shear of the velocity field                  [s-1]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   aniso_11, aniso_12   !: structure tensor elements
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   rdg_conv
    !
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   t_bo            !: Sea-Ice bottom temperature [Kelvin]     
@@ -441 +446 @@
       ALLOCATE( u_oce    (jpi,jpj) , v_oce    (jpi,jpj) , ht_i_new  (jpi,jpj) , strength(jpi,jpj) ,  &
          &      stress1_i(jpi,jpj) , stress2_i(jpi,jpj) , stress12_i(jpi,jpj) ,                      &
-         &      delta_i  (jpi,jpj) , divu_i   (jpi,jpj) , shear_i   (jpi,jpj) , STAT=ierr(ii) )
+         &      delta_i  (jpi,jpj) , divu_i   (jpi,jpj) , shear_i   (jpi,jpj) ,                      &
+         &      aniso_11 (jpi,jpj) , aniso_12 (jpi,jpj) , rdg_conv  (jpi,jpj) , STAT=ierr(ii) )
 
       ii = ii + 1