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

Kh_max_x[xy], Ah_max_xy chksum and alloc fixes #1023

Merged
merged 4 commits into from
Nov 9, 2019
Merged

Kh_max_x[xy], Ah_max_xy chksum and alloc fixes #1023

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce4ed7d
Kh_max_x[xy], Ah_max_xy chksum and alloc fixes
marshallward Nov 1, 2019
76425c9
Merge branch 'dev/gfdl' into visc_max_chksums
marshallward Nov 8, 2019
58e84e8
Merge branch 'dev/gfdl' into visc_max_chksums
marshallward Nov 8, 2019
b541527
Merge branch 'dev/gfdl' into visc_max_chksums
adcroft Nov 8, 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
6 changes: 3 additions & 3 deletions src/parameterizations/lateral/MOM_hor_visc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ subroutine hor_visc_init(Time, G, US, param_file, diag, CS, MEKE)
ALLOC_(CS%Kh_bg_xx(isd:ied,jsd:jed)) ; CS%Kh_bg_xx(:,:) = 0.0
ALLOC_(CS%Kh_bg_xy(IsdB:IedB,JsdB:JedB)) ; CS%Kh_bg_xy(:,:) = 0.0
if (CS%bound_Kh .or. CS%better_bound_Kh) then
ALLOC_(CS%Kh_Max_xx(IsdB:IedB,JsdB:JedB)) ; CS%Kh_Max_xx(:,:) = 0.0
ALLOC_(CS%Kh_Max_xx(Isd:Ied,Jsd:Jed)) ; CS%Kh_Max_xx(:,:) = 0.0
ALLOC_(CS%Kh_Max_xy(IsdB:IedB,JsdB:JedB)) ; CS%Kh_Max_xy(:,:) = 0.0
endif
if (CS%Smagorinsky_Kh) then
Expand Down Expand Up @@ -2096,7 +2096,7 @@ subroutine hor_visc_init(Time, G, US, param_file, diag, CS, MEKE)
enddo ; enddo
if (CS%debug) then
call hchksum(CS%Kh_Max_xx, "Kh_Max_xx", G%HI, haloshift=0, scale=US%L_to_m**2*US%s_to_T)
call Bchksum(CS%Kh_Max_xx, "Kh_Max_xy", G%HI, haloshift=0, scale=US%L_to_m**2*US%s_to_T)
call Bchksum(CS%Kh_Max_xy, "Kh_Max_xy", G%HI, haloshift=0, scale=US%L_to_m**2*US%s_to_T)
endif
endif

Expand Down Expand Up @@ -2158,7 +2158,7 @@ subroutine hor_visc_init(Time, G, US, param_file, diag, CS, MEKE)
enddo ; enddo
if (CS%debug) then
call hchksum(CS%Ah_Max_xx, "Ah_Max_xx", G%HI, haloshift=0, scale=US%L_to_m**4*US%s_to_T)
call Bchksum(CS%Ah_Max_xx, "Ah_Max_xy", G%HI, haloshift=0, scale=US%L_to_m**4*US%s_to_T)
call Bchksum(CS%Ah_Max_xy, "Ah_Max_xy", G%HI, haloshift=0, scale=US%L_to_m**4*US%s_to_T)
endif
endif

Expand Down