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

Fixing Langmuir number and Stokes drift grid index issue. #3

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Fixing Langmuir number and Stokes drift grid index issue. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,14 @@ subroutine step_MOM(forces_in, fluxes_in, sfc_state, Time_start, time_int_in, CS
! Update wave information, which is presently kept static over each call to step_mom
call enable_averages(time_interval, Time_start + real_to_time(US%T_to_s*time_interval), CS%diag)
call find_ustar(forces, CS%tv, U_star, G, GV, US, halo=1)
call thickness_to_dz(h, CS%tv, dz, G, GV, US, halo_size=1)
call thickness_to_dz(h, CS%tv, dz, G, GV, US, halo_size=2)
call Update_Stokes_Drift(G, GV, US, Waves, dz, U_star, time_interval, do_dyn)
call disable_averaging(CS%diag)
endif
else ! not do_dyn.
if (CS%UseWaves) then ! Diagnostics are not enabled in this call.
call find_ustar(fluxes, CS%tv, U_star, G, GV, US, halo=1)
call thickness_to_dz(h, CS%tv, dz, G, GV, US, halo_size=1)
call thickness_to_dz(h, CS%tv, dz, G, GV, US, halo_size=2)
call Update_Stokes_Drift(G, GV, US, Waves, dz, U_star, time_interval, do_dyn)
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion src/user/MOM_wave_interface.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ subroutine MOM_wave_interface_init(time, G, GV, US, param_file, CS, diag)
allocate(CS%US0_x(G%isdB:G%iedB,G%jsd:G%jed), source=0.0)
allocate(CS%US0_y(G%isd:G%ied,G%jsdB:G%jedB), source=0.0)
! c. Langmuir number
allocate(CS%La_turb(G%isc:G%iec,G%jsc:G%jec), source=0.0)
allocate(CS%La_turb(G%isd:G%ied,G%jsd:G%jed), source=0.0)
! d. Viscosity for Stokes drift
if (CS%StokesMixing) then
allocate(CS%KvS(G%isd:G%Ied,G%jsd:G%jed,GV%ke), source=0.0)
Expand Down
Loading