Skip to content

Fix the downsampled diagnostics that have to be summed but are averaged instead #1022

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

Merged
adcroft merged 2 commits into from
Nov 8, 2019
Merged

Fix the downsampled diagnostics that have to be summed but are averaged instead #1022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f81b73
Fix the downsampled "summed" diagnostics
nikizadehgfdl Oct 18, 2019
cafd3e8
Merge branch 'dev/gfdl' into fix_downsampled_transport_diags
adcroft Nov 8, 2019
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
27 changes: 3 additions & 24 deletions src/framework/MOM_diag_mediator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3880,14 +3880,11 @@ subroutine downsample_field_3d(field_in, field_out, dl, method, mask, diag_cs, d
i0 = isv_o+dl*(i-isv_d)
j0 = jsv_o+dl*(j-jsv_d)
ave = 0.0
total_weight = 0.0
do jj=j0,j0+dl-1 ; do ii=i0,i0+dl-1
! do ii=i0,i0+dl-1 ; do jj=j0,j0+dl-1
weight = mask(ii,jj,k)
total_weight = total_weight + weight
ave=ave+field_in(ii,jj,k)*weight
enddo; enddo
field_out(i,j,k) = ave/(total_weight+epsilon) !Avoid zero mask at all aggregating cells where ave=0.0
field_out(i,j,k) = ave !Masked Sum (total_weight=1)
enddo; enddo; enddo
elseif(method .eq. MMP .or. method .eq. MMS) then !e.g., T_advection_xy
do k= ks,ke ; do j=jsv_d,jev_d ; do i=isv_d,iev_d
Expand Down Expand Up @@ -3917,47 +3914,29 @@ subroutine downsample_field_3d(field_in, field_out, dl, method, mask, diag_cs, d
enddo
field_out(i,j,k) = ave/(total_weight+epsilon) !Avoid zero mask at all aggregating cells where ave=0.0
enddo; enddo; enddo
elseif(method .eq. PSM) then
do k= ks,ke ; do j=jsv_d,jev_d ; do i=isv_d,iev_d
i0 = isv_o+dl*(i-isv_d)
j0 = jsv_o+dl*(j-jsv_d)
ave = 0.0
total_weight = 0.0
ii=i0
do jj=j0,j0+dl-1
weight =mask(ii,jj,k)*diag_cs%h(ii,jj,k)
total_weight = total_weight +weight
ave=ave+field_in(ii,jj,k)*weight
enddo
field_out(i,j,k) = ave/(total_weight+epsilon) !Avoid zero mask at all aggregating cells where ave=0.0
enddo; enddo; enddo
elseif(method .eq. PSS) then !e.g. umo
do k= ks,ke ; do j=jsv_d,jev_d ; do i=isv_d,iev_d
i0 = isv_o+dl*(i-isv_d)
j0 = jsv_o+dl*(j-jsv_d)
ave = 0.0
total_weight = 0.0
ii=i0
do jj=j0,j0+dl-1
weight =mask(ii,jj,k)
total_weight = total_weight +weight
ave=ave+field_in(ii,jj,k)*weight
enddo
field_out(i,j,k) = ave/(total_weight+epsilon) !Avoid zero mask at all aggregating cells where ave=0.0
field_out(i,j,k) = ave !Masked Sum (total_weight=1)
enddo; enddo; enddo
elseif(method .eq. SPS) then !e.g. vmo
do k= ks,ke ; do j=jsv_d,jev_d ; do i=isv_d,iev_d
i0 = isv_o+dl*(i-isv_d)
j0 = jsv_o+dl*(j-jsv_d)
ave = 0.0
total_weight = 0.0
jj=j0
do ii=i0,i0+dl-1
weight =mask(ii,jj,k)
total_weight = total_weight +weight
ave=ave+field_in(ii,jj,k)*weight
enddo
field_out(i,j,k) = ave/(total_weight+epsilon) !Avoid zero mask at all aggregating cells where ave=0.0
field_out(i,j,k) = ave !Masked Sum (total_weight=1)
enddo; enddo; enddo
elseif(method .eq. MPM) then
do k= ks,ke ; do j=jsv_d,jev_d ; do i=isv_d,iev_d
Expand Down