Changeset 14120 for NEMO/trunk/src/ICE

Timestamp:

2020-12-07T15:20:39+01:00 (3 years ago)

Author:

acc

Message:

trunk fix of AGRIF compilation issues with icedyn_rhg_eap.F90. This solution renames the module-contained subroutine: rhg_cvg to rhg_cvg_eap. This is necessary because otherwise there is match with a routine with the same name in icedyn_rhg_evp and AGRIF wrongly inserts the sub-loop code from this version during preprocessing. It seems AGRIF is scope-unaware and the contents of the preprocessed file will depend on which of the two, same-named routines was processed first. This may explain the inconsistent compilation success or failure during the previous testing of this routine.

File:

• NEMO/trunk/src/ICE/icedyn_rhg_eap.F90 (modified) (5 diffs)

NEMO/trunk/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