Changeset 14121

Timestamp:

2020-12-07T16:46:35+01:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@14120 (ticket #2377)}

Location:

NEMO/branches/2020/r14118_ticket2377

Files:

• src/ICE/icedyn_rhg_eap.F90 (modified) (5 diffs)
• tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90 (modified) (4 diffs)

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

@@ -16 +16 @@
    !!                                           CICE code (Tsamados, Heorton)
    !!----------------------------------------------------------------------
-#if defined key_si3 
+#if defined key_si3
    !!----------------------------------------------------------------------
    !!   'key_si3'                                       SI3 sea-ice model
@@ -760 +760 @@
 
          ! convergence test
-         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )
+         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg_eap( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )
          !
          !                                                ! ==================== !
@@ -995 +995 @@
 
 
-   SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb )
+   SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb )
       !!----------------------------------------------------------------------
-      !!                    ***  ROUTINE rhg_cvg  ***
+      !!                    ***  ROUTINE rhg_cvg_eap  ***
       !!
       !! ** Purpose :   check convergence of oce rheology
@@ -1022 +1022 @@
          IF( lwp ) THEN
             WRITE(numout,*)
-            WRITE(numout,*) 'rhg_cvg : ice rheology convergence control'
+            WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control'
             WRITE(numout,*) '~~~~~~~'
          ENDIF
@@ -1060 +1060 @@
       ENDIF
 
-   END SUBROUTINE rhg_cvg
+   END SUBROUTINE rhg_cvg_eap
 
 

NEMO/branches/2020/r14118_ticket2377/tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90

@@ -782 +782 @@
 
          ! convergence test
-         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )
+         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg_eap( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )
          !
          !                                                ! ==================== !
@@ -1017 +1017 @@
 
 
-   SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb )
+   SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb )
       !!----------------------------------------------------------------------
-      !!                    ***  ROUTINE rhg_cvg  ***
+      !!                    ***  ROUTINE rhg_cvg_eap  ***
       !!
       !! ** Purpose :   check convergence of oce rheology
@@ -1044 +1044 @@
          IF( lwp ) THEN
             WRITE(numout,*)
-            WRITE(numout,*) 'rhg_cvg : ice rheology convergence control'
+            WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control'
             WRITE(numout,*) '~~~~~~~'
          ENDIF
@@ -1086 +1086 @@
       ENDIF
 
-   END SUBROUTINE rhg_cvg
+   END SUBROUTINE rhg_cvg_eap