Skip to content

Commit 12d7514

Browse files
brandon.reichladcroft
authored andcommitted
Updates for layout reproducing and restart reproducing with remap_aux_vars
- To reproduce across restart files requires an additional halo update on diffu and diffv in MOM_dynamics_split_RK2.F90 - To reproduce across layouts with vertex shear option requires a halo update on thickness before remapping the viscosities on the vertex points.
1 parent 24028c3 commit 12d7514

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/core/MOM.F90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,12 +1862,14 @@ subroutine ALE_regridding_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_
18621862
call remap_dyn_split_RK2_aux_vars(G, GV, CS%dyn_split_RK2_CSp, h_old_u, h_old_v, h_new_u, h_new_v, CS%ALE_CSp)
18631863
endif
18641864

1865-
if (associated(CS%OBC)) then
1865+
if (associated(CS%OBC) .or. associated(CS%visc%Kv_shear_Bu)) then
18661866
call pass_var(h, G%Domain, complete=.false.)
18671867
call pass_var(h_new, G%Domain, complete=.true.)
1868-
call remap_OBC_fields(G, GV, h, h_new, CS%OBC, PCM_cell=PCM_cell)
18691868
endif
18701869

1870+
if (associated(CS%OBC)) &
1871+
call remap_OBC_fields(G, GV, h, h_new, CS%OBC, PCM_cell=PCM_cell)
1872+
18711873
call remap_vertvisc_aux_vars(G, GV, CS%visc, h, h_new, CS%ALE_CSp, CS%OBC)
18721874
if (associated(CS%visc%Kv_shear)) &
18731875
call pass_var(CS%visc%Kv_shear, G%Domain, To_All+Omit_Corners, clock=id_clock_pass, halo=1)

src/core/MOM_dynamics_split_RK2.F90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,10 +1338,11 @@ subroutine remap_dyn_split_RK2_aux_vars(G, GV, CS, h_old_u, h_old_v, h_new_u, h_
13381338
call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%u_av, CS%v_av)
13391339
call pass_vector(CS%u_av, CS%v_av, G%Domain, complete=.false.)
13401340
call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%CAu_pred, CS%CAv_pred)
1341-
call pass_vector(CS%CAu_pred, CS%CAv_pred, G%Domain, complete=.true.)
1341+
call pass_vector(CS%CAu_pred, CS%CAv_pred, G%Domain, complete=.false.)
13421342
endif
13431343

13441344
call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%diffu, CS%diffv)
1345+
call pass_vector(CS%diffu, CS%diffv, G%Domain, complete=.true.)
13451346

13461347
end subroutine remap_dyn_split_RK2_aux_vars
13471348

0 commit comments

Comments
 (0)