Changeset 14120


Ignore:
Timestamp:
2020-12-07T15:20:39+01:00 (9 months 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.

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icedyn_rhg_eap.F90

    r14117 r14120  
    1616   !!                                           CICE code (Tsamados, Heorton) 
    1717   !!---------------------------------------------------------------------- 
    18 #if defined key_si3  
     18#if defined key_si3 
    1919   !!---------------------------------------------------------------------- 
    2020   !!   'key_si3'                                       SI3 sea-ice model 
     
    760760 
    761761         ! convergence test 
    762          IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice ) 
     762         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg_eap( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice ) 
    763763         ! 
    764764         !                                                ! ==================== ! 
     
    995995 
    996996 
    997    SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb ) 
     997   SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb ) 
    998998      !!---------------------------------------------------------------------- 
    999       !!                    ***  ROUTINE rhg_cvg  *** 
     999      !!                    ***  ROUTINE rhg_cvg_eap  *** 
    10001000      !! 
    10011001      !! ** Purpose :   check convergence of oce rheology 
     
    10221022         IF( lwp ) THEN 
    10231023            WRITE(numout,*) 
    1024             WRITE(numout,*) 'rhg_cvg : ice rheology convergence control' 
     1024            WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control' 
    10251025            WRITE(numout,*) '~~~~~~~' 
    10261026         ENDIF 
     
    10601060      ENDIF 
    10611061 
    1062    END SUBROUTINE rhg_cvg 
     1062   END SUBROUTINE rhg_cvg_eap 
    10631063 
    10641064 
  • NEMO/trunk/tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90

    r14117 r14120  
    782782 
    783783         ! convergence test 
    784          IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice ) 
     784         IF( nn_rhg_chkcvg == 2 )   CALL rhg_cvg_eap( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice ) 
    785785         ! 
    786786         !                                                ! ==================== ! 
     
    10171017 
    10181018 
    1019    SUBROUTINE rhg_cvg( kt, kiter, kitermax, pu, pv, pub, pvb ) 
     1019   SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb ) 
    10201020      !!---------------------------------------------------------------------- 
    1021       !!                    ***  ROUTINE rhg_cvg  *** 
     1021      !!                    ***  ROUTINE rhg_cvg_eap  *** 
    10221022      !! 
    10231023      !! ** Purpose :   check convergence of oce rheology 
     
    10441044         IF( lwp ) THEN 
    10451045            WRITE(numout,*) 
    1046             WRITE(numout,*) 'rhg_cvg : ice rheology convergence control' 
     1046            WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control' 
    10471047            WRITE(numout,*) '~~~~~~~' 
    10481048         ENDIF 
     
    10861086      ENDIF 
    10871087 
    1088    END SUBROUTINE rhg_cvg 
     1088   END SUBROUTINE rhg_cvg_eap 
    10891089 
    10901090 
Note: See TracChangeset for help on using the changeset viewer.