Changeset 15088 for NEMO/trunk/src/OCE/ICB/icbini.F90

Timestamp:

2021-07-06T15:03:34+02:00 (3 years ago)

Author:

acc

Message:

Check in ICB changes from 2021/ticket2696_icb_halo1_halo2_compatibility (#2696) to restore halo1 - halo2 equivalence with ORCA2_ICE_PISCES and icebergs. The benefit won't be apparent until the reproducibility issue with icedyn_rhg_evp.F90 is sorted. This fix closes #2696

File:

• NEMO/trunk/src/OCE/ICB/icbini.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ICB/icbini.F90

@@ -182 +182 @@
       i3 = INT( src_calving(i1,jpj/2) )
       jj = INT( i3/nicbpack )
-      ricb_left = REAL( i3 - nicbpack*jj, wp )
+      ricb_left = REAL( i3 - nicbpack*jj, wp ) - (nn_hls-1)
       i1 = MIN( nicbei+1, jpi )
       i3 = INT( src_calving(i1,jpj/2) )
       jj = INT( i3/nicbpack )
-      ricb_right = REAL( i3 - nicbpack*jj, wp )
+      ricb_right = REAL( i3 - nicbpack*jj, wp ) - (nn_hls-1)
       
       ! north fold
@@ -360 +360 @@
                 rn_test_box(3) < gphit(ji,jj) .AND. gphit(ji,jj) < rn_test_box(4) ) THEN
                localberg%mass_scaling = rn_mass_scaling(iberg)
-               localpt%xi = REAL( mig(ji), wp )
-               localpt%yj = REAL( mjg(jj), wp )
+               localpt%xi = REAL( mig(ji) - (nn_hls-1), wp )
+               localpt%yj = REAL( mjg(jj) - (nn_hls-1), wp )
                CALL icb_utl_interp( localpt%xi, localpt%yj, plat=localpt%lat, plon=localpt%lon )   
                localpt%mass      = rn_initial_mass     (iberg)