Skip to content

Fixes bugs in new orographic wave drag scheme #7299

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
merged 6 commits into from
Jul 17, 2025
Merged

Fixes bugs in new orographic wave drag scheme #7299

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a85155d
Addresses oro drag bugs
vanroekel Apr 28, 2025
03d10e6
Fixes from PR review
vanroekel Apr 30, 2025
80a01fb
Changes dxmeter,dymeter declaration
vanroekel Apr 30, 2025
37a516a
updates to loop bound on z_bot in od_common
vanroekel May 16, 2025
6888772
updates check on pbl index not found
vanroekel May 29, 2025
384a7ce
fixes indexing error in pbl height finder
vanroekel Jul 14, 2025
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 components/eam/src/physics/cam/od_common.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ subroutine oro_drag_interface(state, cam_in, sgh, pbuf, dtime, nm,
!get the layer index of pblh in layer for input in drag scheme
pblh_idx = pbuf_get_index('pblh')
call pbuf_get_field(pbuf, pblh_idx, pblh)
do i=1,pcols
do i=1,ncol
kpbl2d_in(i)=pblh_get_level_idx(zbot(i,:)-(state%phis(i)/gravit),pblh(i))
kpbl2d_reverse_in(i)=pverp-kpbl2d_in(i)!pverp-k
end do
Expand Down Expand Up @@ -392,14 +392,16 @@ function pblh_get_level_idx(height_array,pblheight)
pblh_get_level_idx = -1
found=.false.
!get the pblh level index and return
do k = 1, pver
if((pblheight >= height_array(k+1).and.pblheight <height_array(k)))then
pblh_get_level_idx = k+1
do k = 2, pver
if((pblheight >= height_array(k).and.pblheight <height_array(k-1)))then
pblh_get_level_idx = k
found=.true.
return
endif
enddo

if (.not.found) call endrun('ERROR - pblh_get_level_idx: pbl top index not found')

end function

!==========================================================================
Expand Down Expand Up @@ -967,8 +969,8 @@ subroutine od2d(dudt,dvdt,dthdt,ncleff,ncd,sncleff, &
!
!--- calculate length of grid for flow-blocking drag
!
delx=dxmeter
dely=dymeter
delx(its:ite)=dxmeter(its:ite)
dely(its:ite)=dymeter(its:ite)
!
!
!-----initialize arrays
Expand Down