Skip to content

Commit

Permalink
Merge branch 'jonbob/seaice/fix-restart-contents' into next (PR #6857)
Browse files Browse the repository at this point in the history
Fix issue with mpas-seaice restart_contents

A new field runningMeanRemovedIceRunoff was added in PR #6696 that
causes errors in some configurations on pm-cpu and frontier with the gnu
compiler. This moves the new field from a shared "meta-stream" to the
streams themselves because attached package wasn't getting inherited
correctly.

Fixes #6855
[BFB]
  • Loading branch information
jonbob committed Dec 18, 2024
2 parents 96539f0 + 2b04f92 commit df85a39
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion components/mpas-seaice/src/Registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2106,7 +2106,6 @@
<var name="testArrayRestartability"/>
<var name="forcingGroupNames"/>
<var name="forcingGroupRestartTimes"/>
<var name="runningMeanRemovedIceRunoff" packages="pkgScaledDIB"/>
</stream>

<stream name="restart"
Expand All @@ -2120,6 +2119,7 @@
<var name="xtime"/>
<var name="simulationStartTime"/>
<stream name="restart_contents"/>
<var name="runningMeanRemovedIceRunoff" packages="pkgScaledDIB"/>
</stream>

<stream name="restart_ic"
Expand All @@ -2131,6 +2131,7 @@
immutable="true">
<stream name="mesh"/>
<stream name="restart_contents"/>
<var name="runningMeanRemovedIceRunoff" packages="pkgScaledDIB"/>
</stream>

<stream name="output"
Expand Down

0 comments on commit df85a39

Please sign in to comment.