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

194 fp es #195

Merged
merged 2 commits into from
Jul 18, 2015
Merged

194 fp es #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91009a8
Do full denominator check to avoid possible divide-by-zero. #194
nichannah Jul 9, 2015
32ad85f
Specify range over which array calculations are done.
nichannah Jul 9, 2015
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
13 changes: 7 additions & 6 deletions src/core/MOM_forcing_type.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,18 +715,19 @@ subroutine calculateBuoyancyFlux1d(G, fluxes, optics, h, Temp, Salt, tv, j, &
dRhodT, dRhodS, start, npts, tv%eqn_of_state)

! Adjust netSalt to reflect dilution effect of FW flux
netSalt(:) = netSalt(:) - Salt(:,j,1) * netH * G%H_to_m
netSalt(G%isc:G%iec) = netSalt(G%isc:G%iec) - Salt(G%isc:G%iec,j,1) * netH(G%isc:G%iec) * G%H_to_m

! Add in the SW heating for purposes of calculating the net
! surface buoyancy flux affecting the top layer.
! Add in the SW heating for purposes of calculating the net
! surface buoyancy flux affecting the top layer.
!netHeat(:) = netHeatMinusSW(:) + sum( penSWbnd(:,:), dim=1 )
netHeat(:) = netHeatMinusSW(:) + netPen(:,1)
netHeat(G%isc:G%iec) = netHeatMinusSW(G%isc:G%iec) + netPen(G%isc:G%iec,1)

! Convert to a buoyancy flux, excluding penetrating SW heating
buoyancyFlux(:,1) = - GoRho * ( dRhodS(:) * netSalt(:) + dRhodT(:) * netHeat(:) ) ! m^2/s^3
buoyancyFlux(G%isc:G%iec,1) = - GoRho * ( dRhodS(G%isc:G%iec) * netSalt(G%isc:G%iec) + &
dRhodT(G%isc:G%iec) * netHeat(G%isc:G%iec) ) ! m^2/s^3
! We also have a penetrative buoyancy flux associated with penetrative SW
do k=2, G%ke+1
buoyancyFlux(:,k) = - GoRho * ( dRhodT(:) * netPen(:,k) ) ! m^2/s^3
buoyancyFlux(G%isc:G%iec,k) = - GoRho * ( dRhodT(G%isc:G%iec) * netPen(G%isc:G%iec,k) ) ! m^2/s^3
enddo

end subroutine calculateBuoyancyFlux1d
Expand Down
6 changes: 5 additions & 1 deletion src/parameterizations/vertical/MOM_set_diffusivity.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,11 @@ subroutine add_LOTW_BBL_diffusivity(h, u, v, tv, fluxes, visc, j, N2_int, G, CS,

! Diffusivity using law of the wall, limited by rotation, at height z, in m2/s.
! This calculation is at the upper interface of the layer
Kd_wall = ( ( von_karm * ustar2 ) * ( z * D_minus_z ) )/( ustar_D + absf * ( z * D_minus_z ) )
if ( ustar_D + absf * ( z * D_minus_z ) == 0.) then
Kd_wall = 0.
else
Kd_wall = ( ( von_karm * ustar2 ) * ( z * D_minus_z ) )/( ustar_D + absf * ( z * D_minus_z ) )
endif

! TKE associated with Kd_wall, in m3 s-2.
! This calculation if for the volume spanning the interface.
Expand Down