Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rotation in set_coupler_type_data #813

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Fix rotation in set_coupler_type_data #813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced3a9f
Fix rotation in set_coupler_type_data
marshallward Jan 21, 2025
32922a4
Remove implicit copies in CT_extract_data rotation
marshallward Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions src/framework/MOM_coupler_types.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,27 +391,33 @@ subroutine extract_coupler_type_data(var_in, bc_index, array_out, scale_factor,
! Local variables
real, allocatable :: array_unrot(:,:) ! Array on the unrotated grid in arbitrary units [A]
integer :: q_turns ! The number of quarter turns through which array_out is to be rotated
integer :: index, is, ie, js, je, halo
integer :: index

index = ind_flux ; if (present(field_index)) index = field_index
q_turns = 0 ; if (present(turns)) q_turns = modulo(turns, 4)
halo = 0 ; if (present(halo_size)) halo = halo_size

! The case with non-trivial grid rotation is complicated by the fact that the data fields
! in the coupler_2d_bc_type are never rotated, so they need to be handled separately.
if (q_turns == 0) then
call CT_extract_data(var_in, bc_index, index, array_out, &
scale_factor=scale_factor, halo_size=halo_size, idim=idim, jdim=jdim)
scale_factor=scale_factor, halo_size=halo_size, idim=idim, jdim=jdim)
elseif (present(idim) .and. present(jdim)) then
! Work only on the computational domain plus symmetric halos.
is = idim(2)-halo ; ie = idim(3)+halo ; js = jdim(2)-halo ; je = jdim(3)+halo
call allocate_rotated_array(array_out(is:ie,js:je), [1,1], -q_turns, array_unrot)
call CT_extract_data(var_in, bc_index, index, array_unrot, scale_factor=scale_factor, halo_size=halo)
call rotate_array(array_unrot, q_turns, array_out(is:ie,js:je))
call allocate_rotated_array(array_out, [1,1], -q_turns, array_unrot)

if (modulo(q_turns, 2) /= 0) then
call CT_extract_data(var_in, bc_index, index, array_unrot, &
idim=jdim, jdim=idim, scale_factor=scale_factor, halo_size=halo_size)
else
call CT_extract_data(var_in, bc_index, index, array_unrot, &
idim=idim, jdim=jdim, scale_factor=scale_factor, halo_size=halo_size)
endif

call rotate_array(array_unrot, q_turns, array_out)
deallocate(array_unrot)
else
call allocate_rotated_array(array_out, [1,1], -q_turns, array_unrot)
call CT_extract_data(var_in, bc_index, index, array_unrot, scale_factor=scale_factor, halo_size=halo)
call CT_extract_data(var_in, bc_index, index, array_unrot, &
scale_factor=scale_factor, halo_size=halo_size)
call rotate_array(array_unrot, q_turns, array_out)
deallocate(array_unrot)
endif
Expand Down Expand Up @@ -453,27 +459,32 @@ subroutine set_coupler_type_data(array_in, bc_index, var, solubility, scale_fact
! as array_in [A]
integer :: subfield ! An integer indicating which field to set.
integer :: q_turns ! The number of quarter turns through which array_in is rotated
integer :: is, ie, js, je, halo

q_turns = 0 ; if (present(turns)) q_turns = modulo(turns, 4)

subfield = ind_csurf
if (present(solubility)) then ; if (solubility) subfield = ind_alpha ; endif
if (present(field_index)) subfield = field_index
halo = 0 ; if (present(halo_size)) halo = halo_size

! The case with non-trivial grid rotation is complicated by the fact that the data fields
! in the coupler_2d_bc_type are never rotated, so they need to be handled separately.
if (q_turns == 0) then
call CT_set_data(array_in, bc_index, subfield, var, &
scale_factor=scale_factor, halo_size=halo_size, idim=idim, jdim=jdim)
elseif (present(idim) .and. present(jdim)) then
! Work only on the computational domain plus symmetric halos.
is = idim(2)-halo ; ie = idim(3)+halo ; js = jdim(2)-halo ; je = jdim(3)+halo
call allocate_rotated_array(array_in(is:ie,js:je), [1,1], -q_turns, array_unrot)
call allocate_rotated_array(array_in, [1,1], -q_turns, array_unrot)
call rotate_array(array_in, -q_turns, array_unrot)
call CT_set_data(array_unrot, bc_index, subfield, var, &
scale_factor=scale_factor, halo_size=halo_size)

if (modulo(q_turns, 2) /= 0) then
call CT_set_data(array_unrot, bc_index, subfield, var, &
idim=jdim, jdim=idim, &
scale_factor=scale_factor, halo_size=halo_size)
else
call CT_set_data(array_unrot, bc_index, subfield, var, &
idim=idim, jdim=jdim, &
scale_factor=scale_factor, halo_size=halo_size)
endif

deallocate(array_unrot)
else
call allocate_rotated_array(array_in, [1,1], -q_turns, array_unrot)
Expand Down
Loading