Skip to content

Fix mesh filename from init steps in convergence tasks#442

Merged
xylar merged 3 commits intoE3SM-Project:mainfrom
xylar:fix-convergence-mesh-links
Jan 5, 2026
Merged

Fix mesh filename from init steps in convergence tasks#442
xylar merged 3 commits intoE3SM-Project:mainfrom
xylar:fix-convergence-mesh-links

Conversation

@xylar
Copy link
Copy Markdown
Collaborator

@xylar xylar commented Jan 2, 2026

Many convergence tasks have init steps with culled_mesh.nc, not mesh.nc as the final mesh file name. Here, we add a parameter to ConvergenceForward that specifies the mesh file name in the init step so this can be specified as appropriate.

The need for mesh.nc was introduced in #437 but it seems I rushed the review a little too much and didn't do enough testing to notice that the symlink was broken for many tasks.

This PR also fixes two small issues discovered when running the convergence suite:

  • A trailing / in the name of the merry-go-round task paths is dropped for consistency with other task paths
  • The convergence suite is updated to not require cached files that were seemingly never created for external_gravity_wave

Checklist

  • Testing comment in the PR documents testing used to verify the changes

xylar added 3 commits January 2, 2026 09:59
Many convergence tasks have init steps with `culled_mesh.nc`,
not `mesh.nc` as the final mesh file name.  Here, we add a parameter
to `ConvergenceForward` that specifies the mesh file name in
the init step so this can be specified as appropriate.
These files were never cached (or perhaps need to be updated)
@xylar xylar requested a review from cbegeman January 2, 2026 16:28
@xylar xylar self-assigned this Jan 2, 2026
@xylar xylar added bug Something isn't working ocean Related to the ocean component labels Jan 2, 2026
@xylar
Copy link
Copy Markdown
Collaborator Author

xylar commented Jan 2, 2026

Testing

I ran the omega_pr (Omega) and convergence (MPAS-Ocean) suites on Chrysalis (with Intel).

Before this fix, the omega_pr suite was failing on various convergence tests. convergence hasn't been run in quite some time but surely would have shown failures as well.

/lcrc/group/e3sm/ac.xylar/polaris_0.9/chrysalis/test_20260102/convergence-fix-mesh-links
/lcrc/group/e3sm/ac.xylar/polaris_0.9/chrysalis/test_20260102/omega-pr-fix-convergence-mesh-links

omega_pr ran successfully. I saw state validation failures in the following tests in convergence:

0:00:02 FAIL ocean/spherical/icos/geostrophic/convergence_both
0:00:08 FAIL ocean/spherical/qu/geostrophic/convergence_both

This may indicate that the geostrophic test is not configured correctly (e.g. the time step is too large) but it does not seem to be related to this PR and reported in #443

@xylar
Copy link
Copy Markdown
Collaborator Author

xylar commented Jan 2, 2026

@cbegeman, when you're back and have some time, please take a look.

Copy link
Copy Markdown
Collaborator

@cbegeman cbegeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving based on visual inspection and testing with Omega on chrys with intel, openmpi. Thanks, @xylar

@xylar
Copy link
Copy Markdown
Collaborator Author

xylar commented Jan 5, 2026

Thank you for having a look, @cbegeman!

@xylar xylar merged commit 05586c3 into E3SM-Project:main Jan 5, 2026
7 checks passed
@xylar xylar deleted the fix-convergence-mesh-links branch January 5, 2026 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working ocean Related to the ocean component

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants