Skip to content

*Corrected two bugs impacting .testing test cases #1129

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

Merged
marshallward merged 3 commits into from
Jun 9, 2020
Merged

*Corrected two bugs impacting .testing test cases #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3d84c0
*Corrected two bugs impacting .testing test cases
Hallberg-NOAA Jun 8, 2020
612a03b
Merge branch 'dev/gfdl' into dev/gfdl
adcroft Jun 9, 2020
60b3e12
Merge branch 'dev/gfdl' into dev/gfdl
marshallward Jun 9, 2020
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
3 changes: 0 additions & 3 deletions .testing/tc4/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ DTBT = 10.0 ! [s or nondim] default = -0.98
! Parameterization of enhanced mixing due to convection via CVMix

! === module MOM_entrain_diffusive ===
CORRECT_DENSITY = False ! [Boolean] default = True
! If true, and USE_EOS is true, the layer densities are restored toward their
! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).

! === module MOM_set_diffusivity ===
BBL_EFFIC = 0.0 ! [nondim] default = 0.2
Expand Down
2 changes: 1 addition & 1 deletion src/core/MOM_dynamics_unsplit_RK2.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ subroutine step_MOM_dyn_unsplit_RK2(u_in, v_in, h_in, tv, visc, Time_local, dt,
call cpu_clock_begin(id_clock_vertvisc)
call enable_averages(dt, Time_local, CS%diag)
dt_visc = dt_pred ; if (CS%use_correct_dt_visc) dt_visc = dt
call set_viscous_ML(up, vp, h_av, tv, forces, visc, dt_visc, G, GV, US, CS%set_visc_CSp)
call set_viscous_ML(u_in, v_in, h_av, tv, forces, visc, dt_visc, G, GV, US, CS%set_visc_CSp)
call disable_averaging(CS%diag)

call vertvisc_coef(up, vp, h_av, forces, visc, dt_pred, G, GV, US, CS%vertvisc_CSp, CS%OBC)
Expand Down