Skip to content

Commit

Permalink
Merge branch 'jonbob/ocn/fix-0-ncells' (PR #6321)
Browse files Browse the repository at this point in the history
Add logic to catch issue when partition file assigns 0 cells to a pe

When mpas-ocean runs with no cells assigned to a processor by a graph
file and has landIcePressureOn, the run aborts. This fixes that
situation by adding a check for the number of cells to the logic that
causes the abort.

Fixes: #6320

[BFB]
  • Loading branch information
jonbob committed Apr 5, 2024
2 parents 8b4c2d5 + fe1f8ca commit a020489
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ subroutine ocn_diagnostic_solve(dt, statePool, forcingPool, meshPool, verticalMe
call mpas_pool_get_array(forcingPool, 'landIceDraft', landIceDraft)
call mpas_pool_get_array(forcingPool, 'landIceFloatingMask', landIceFloatingMask)
call mpas_pool_get_array(forcingPool, 'landIceFraction', landIceFraction)
if (landIceFloatingMask(1) == -1) then
if (nCellsAll.gt.0 .AND. landIceFloatingMask(1) == -1) then
call mpas_log_write('landIceFloatingMask contains the default value which likely indicates that this field is missing in the initial condition file (e.g. because it is meant for an older E3SM version).', &
MPAS_LOG_CRIT)
endif
Expand Down

0 comments on commit a020489

Please sign in to comment.