AQM updates

[rmontuoro]

PR Checklist

• This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.

• This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

• An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
  are specified below.

• Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.

• New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Description

This PR introduces the following updates relevant to the coupled UFS-AQM configuration (Online-CMAQ):

• Rectify CCPP formulation of surface net heat fluxes provided to the coupled AQM component
• Update AQM component to restore link to the EPA authoritative CMAQ repository
• Use proper number of non-advected tracers and convective scavenging coefficients in regional_atmaq regression test

These updates will change the baseline for regional_atmaq.

Issue(s) addressed

• fixes Surface upward heat fluxes for coupling are not properly calculated when (cplaqm .and. .not.cplflx) is ture in GFS_PBL_generic_post.F90 NCAR/ccpp-physics#945
• fixes Bring CMAQ fork changes for MODULE_MOD into AQM repo. NOAA-EMC/AQM#7
• fixes Incorrect number of non-advected tracers in regional_atmaq regression test #1382

Testing

• hera.intel
• hera.gnu
• orion.intel
• cheyenne.intel
• cheyenne.gnu
• gaea.intel
• jet.intel
• wcoss2.intel
• acorn.intel
• opnReqTest for newly added/changed feature
• CI

Dependencies

• waiting on Update surface net heat fluxes for AQM coupling NOAA-EMC/fv3atm#575
• waiting on Update surface net heat fluxes for AQM coupling NCAR/ccpp-physics#953
• waiting on Restore link to CMAQ authoritative repository NOAA-EMC/AQM#8

[BrianCurtis-NOAA]

What we prefer for making changes to authoritative repos (in this case AQM), is for PR's to be made from personal forks of authoritative repos and not branches created in authoritative repos. Please keep this in mind for future PR's. We can use your AQM branch bugfix/restore-epa-cmaq this time.

Also in .gitmodules we like to have the AQM section point to the repo/branch you're working on. Please make that change to .gitmodules, as we will revert it prior to merging at the end.

[BrianCurtis-NOAA]

I was able to test this on Orion and everything passed except atmaq, which is what was expected.

FAILED TESTS: 
+ echo 'FAILED TESTS: '
+ read -r failed_test_name
+ echo 'Test regional_atmaq 150 failed in check_result failed '
Test regional_atmaq 150 failed in check_result failed 
+ echo 'Test regional_atmaq 150 failed in check_result failed '
+ read -r failed_test_name
+ echo 'Test regional_atmaq 150 failed in run_test failed '
Test regional_atmaq 150 failed in run_test failed 
+ echo 'Test regional_atmaq 150 failed in run_test failed '
+ read -r failed_test_name
+ echo