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

Fixes coding issues with GME #120

Merged
merged 11 commits into from
Aug 29, 2019
Merged

Fixes coding issues with GME #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93727f8
Fix first four loop indices suggested by Bob
gustavo-marques Aug 22, 2019
e778191
Deletes max_diss_rate_bt since it is never used
gustavo-marques Aug 23, 2019
3b7cb69
Fixes the remaining loop indices related to GME
gustavo-marques Aug 23, 2019
3257801
Removes unneeded calls to pass_var and add calls to pass_vector
gustavo-marques Aug 23, 2019
b339108
Groups terms for rotational invariance and deletes beta_h and beta_q …
gustavo-marques Aug 23, 2019
0aeec9d
Adds correct calculation of GME at q points
gustavo-marques Aug 26, 2019
fa773cd
Created new variables dvdx3/dudy3 for shearing strain on the Laplacian
gustavo-marques Aug 26, 2019
2ac12ce
Deleting comments
gustavo-marques Aug 26, 2019
cc9e33d
Adds new parameter, MEKE_EQUILIBRIUM_ALT
gustavo-marques Aug 28, 2019
d05235f
Final GME code fix
gustavo-marques Aug 28, 2019
b810e26
Fixes line length exceeded
gustavo-marques Aug 29, 2019
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
12 changes: 10 additions & 2 deletions src/parameterizations/lateral/MOM_MEKE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ module MOM_MEKE
logical :: visc_drag !< If true use the vertvisc_type to calculate bottom drag.
logical :: MEKE_GEOMETRIC !< If true, uses the GM coefficient formulation from the GEOMETRIC
!! framework (Marshall et al., 2012)
logical :: MEKE_equilibrium_alt !< If true, use an alternative calculation for the
!! equilibrium value of MEKE.
logical :: GM_src_alt !< If true, use the GM energy conversion form S^2*N^2*kappa rather
!! than the streamfunction for the MEKE GM source term.
logical :: Rd_as_max_scale !< If true the length scale can not exceed the
Expand Down Expand Up @@ -744,8 +746,11 @@ subroutine MEKE_equilibrium(CS, MEKE, G, GV, US, SN_u, SN_v, drag_rate_visc, I_m
else
EKE = 0.
endif
MEKE%MEKE(i,j) = EKE
! MEKE%MEKE(i,j) = (US%Z_to_m*G%bathyT(i,j)*SN / (8*CS%cdrag))**2
if (CS%MEKE_equilibrium_alt) then
MEKE%MEKE(i,j) = (US%Z_to_m*G%bathyT(i,j)*SN / (8*CS%cdrag))**2
else
MEKE%MEKE(i,j) = EKE
endif
enddo ; enddo

end subroutine MEKE_equilibrium
Expand Down Expand Up @@ -973,6 +978,9 @@ logical function MEKE_init(Time, G, param_file, diag, CS, MEKE, restart_CS)
call get_param(param_file, mdl, "MEKE_GEOMETRIC", CS%MEKE_GEOMETRIC, &
"If MEKE_GEOMETRIC is true, uses the GM coefficient formulation "//&
"from the GEOMETRIC framework (Marshall et al., 2012).", default=.false.)
call get_param(param_file, mdl, "MEKE_EQUILIBRIUM_ALT", CS%MEKE_equilibrium_alt, &
"If true, use an alternative formula for computing the (equilibrium)"//&
"initial value of MEKE.", default=.false.)
call get_param(param_file, mdl, "MEKE_FRCOEFF", CS%MEKE_FrCoeff, &
"The efficiency of the conversion of mean energy into "//&
"MEKE. If MEKE_FRCOEFF is negative, this conversion "//&
Expand Down
Loading