Skip to content

Commit

Permalink
Merge branch 'nicjhan-516-transform-fail-uhtot-uses-tauy' into dev/gfdl
Browse files Browse the repository at this point in the history
  • Loading branch information
Hallberg-NOAA committed Jun 13, 2017
2 parents ebeb5fa + 13e43be commit 269f630
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/parameterizations/vertical/MOM_set_viscosity.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1470,8 +1470,8 @@ subroutine set_viscous_ML(u, v, h, tv, fluxes, visc, dt, G, GV, CS)
k_massive(i) = nkml
Thtot(i) = 0.0 ; Shtot(i) = 0.0 ; Rhtot(i) = 0.0
vhtot(i) = dt_Rho0 * fluxes%tauy(i,J)
uhtot(i) = 0.25 * dt_Rho0 * ((fluxes%taux(I,j) + fluxes%tauy(I-1,j+1)) + &
(fluxes%taux(I-1,j) + fluxes%tauy(I,j+1)))
uhtot(i) = 0.25 * dt_Rho0 * ((fluxes%taux(I,j) + fluxes%taux(I-1,j+1)) + &
(fluxes%taux(I-1,j) + fluxes%taux(I,j+1)))

if (CS%omega_frac >= 1.0) then ; absf = 2.0*CS%omega ; else
absf = 0.5*(abs(G%CoriolisBu(I-1,J)) + abs(G%CoriolisBu(I,J)))
Expand Down

0 comments on commit 269f630

Please sign in to comment.