Merge pull request #74 from grantfirl/ufs-dev-PR19

UFS-dev #19
NCAR · Nov 30, 2022 · c18dd1c · c18dd1c
2 parents 8d3a8a4 + 903420c
commit c18dd1c
Show file tree

Hide file tree

Showing 11 changed files with 1,795 additions and 1,795 deletions.
diff --git a/AQM b/AQM
diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
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_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/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_restart_c192_p8                                                                                                    | - wcoss2.intel jet.intel                |     | cpld_control_c192_p8
+RUN     | cpld_control_c192_p8                                                                                                    | - wcoss2.intel jet.intel acorn.intel    | fv3 |
+RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss2.intel jet.intel acorn.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.ncar.sh b/tests/rt.ncar.sh
@@ -444,7 +444,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221109
+BL_DATE=20221117
 
 RTPWD=${RTPWD:-$DISKNM/NCAR/main-${BL_DATE}/${RT_COMPILER^^}}
 

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=20221107
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
+2 −0		CMakeLists.txt
+10 −3		aqm_files.cmake
+7 −1		examples/aqm.rc
+11 −2		src/drv/cmaq_mod.F90
+1 −1		src/drv/cmaq_model_mod.F90
+21 −16		src/io/aqmio/aqmio.F90
+1 −1		src/io/ioapi/Makefile.am
+1 −1		src/io/ioapi/Makefile.in
+8 −0		src/model/Makefile.am
+46 −37		src/model/Makefile.in
+16 −0		src/shr/aqm_config_mod.F90
+6 −6		src/shr/aqm_emis_mod.F90
+2 −2		src/shr/aqm_internal_mod.F90
+67 −3		src/shr/aqm_methods.F90