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

Jump to bottom

Adding the gradient model into MOM6 #755

Open
wants to merge 22 commits into
base: dev/gfdl
Choose a base branch
from
+251 −120
Open

Adding the gradient model into MOM6 #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
17e3383
Gradient model is added to MOM6
Jul 22, 2024
c25d650
MOM6 is updated with adding the Gradient model
Jul 22, 2024
7e7cbe2
Merge branch 'mom-ocean:main' into dev/master
sinakhani Oct 16, 2024
077c135
Gradient model is updated
Oct 16, 2024
b7cad7e
Gradient model is updated
Oct 16, 2024
e54a96b
Gradient model is updated
Oct 16, 2024
554d15b
MOM.F90 is updated to accommodate the Gradient model
Oct 16, 2024
d8e2f3c
Gradient model is updated
Oct 18, 2024
b90c189
Gradient model is updated
Oct 18, 2024
70bd8a7
Merge branch 'dev/gfdl' into sina
marshallward Oct 23, 2024
5de396e
Remove duplicate source
marshallward Oct 23, 2024
4342131
Typo fix in lateral mixing coeffs
Oct 23, 2024
d6d73b2
doxygen error fixed
Oct 23, 2024
267ad92
L_grid definition cleared
Oct 23, 2024
ed6423f
Logical variable for use_gradient_model is updated
Oct 24, 2024
8fa7365
Logical variable for use_gradient_model is updated
Oct 24, 2024
0fb1baa
Updates on lateral mixing coeff for Lgrid
Nov 4, 2024
dbcc38d
space detected
Nov 4, 2024
5d6928d
space detected
Nov 4, 2024
cefd472
space detected
Nov 5, 2024
0e5e7de
Updates on the gradient (Khani) model
Nov 6, 2024
2c52e8b
Updates on description
Nov 6, 2024
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
14 changes: 8 additions & 6 deletions src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,9 @@ subroutine step_MOM_dynamics(forces, p_surf_begin, p_surf_end, dt, dt_thermo, &
real, dimension(:,:,:), pointer :: &
u => NULL(), & ! u : zonal velocity component [L T-1 ~> m s-1]
v => NULL(), & ! v : meridional velocity component [L T-1 ~> m s-1]
h => NULL() ! h : layer thickness [H ~> m or kg m-2]
h => NULL(), & ! h : layer thickness [H ~> m or kg m-2]
uh => NULL(), & ! uh : layer thickness times u [UH ~> m2 s-1 or kg m-1 s-1]
vh => NULL() ! vh : layer thickness times v [VH ~> m2 s-1 or kg m-1 s-1]

logical :: calc_dtbt ! Indicates whether the dynamically adjusted
! barotropic time step needs to be updated.
Expand All @@ -1152,7 +1154,7 @@ subroutine step_MOM_dynamics(forces, p_surf_begin, p_surf_end, dt, dt_thermo, &
Isq = G%IscB ; Ieq = G%IecB ; Jsq = G%JscB ; Jeq = G%JecB
isd = G%isd ; ied = G%ied ; jsd = G%jsd ; jed = G%jed
IsdB = G%IsdB ; IedB = G%IedB ; JsdB = G%JsdB ; JedB = G%JedB
u => CS%u ; v => CS%v ; h => CS%h
u => CS%u ; v => CS%v ; h => CS%h ; uh => CS%uh ; vh => CS%vh
showCallTree = callTree_showQuery()

call cpu_clock_begin(id_clock_dynamics)
Expand All @@ -1173,7 +1175,7 @@ subroutine step_MOM_dynamics(forces, p_surf_begin, p_surf_end, dt, dt_thermo, &
if (CS%thickness_diffuse) then
call cpu_clock_begin(id_clock_thick_diff)
if (CS%VarMix%use_variable_mixing) &
call calc_slope_functions(h, CS%tv, dt, G, GV, US, CS%VarMix, OBC=CS%OBC)
call calc_slope_functions(h, uh, vh, CS%tv, dt, G, GV, US, CS%VarMix, OBC=CS%OBC)
call thickness_diffuse(h, CS%uhtr, CS%vhtr, CS%tv, dt_thermo, G, GV, US, &
CS%MEKE, CS%VarMix, CS%CDp, CS%thickness_diffuse_CSp)
call cpu_clock_end(id_clock_thick_diff)
Expand Down Expand Up @@ -1311,7 +1313,7 @@ subroutine step_MOM_dynamics(forces, p_surf_begin, p_surf_end, dt, dt_thermo, &
if (CS%thickness_diffuse) then
call cpu_clock_begin(id_clock_thick_diff)
if (CS%VarMix%use_variable_mixing) &
call calc_slope_functions(h, CS%tv, dt, G, GV, US, CS%VarMix, OBC=CS%OBC)
call calc_slope_functions(h, uh, vh, CS%tv, dt, G, GV, US, CS%VarMix, OBC=CS%OBC)
call thickness_diffuse(h, CS%uhtr, CS%vhtr, CS%tv, dt, G, GV, US, &
CS%MEKE, CS%VarMix, CS%CDp, CS%thickness_diffuse_CSp)

Expand Down Expand Up @@ -1900,7 +1902,7 @@ subroutine step_offline(forces, fluxes, sfc_state, Time_start, time_interval, CS
call pass_var(CS%h, G%Domain)
call calc_resoln_function(CS%h, CS%tv, G, GV, US, CS%VarMix)
call calc_depth_function(G, CS%VarMix)
call calc_slope_functions(CS%h, CS%tv, dt_offline, G, GV, US, CS%VarMix, OBC=CS%OBC)
call calc_slope_functions(CS%h, CS%uh, CS%vh, CS%tv, dt_offline, G, GV, US, CS%VarMix, OBC=CS%OBC)
endif
call tracer_hordiff(CS%h, dt_offline, CS%MEKE, CS%VarMix, CS%visc, G, GV, US, &
CS%tracer_diff_CSp, CS%tracer_Reg, CS%tv)
Expand All @@ -1927,7 +1929,7 @@ subroutine step_offline(forces, fluxes, sfc_state, Time_start, time_interval, CS
call pass_var(CS%h, G%Domain)
call calc_resoln_function(CS%h, CS%tv, G, GV, US, CS%VarMix)
call calc_depth_function(G, CS%VarMix)
call calc_slope_functions(CS%h, CS%tv, dt_offline, G, GV, US, CS%VarMix, OBC=CS%OBC)
call calc_slope_functions(CS%h, CS%uh, CS%vh, CS%tv, dt_offline, G, GV, US, CS%VarMix, OBC=CS%OBC)
endif
call tracer_hordiff(CS%h, dt_offline, CS%MEKE, CS%VarMix, CS%visc, G, GV, US, &
CS%tracer_diff_CSp, CS%tracer_Reg, CS%tv)
Expand Down
Loading
Loading