Fixes for rc4

[forsyth2]

Summary

Objectives:

• Ensure tests pass on E3SM Unified 1.12.0rc4. (If we end up only touching files in tests/, then we won't need to make a new zppy rc`).
• Make testing structure easier to follow/maintain.

Issue resolution:

• Follow-up to Fixes for rc3 #753

Select one: This pull request is...

• a bug fix: increment the patch version
• a small improvement: increment the minor version
• a new feature: increment the minor version
• an incompatible (non-backwards compatible) API change: increment the major version

Small Change

• To merge, I will use "Squash and merge". That is, this change should be a single commit.
• Logic: I have visually inspected the entire pull request myself.
• Pre-commit checks: All the pre-commits checks have passed.

[forsyth2]

I tested the 4th commit (52e27ae) on Perlmutter as a follow-up to Unified 1.12.0rc3 testing. It produced a much more usable summary:

Test name	Total images	Correct images	Missing images	Mismatched images
bundles_e3sm_diags	1472	1390	0	82 (list, grid)
bundles_global_time_series	3	3	0	0
bundles_ilamb	388	0	388 (list)	0
comprehensive_v2_e3sm_diags	2891	2565	210 (list)	116 (list, grid)
comprehensive_v2_mpas_analysis	854	796	0	58 (list, grid)
comprehensive_v2_global_time_series	6	6	0	0
comprehensive_v2_ilamb	776	0	776 (list)	0
comprehensive_v3_e3sm_diags	3720	3262	355 (list)	103 (list, grid)
comprehensive_v3_mpas_analysis	854	796	0	58 (list, grid)
comprehensive_v3_global_time_series	15	0	15 (list)	0
comprehensive_v3_ilamb	810	0	810 (list)	0

[forsyth2]

I also tested the 4th commit (52e27ae) on Chrysalis as a follow-up to #746 (comment). It produced a summary that matches the numbers seen at that link.

Test name	Total images	Correct images	Missing images	Mismatched images
bundles_e3sm_diags	1692	1662	0	30 (list, grid)
bundles_global_time_series	3	3	0	0
bundles_ilamb	388	388	0	0
comprehensive_v2_e3sm_diags	3691	3659	0	32 (list, grid)
comprehensive_v2_mpas_analysis	856	848	0	8 (list, grid)
comprehensive_v2_global_time_series	12	12	0	0
comprehensive_v2_ilamb	776	776	0	0
comprehensive_v3_e3sm_diags	5210	5162	0	48 (list, grid)
comprehensive_v3_mpas_analysis	856	848	0	8 (list, grid)
comprehensive_v3_global_time_series	1404	1404	0	0
comprehensive_v3_ilamb	837	837	0	0
comprehensive_v3_pcmdi_diags	617	497	0	120 (list, grid)
legacy_3.0.0_bundles_e3sm_diags	1692	1662	0	30 (list, grid)
legacy_3.0.0_bundles_global_time_series	3	3	0	0
legacy_3.0.0_bundles_ilamb	388	388	0	0
legacy_3.0.0_comprehensive_v2_e3sm_diags	3691	3659	0	32 (list, grid)
legacy_3.0.0_comprehensive_v2_mpas_analysis	856	848	0	8 (list, grid)
legacy_3.0.0_comprehensive_v2_global_time_series	12	12	0	0
legacy_3.0.0_comprehensive_v2_ilamb	776	776	0	0
legacy_3.0.0_comprehensive_v3_e3sm_diags	5210	5162	0	48 (list, grid)
legacy_3.0.0_comprehensive_v3_mpas_analysis	856	848	0	8 (list, grid)
legacy_3.0.0_comprehensive_v3_global_time_series	90	90	0	0
legacy_3.0.0_comprehensive_v3_ilamb	837	837	0	0

[forsyth2]

Now that I've completed E3SM Unified 1.12.0rc3 testing on Chrysalis, Compy, and Perlmutter, I think I've tested these commits sufficiently for us to merge.

[forsyth2]

Did another visual inspection. All file changes are in tests/, so we won't actually need a new RC. Merging.