CI: Intel fix for dev/ufs-weather-model

[MatthewMasarik-NOAA]

Pull Request Summary

Fixes broken Intel CI scripts for the dev/ufs-weather-model branch.

Description

The PR applies the fix made to develop (#1064), to the dev/ufs-weather-model branch. This fixes the Intel CI scripts which had been broken. The GNU CI scripts were also adjusted to make the two as similar as possible.

Please also include the following information:

• Add any suggestions for a reviewer
  • @JessicaMeixner-NOAA
• Mention any labels that should be added:
  • bug
• Are answer changes expected from this PR?
  • No. Only changes to CI scripts running on the github server were made.
• Co-authors:
  • @AlexanderRichert-NOAA @aerorahul

Issue(s) addressed

• fixes Fix Intel CI for dev/ufs-weather-model branch #1068

Commit Message

CI: fix for Intel scripts. GNU scripts updated.

Check list

• Branch is up to date with the authoritative repository (NOAA-EMC) develop branch.
• Checked the checklist for a developer submitting to develop.
• [na] If a version number update is required, checked the updating version number checklist.
• [na] If a new feature was added, a regression test for testing the new feature is added.

Testing

• How were these changes tested?
  • Testing occurred by running the CI scripts on the Github server.
• Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
  • No. These changes do not affect the regtests. Only changes to CI scripts were made.
• Have the matrix regression tests been run (if yes, please note HPC and compiler)?
  • No. None of the changes would be exercised by the regression tests.
• Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
  • No changes expected.
• Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
  • In this case (CI only changes), regression testing is not necessary.

[zach1221]

Hi, @JessicaMeixner-NOAA . We're ready to begin the merging process on ufs-wm PR #1890. Please merge this WW3 PR when you're able.