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

+(*)Pseudo_salt_tracer and forcing%netSalt #16

Merged
merged 4 commits into from
Dec 4, 2021
Merged

+(*)Pseudo_salt_tracer and forcing%netSalt #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c01c8d
(*)Refactored and fixed pseudo_salt_tracer code
Hallberg-NOAA Nov 28, 2021
111b3e7
+Eliminate forcing%netSalt
Hallberg-NOAA Nov 28, 2021
7d39f26
Merge branch 'dev/gfdl' into refactor_pseudo_salt_tracer
Hallberg-NOAA Nov 30, 2021
5361174
Merge branch 'dev/gfdl' into refactor_pseudo_salt_tracer
marshallward Dec 2, 2021
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
23 changes: 9 additions & 14 deletions src/core/MOM_forcing_type.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,14 @@ module MOM_forcing_type
vprec => NULL(), & !< virtual liquid precip associated w/ SSS restoring [R Z T-1 ~> kg m-2 s-1]
lrunoff => NULL(), & !< liquid river runoff entering ocean [R Z T-1 ~> kg m-2 s-1]
frunoff => NULL(), & !< frozen river runoff (calving) entering ocean [R Z T-1 ~> kg m-2 s-1]
seaice_melt => NULL(), & !< snow/seaice melt (positive) or formation (negative) [R Z T-1 ~> kg m-2 s-1]
netMassIn => NULL(), & !< Sum of water mass flux out of the ocean integrated over a
!! forcing timestep [H ~> m or kg m-2]
netMassOut => NULL(), & !< Net water mass flux into of the ocean integrated over a
seaice_melt => NULL() !< snow/seaice melt (positive) or formation (negative) [R Z T-1 ~> kg m-2 s-1]

! Integrated water mass fluxes into the ocean, used for passive tracer sources [H ~> m or kg m-2]
real, pointer, dimension(:,:) :: &
netMassIn => NULL(), & !< Sum of water mass fluxes into the ocean integrated over a
!! forcing timestep [H ~> m or kg m-2]
!### Net salt is used with inconsistent units and only in one place and should be eliminated as unneeded.
netSalt => NULL() !< Net salt entering the ocean [kgSalt m-2 s-1]
netMassOut => NULL() !< Net water mass flux out of the ocean integrated over a forcing timestep,
!! with negative values for water leaving the ocean [H ~> m or kg m-2]

! heat associated with water crossing ocean surface
real, pointer, dimension(:,:) :: &
Expand Down Expand Up @@ -733,12 +734,6 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
! Diagnostics follow...
if (calculate_diags) then

! Store Net_salt for unknown reason?
if (associated(fluxes%salt_flux)) then
! This seems like a bad idea to me. -RWH
if (calculate_diags) fluxes%netSalt(i,j) = US%kg_m2s_to_RZ_T*Net_salt(i)
endif

! Initialize heat_content_massin that is diagnosed in mixedlayer_convection or
! applyBoundaryFluxes such that the meaning is as the sum of all incoming components.
if (associated(fluxes%heat_content_massin)) then
Expand Down Expand Up @@ -2977,7 +2972,6 @@ subroutine allocate_forcing_by_group(G, fluxes, water, heat, ustar, press, &
call myAlloc(fluxes%seaice_melt,isd,ied,jsd,jed, water)
call myAlloc(fluxes%netMassOut,isd,ied,jsd,jed, water)
call myAlloc(fluxes%netMassIn,isd,ied,jsd,jed, water)
call myAlloc(fluxes%netSalt,isd,ied,jsd,jed, water)
call myAlloc(fluxes%seaice_melt_heat,isd,ied,jsd,jed, heat)
call myAlloc(fluxes%sw,isd,ied,jsd,jed, heat)
call myAlloc(fluxes%lw,isd,ied,jsd,jed, heat)
Expand Down Expand Up @@ -3264,6 +3258,8 @@ subroutine deallocate_forcing_type(fluxes)
if (associated(fluxes%lrunoff)) deallocate(fluxes%lrunoff)
if (associated(fluxes%frunoff)) deallocate(fluxes%frunoff)
if (associated(fluxes%seaice_melt)) deallocate(fluxes%seaice_melt)
if (associated(fluxes%netMassOut)) deallocate(fluxes%netMassOut)
if (associated(fluxes%netMassIn)) deallocate(fluxes%netMassIn)
if (associated(fluxes%salt_flux)) deallocate(fluxes%salt_flux)
if (associated(fluxes%p_surf_full)) deallocate(fluxes%p_surf_full)
if (associated(fluxes%p_surf)) deallocate(fluxes%p_surf)
Expand Down Expand Up @@ -3332,7 +3328,6 @@ subroutine rotate_forcing(fluxes_in, fluxes, turns)
call rotate_array(fluxes_in%seaice_melt, turns, fluxes%seaice_melt)
call rotate_array(fluxes_in%netMassOut, turns, fluxes%netMassOut)
call rotate_array(fluxes_in%netMassIn, turns, fluxes%netMassIn)
call rotate_array(fluxes_in%netSalt, turns, fluxes%netSalt)
endif

if (do_heat) then
Expand Down
Loading