Merge branch '68-summer-body-2022' into 79-summer-2022-work-ldf-halo-cleanup

src/ICE/icesbc.F90

@@ -100,7 +100,7 @@ CONTAINS
          !
       ENDIF
       !
-      CALL lbc_lnk( 'icesbc', utau_ice, 'U', -1.0_wp, vtau_ice, 'V', -1.0_wp )
+      CALL lbc_lnk( 'icesbc', utau_ice, 'T', -1.0_wp, vtau_ice, 'T', -1.0_wp )
       !
       IF( ln_timing )   CALL timing_stop('icesbc')
       !

tests/BENCH/MY_SRC/usrdef_sbc.F90

@@ -109,6 +109,13 @@ CONTAINS
          vtau_ice(ji,jj) = 0.1_wp + zztmp
       END_2D
 
+      IF( l_NFold .AND. c_NFtype == 'T' ) THEN   ! force 0 at the folding points
+         utau_ice(mi0(jpiglo/2+1,nn_hls):mi1(jpiglo/2+1,nn_hls),mj0(jpjglo-nn_hls,nn_hls):mj1(jpjglo-nn_hls,nn_hls)) = 0._wp
+         vtau_ice(mi0(jpiglo/2+1,nn_hls):mi1(jpiglo/2+1,nn_hls),mj0(jpjglo-nn_hls,nn_hls):mj1(jpjglo-nn_hls,nn_hls)) = 0._wp
+         utau_ice(mi0(  nn_hls+1,nn_hls):mi1(  nn_hls+1,nn_hls),mj0(jpjglo-nn_hls,nn_hls):mj1(jpjglo-nn_hls,nn_hls)) = 0._wp
+         vtau_ice(mi0(  nn_hls+1,nn_hls):mi1(  nn_hls+1,nn_hls),mj0(jpjglo-nn_hls,nn_hls):mj1(jpjglo-nn_hls,nn_hls)) = 0._wp
+      ENDIF
+
       CALL lbc_lnk( 'usrdef_sbc', utau_ice, 'T', -1., vtau_ice, 'T', -1. )
 #endif
       !