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

Jump to bottom

Mask table fix #531

Closed
wants to merge 3 commits into from
Closed

Mask table fix #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4c95ec
Revert post_data fix to CFC concentration
marshallward Nov 15, 2023
b54a72e
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Dec 6, 2023
cbbb16c
Fix for an OBC issue with mask_tables
kshedstrom Dec 6, 2023
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
4 changes: 2 additions & 2 deletions src/core/MOM_open_boundary.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,7 @@ subroutine update_OBC_segment_data(G, GV, US, OBC, tv, h, Time)
segment%Htot(I,j) = segment%Htot(I,j) + segment%h(I,j,k)
segment%dZtot(I,j) = segment%dZtot(I,j) + dz(i+ishift,j,k)
enddo
segment%Cg(I,j) = sqrt(GV%g_prime(1) * segment%dZtot(I,j))
segment%Cg(I,j) = sqrt(GV%g_prime(1) * max(0.0, segment%dZtot(I,j)))
enddo
else! (segment%direction == OBC_DIRECTION_N .or. segment%direction == OBC_DIRECTION_S)
allocate(normal_trans_bt(segment%HI%isd:segment%HI%ied,segment%HI%JsdB:segment%HI%JedB), source=0.0)
Expand All @@ -3933,7 +3933,7 @@ subroutine update_OBC_segment_data(G, GV, US, OBC, tv, h, Time)
segment%Htot(i,J) = segment%Htot(i,J) + segment%h(i,J,k)
segment%dZtot(i,J) = segment%dZtot(i,J) + dz(i,j+jshift,k)
enddo
segment%Cg(i,J) = sqrt(GV%g_prime(1) * segment%dZtot(i,J))
segment%Cg(i,J) = sqrt(GV%g_prime(1) * max(0.0, segment%dZtot(i,J)))
enddo
endif

Expand Down
3 changes: 1 addition & 2 deletions src/tracer/MOM_CFC_cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,7 @@
! If needed, write out any desired diagnostics from tracer sources & sinks here.
do m=1,NTR
if (CS%CFC_data(m)%id_cmor > 0) &
call post_data(CS%CFC_data(m)%id_cmor, &
(GV%Rho0*US%R_to_kg_m3)*CS%CFC_data(m)%conc, CS%diag)
call post_data(CS%CFC_data(m)%id_cmor, CS%CFC_data(m)%conc, CS%diag)

Check warning on line 407 in src/tracer/MOM_CFC_cap.F90

View check run for this annotation

Codecov / codecov/patch

src/tracer/MOM_CFC_cap.F90#L407 

Added line #L407 was not covered by tests

if (CS%CFC_data(m)%id_sfc_flux > 0) &
call post_data(CS%CFC_data(m)%id_sfc_flux, CS%CFC_data(m)%sfc_flux, CS%diag)
Expand Down