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 two bugs in convert_temp_salt_for_TEOS10 #560

Merged
merged 2 commits into from
Feb 7, 2024
Merged

*Fix two bugs in convert_temp_salt_for_TEOS10 #560

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c011d3c
*Fix two bugs in convert_temp_salt_for_TEOS10
Hallberg-NOAA Jan 30, 2024
ea42f47
Merge branch 'dev/gfdl' into convert_temp_salt_for_TEOS10_bugfix
marshallward Feb 7, 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
2 changes: 1 addition & 1 deletion src/equation_of_state/MOM_EOS.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,7 @@
do k=1,kd ; do j=HI%jsc,HI%jec ; do i=HI%isc,HI%iec
if (mask_z(i,j,k) >= 1.0) then
S(i,j,k) = Sref_Sprac * S(i,j,k)
T(i,j,k) = EOS%degC_to_C*poTemp_to_consTemp(EOS%S_to_ppt*S(i,j,k), EOS%S_to_ppt*T(i,j,k))
T(i,j,k) = EOS%degC_to_C*poTemp_to_consTemp(EOS%C_to_degC*T(i,j,k), EOS%S_to_ppt*S(i,j,k))

Check warning on line 1706 in src/equation_of_state/MOM_EOS.F90

View check run for this annotation

Codecov / codecov/patch

src/equation_of_state/MOM_EOS.F90#L1706 

Added line #L1706 was not covered by tests
endif
enddo ; enddo ; enddo
end subroutine convert_temp_salt_for_TEOS10
Expand Down
Loading