Changeset 14121
- Timestamp:
- 2020-12-07T16:46:35+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/r14118_ticket2377
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r14118_ticket2377/src/ICE/icedyn_rhg_eap.F90
r14117 r14121 16 16 !! CICE code (Tsamados, Heorton) 17 17 !!---------------------------------------------------------------------- 18 #if defined key_si3 18 #if defined key_si3 19 19 !!---------------------------------------------------------------------- 20 20 !! 'key_si3' SI3 sea-ice model … … 760 760 761 761 ! 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 ) 763 763 ! 764 764 ! ! ==================== ! … … 995 995 996 996 997 SUBROUTINE rhg_cvg ( kt, kiter, kitermax, pu, pv, pub, pvb )997 SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb ) 998 998 !!---------------------------------------------------------------------- 999 !! *** ROUTINE rhg_cvg ***999 !! *** ROUTINE rhg_cvg_eap *** 1000 1000 !! 1001 1001 !! ** Purpose : check convergence of oce rheology … … 1022 1022 IF( lwp ) THEN 1023 1023 WRITE(numout,*) 1024 WRITE(numout,*) 'rhg_cvg : ice rheology convergence control'1024 WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control' 1025 1025 WRITE(numout,*) '~~~~~~~' 1026 1026 ENDIF … … 1060 1060 ENDIF 1061 1061 1062 END SUBROUTINE rhg_cvg 1062 END SUBROUTINE rhg_cvg_eap 1063 1063 1064 1064 -
NEMO/branches/2020/r14118_ticket2377/tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90
r14117 r14121 782 782 783 783 ! 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 ) 785 785 ! 786 786 ! ! ==================== ! … … 1017 1017 1018 1018 1019 SUBROUTINE rhg_cvg ( kt, kiter, kitermax, pu, pv, pub, pvb )1019 SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb ) 1020 1020 !!---------------------------------------------------------------------- 1021 !! *** ROUTINE rhg_cvg ***1021 !! *** ROUTINE rhg_cvg_eap *** 1022 1022 !! 1023 1023 !! ** Purpose : check convergence of oce rheology … … 1044 1044 IF( lwp ) THEN 1045 1045 WRITE(numout,*) 1046 WRITE(numout,*) 'rhg_cvg : ice rheology convergence control'1046 WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control' 1047 1047 WRITE(numout,*) '~~~~~~~' 1048 1048 ENDIF … … 1086 1086 ENDIF 1087 1087 1088 END SUBROUTINE rhg_cvg 1088 END SUBROUTINE rhg_cvg_eap 1089 1089 1090 1090
Note: See TracChangeset
for help on using the changeset viewer.