Skip to content

Commit

Permalink
Merge branch 'darincomeau/ocn/fix-missing-ssh-index' into next (PR #5305
Browse files Browse the repository at this point in the history
)

Add missing time level index to 'ssh' coupling field

This adds a time level index that was missing from an 'ssh' call. The
missing index results in the following warnings being printed to
ocn.log.* every timestep in certain configurations (GMPAS-*.*wISC*):
   WARNING: Error: Field ssh has more than one time level, but no
                   timeLevel argument given.
With this fix (h/t @xylar), those warning messages no longer appear.

Fixes #5287

[BFB]
  • Loading branch information
jonbob committed Nov 17, 2022
2 parents 91dc6ca + 835542c commit 9aa79a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/mpas-ocean/driver/ocn_comp_mct.F
Original file line number Diff line number Diff line change
Expand Up @@ -2630,7 +2630,7 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
call mpas_pool_get_dimension(forcingPool, 'index_avgSurfaceVelocityZonal', index_avgZonalSurfaceVelocity)
call mpas_pool_get_dimension(forcingPool, 'index_avgSurfaceVelocityMeridional', index_avgMeridionalSurfaceVelocity)

call mpas_pool_get_array(statePool, 'ssh', ssh)
call mpas_pool_get_array(statePool, 'ssh', ssh, 1)
call mpas_pool_get_array(statePool, 'layerThickness', layerThickness, 1)

call mpas_pool_get_array(forcingPool, 'landIceMask', landIceMask)
Expand Down

0 comments on commit 9aa79a2

Please sign in to comment.