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

Better variables for updated masks in fill_miss_2d #602

Merged
merged 2 commits into from
May 22, 2024
Merged

Better variables for updated masks in fill_miss_2d #602

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c161ec
Better variables for updated masks in fill_miss_2d
Hallberg-NOAA Mar 5, 2024
d7067d7
Merge branch 'dev/gfdl' into hor_regrid_fill_goodval
marshallward May 22, 2024
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
35 changes: 21 additions & 14 deletions src/framework/MOM_horizontal_regridding.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ subroutine fill_miss_2d(aout, good, fill, prev, G, acrit, num_pass, relc, debug,
real, dimension(SZI_(G),SZJ_(G)) :: good_new ! The values of good_ to use for the next iteration [nondim]

real :: east, west, north, south ! Valid neighboring values or 0 for invalid values [arbitrary]
real :: ge, gw, gn, gs ! Flags indicating which neighbors have valid values [nondim]
real :: ge, gw, gn, gs ! Flags set to 0 or 1 indicating which neighbors have valid values [nondim]
real :: ngood ! The number of valid values in neighboring points [nondim]
real :: nfill ! The remaining number of points to fill [nondim]
real :: nfill_prev ! The previous value of nfill [nondim]
Expand Down Expand Up @@ -227,23 +227,30 @@ subroutine fill_miss_2d(aout, good, fill, prev, G, acrit, num_pass, relc, debug,
! Do Laplacian smoothing for the points that have been filled in.
do k=1,npass
call pass_var(aout,G%Domain)
do j=js,je ; do i=is,ie
if (fill(i,j) == 1) then
east = max(good(i+1,j),fill(i+1,j)) ; west = max(good(i-1,j),fill(i-1,j))
north = max(good(i,j+1),fill(i,j+1)) ; south = max(good(i,j-1),fill(i,j-1))
if (ans_2018) then

a_chg(:,:) = 0.0
if (ans_2018) then
do j=js,je ; do i=is,ie
if (fill(i,j) == 1) then
east = max(good(i+1,j),fill(i+1,j)) ; west = max(good(i-1,j),fill(i-1,j))
north = max(good(i,j+1),fill(i,j+1)) ; south = max(good(i,j-1),fill(i,j-1))
a_chg(i,j) = relax_coeff*(south*aout(i,j-1)+north*aout(i,j+1) + &
west*aout(i-1,j)+east*aout(i+1,j) - &
(south+north+west+east)*aout(i,j))
else
a_chg(i,j) = relax_coeff*( ((south*aout(i,j-1) + north*aout(i,j+1)) + &
(west*aout(i-1,j)+east*aout(i+1,j))) - &
((south+north)+(west+east))*aout(i,j) )
endif
else
a_chg(i,j) = 0.
endif
enddo ; enddo
enddo ; enddo
else
do j=js,je ; do i=is,ie
if (fill(i,j) == 1) then
ge = max(good(i+1,j),fill(i+1,j)) ; gw = max(good(i-1,j),fill(i-1,j))
gn = max(good(i,j+1),fill(i,j+1)) ; gs = max(good(i,j-1),fill(i,j-1))
a_chg(i,j) = relax_coeff*( ((gs*aout(i,j-1) + gn*aout(i,j+1)) + &
(gw*aout(i-1,j) + ge*aout(i+1,j))) - &
((gs + gn) + (gw + ge))*aout(i,j) )
endif
enddo ; enddo
endif

ares = 0.0
do j=js,je ; do i=is,ie
aout(i,j) = a_chg(i,j) + aout(i,j)
Expand Down
Loading