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

*Corrected CFC diagnostics and non-Bous CFC fluxes #554

Merged
merged 2 commits into from
Feb 29, 2024
Merged

*Corrected CFC diagnostics and non-Bous CFC fluxes #554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1f8aa6
*Corrected CFC diagnostics and non-Bous CFC fluxes
Hallberg-NOAA Jan 24, 2024
cb92ca6
Merge branch 'dev/gfdl' into CFC_cap_conversion_factors
marshallward Feb 29, 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
5 changes: 1 addition & 4 deletions src/tracer/MOM_CFC_cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@

! Local variables
real, dimension(SZI_(G),SZJ_(G),SZK_(GV)) :: h_work ! Used so that h can be modified [H ~> m or kg m-2]
real :: flux_scale ! A dimensional rescaling factor for fluxes [H R-1 Z-1 ~> m3 kg-1 or nondim]
integer :: i, j, k, is, ie, js, je, nz, m

is = G%isc ; ie = G%iec ; js = G%jsc ; je = G%jec ; nz = GV%ke
Expand All @@ -371,13 +370,11 @@
! Compute KPP nonlocal term if necessary
if (present(KPP_CSp)) then
if (associated(KPP_CSp) .and. present(nonLocalTrans)) then
flux_scale = GV%Z_to_H / GV%rho0

do m=1,NTR
call KPP_NonLocalTransport(KPP_CSp, G, GV, h_old, nonLocalTrans, &
CS%CFC_data(m)%sfc_flux(:,:), dt, CS%diag, &
CS%CFC_data(m)%tr_ptr, CS%CFC_data(m)%conc(:,:,:), &
flux_scale=flux_scale)
flux_scale=GV%RZ_to_H)

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

View check run for this annotation

Codecov / codecov/patch

src/tracer/MOM_CFC_cap.F90#L377 

Added line #L377 was not covered by tests
enddo
endif
endif
Expand Down
Loading