Skip to content

Commit

Permalink
Merge pull request #761 from NCAR/mpas_surf_state
Browse files Browse the repository at this point in the history
fix: passing istatus set for vertislevel and vertisheight mpas_atm
  • Loading branch information
hkershaw-brown authored Nov 12, 2024
2 parents 62edc59 + 3ed740c commit 2d5882c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ individual files.

The changes are now listed with the most recent at the top.

**November 12 2024 :: MPAS bug-fixes. Tag v11.8.5**

- Fixed 2m and 10m fields not being updated - set istatus for VERTISHEIGHT
and VERTISLEVEL for convert_vert_distrib_state.
- Fixed vertical location in convert_vertical_obs to use zGridFace.

**November 8 2024 :: POP initial ensemble available from GDEX. Tag v11.8.4**

Documentation update:
Expand Down
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
author = 'Data Assimilation Research Section'

# The full version, including alpha/beta/rc tags
release = '11.8.4'
release = '11.8.5'
root_doc = 'index'

# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions models/mpas_atm/model_mod.f90
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

0 comments on commit 2d5882c

Please sign in to comment.