Skip to content

Commit

Permalink
Merge pull request mom-ocean#5 from wfcooke/user/wfc_mjh/salt_flux_ad…
Browse files Browse the repository at this point in the history
…d_fix

add MJHarrison-GFDL salt_flux_add_fix to SPEAR codeset
  • Loading branch information
wfcooke authored Nov 6, 2019
2 parents dac0c6c + 68eb365 commit eb88576
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/core/MOM_forcing_type.F90
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,12 @@ subroutine extractFluxes1d(G, GV, fluxes, optics, nsw, j, dt,
if (do_NSR) Net_salt_rate(i) = (scale * 1. * (1000.0 * fluxes%salt_flux(i,j))) * GV%kg_m2_to_H
endif

if (associated(fluxes%salt_flux_added)) then
Net_salt(i) = Net_salt(i) + (scale * dt * (1000.0 * fluxes%salt_flux_added(i,j))) * GV%kg_m2_to_H
!Repeat above code for 'rate' term
if (do_NSR) Net_salt_rate(i) = Net_salt_rate(i) + (scale * 1. * (1000.0 * fluxes%salt_flux_added(i,j))) * GV%kg_m2_to_H
endif

! Diagnostics follow...
if (calculate_diags) then

Expand Down

0 comments on commit eb88576

Please sign in to comment.