Changeset 14024

Timestamp:

2020-12-03T09:36:48+01:00 (4 years ago)

Author:

mathiot

Message:

Caught up with trunk rev 14023

File:

• NEMO/branches/2020/tickets_icb_1900/src/ICE/icedyn_rhg_eap.F90 (modified) (6 diffs)

NEMO/branches/2020/tickets_icb_1900/src/ICE/icedyn_rhg_eap.F90

@@ -16 +16 @@
    !!                                           CICE code (Tsamados, Heorton) 
    !!----------------------------------------------------------------------
-#if defined key_si3
+#if defined key_si3 && ! defined key_agrif
    !!----------------------------------------------------------------------
    !!   'key_si3'                                       SI3 sea-ice model
@@ -23 +23 @@
    !!   rhg_eap_rst     : read/write EVP fields in ice restart
    !!----------------------------------------------------------------------
-   USE par_oce
    USE phycst         ! Physical constant
    USE dom_oce        ! Ocean domain
@@ -750 +749 @@
 
          ! convergence test
-         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice, jpi, jpj )
+         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )
          !
          !                                                ! ==================== !
@@ -987 +986 @@
 
    
-   SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb, jpi, jpj )
+   SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb )
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE rhg_cvg  ***
@@ -1001 +1000 @@
       !!----------------------------------------------------------------------
       INTEGER ,                 INTENT(in) ::   kt, kiter, kitermax       ! ocean time-step index
-      INTEGER ,                 INTENT(in) ::   jpi, jpj
       REAL(wp), DIMENSION(:,:), INTENT(in) ::   pu, pv, pub, pvb          ! now and before velocities
       !!
@@ -1972 +1970 @@
    !!   Default option         Empty module           NO SI3 sea-ice model
    !!----------------------------------------------------------------------
+   USE par_kind
+   USE lib_mpp
+   CONTAINS
+   SUBROUTINE ice_dyn_rhg_eap( kt, Kmm, pstress1_i, pstress2_i, pstress12_i, pshear_i, pdivu_i, pdelta_i, paniso_11, paniso_12, prdg_conv )
+      INTEGER                 , INTENT(in   ) ::   kt                                    ! time step
+      INTEGER                 , INTENT(in   ) ::   Kmm                                   ! ocean time level index
+      REAL(wp), DIMENSION(:,:), INTENT(in   ) ::   pstress1_i, pstress2_i, pstress12_i   !
+      REAL(wp), DIMENSION(:,:), INTENT(in   ) ::   pshear_i  , pdivu_i   , pdelta_i      !
+      REAL(wp), DIMENSION(:,:), INTENT(in   ) ::   paniso_11 , paniso_12                 ! structure tensor components
+      REAL(wp), DIMENSION(:,:), INTENT(in   ) ::   prdg_conv                             ! for ridging
+      CALL ctl_stop('EAP rheology is currently dsabled due to issues with AGRIF preprocessing')
+   END SUBROUTINE ice_dyn_rhg_eap
+   SUBROUTINE rhg_eap_rst( cdrw, kt )
+      CHARACTER(len=*) , INTENT(in) ::   cdrw   ! "READ"/"WRITE" flag
+      INTEGER, OPTIONAL, INTENT(in) ::   kt     ! ice time-step
+   END SUBROUTINE rhg_eap_rst
 #endif