[AQM] [FV3] [WW3] Enable CMAQ scavenging and wet removal in resolved …

…clouds, ESMF 8.4 support for AQM, Update WW3. (#1456) * Bring in AQM PR #24 changes * Update WW3 hash to DeniseWorthen/feature/updatewm * Update AQM hash, bringing in EXMF 8.4 support for AQM * remove bio from aqm.rc Co-authored-by: jkbk2004 <[email protected]>
ufs-community · Nov 3, 2022 · 5db3fac · 5db3fac
1 parent 84b28ec
commit 5db3fac
Show file tree

Hide file tree

Showing 15 changed files with 5,157 additions and 5,463 deletions.
diff --git a/AQM b/AQM
diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/parm/aqm/aqm.rc b/tests/parm/aqm/aqm.rc
@@ -29,7 +29,7 @@ ctm_pmdiag: true
 #
 #  Input emissions
 #
-emission_sources: anthro bio fire
+emission_sources: anthro fire
 
 #
 #  Anthropogenic

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -12,12 +12,12 @@ RUN     | cpld_mpi_p8
 #RUN     | cpld_multigrid_p8                                                                                                       | - wcoss2.intel                          |     |
 RUN     | cpld_control_ciceC_p8                                                                                                   | - wcoss2.intel                          | fv3 |
 
-RUN     | cpld_control_c192_p8                                                                                                    | - wcoss2.intel jet.intel                | fv3 |
+RUN     | cpld_control_c192_p8                                                                                                    | - wcoss2.intel jet.intel acorn.intel    | fv3 |
 RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss2.intel jet.intel                |     | cpld_control_c192_p8
 
-RUN     | cpld_bmark_p8                                                                                                           | - wcoss2.intel jet.intel cheyenne.intel | fv3 |
-RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss2.intel jet.intel cheyenne.intel |     | cpld_bmark_p8
-RUN     | cpld_bmark_esmfthreads_p8                                                                                               | - wcoss2.intel jet.intel cheyenne.intel | fv3 |
+RUN     | cpld_bmark_p8                                                                                                           | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |
+RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss2.intel jet.intel cheyenne.intel acorn.intel |     | cpld_bmark_p8
+RUN     | cpld_bmark_esmfthreads_p8                                                                                               | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |
 
 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                                         | fv3 |
 RUN     | cpld_control_noaero_p8                                                                                                  |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221028
+BL_DATE=20221101
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}