Bring AQM changes from production/AQM.v7 into develop branch

[BrianCurtis-NOAA]

Commit Queue Requirements:

• Fill out all sections of this template.
• All sub component pull requests have been reviewed by their code managers.
• Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
• Commit 'test_changes.list' from previous step

---

Description:

This PR brings in AQM changes from production/AQM.v7 into develop branch.

No major features are being brought in, just minor fixes for some of NCO's EE2 requirements.

Commit Message:

* UFSWM - bring in production/AQM.v7 changes
  * AQM - bring in production/AQM.v7 Changes

Priority:

• Normal

Git Tracking

UFSWM:

• Closes #
• None

Sub component Pull Requests:

• AQM: Bring in production/AQM.v7 relevant changes into develop branch. NOAA-EMC/AQM#98

UFSWM Blocking Dependencies:

• None

---

Changes

Regression Test Changes (Please commit test_changes.list):

• PR Updates/Changes Baselines.

Input data Changes:

• None.

Library Changes/Upgrades:

• No Updates

---

Testing Log:

• RDHPCS
  • Hera
  • Orion
  • Hercules
  • Jet
  • Gaea
  • Derecho
• WCOSS2
  • Dogwood/Cactus
  • Acorn
• CI
• opnReqTest (complete task if unnecessary)

[FernandoAndrade-NOAA]

#2186 has been merged in, please go ahead and resync. Has a pretest been run on this PR to verify any potential changes yet?

[BrianCurtis-NOAA]

#2186 has been merged in, please go ahead and resync. Has a pretest been run on this PR to verify any potential changes yet?

I will merge this into the other PR and give a full Hera run.