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

fix: passing istatus set for vertislevel and vertisheight mpas_atm #761

Merged
merged 5 commits into from
Nov 12, 2024
Merged

fix: passing istatus set for vertislevel and vertisheight mpas_atm #761

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2950c4f
fix: passing istatus set for vertislevel and vertisheight mpas_atm
hkershaw-brown Oct 24, 2024
1e57757
Merge branch 'main' into mpas_surf_state
hkershaw-brown Nov 8, 2024
f686787
Merge branch 'main' into mpas_surf_state
hkershaw-brown Nov 11, 2024
d1c35f9
bump version and changelog for release
hkershaw-brown Nov 12, 2024
3ed740c
Merge branch 'main' into mpas_surf_state
hkershaw-brown Nov 12, 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
6 changes: 4 additions & 2 deletions models/mpas_atm/model_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4954,7 +4954,7 @@ subroutine convert_vert_distrib_state(state_handle, ens_size, location, quantity
! we have the vert_level and cellid - no need to call find_triangle or find_vert_indices

zout(:) = vert_level

istatus(:) = 0
if (debug > 9 .and. do_output()) then
write(string2,'("zout_in_level for member 1:",F10.2)') zout(1)
call error_handler(E_MSG, 'convert_vert_distrib_state',string2,source, revision, revdate)
Expand Down Expand Up @@ -5013,10 +5013,12 @@ subroutine convert_vert_distrib_state(state_handle, ens_size, location, quantity
! of the quantities should use the level centers.
if ( ndim == 1 ) then
zout(:) = zGridFace(1, cellid)
istatus(:) = 0
else
zout(:) = zGridCenter(vert_level, cellid)
if ( quantity == QTY_VERTICAL_VELOCITY ) zout(:) = zGridFace(vert_level, cellid)
if ( quantity == QTY_EDGE_NORMAL_SPEED ) zout(:) = zGridEdge(vert_level, cellid)
istatus(:) = 0
endif

if (debug > 9 .and. do_output()) then
Expand Down Expand Up @@ -5045,7 +5047,7 @@ subroutine convert_vert_distrib_state(state_handle, ens_size, location, quantity
! surf F, norm F: need fullp only
! surf F, norm T: need both surfp and fullp

at_surf = (ztypein == VERTISSURFACE)
at_surf = (ztypein == VERTISSURFACE) !HK ztypin is set to VERTISLEVEL before entering this case statement
do_norm = .not. no_normalization_of_scale_heights

! if normalizing pressure and we're on the surface, by definition scale height
Expand Down