(1) update MOM6 to its main branch 20220902 commit (2) update GNU to …

…include s2swa tests (#1401) * update GNU to include s2swa tests * switch to MOM6 testing branch: update MOM6 to its main branch 20220902 commit
ufs-community · Sep 13, 2022 · 1bba232 · 1bba232
1 parent b10ddb3
commit 1bba232
Show file tree

Hide file tree

Showing 12 changed files with 4,653 additions and 4,626 deletions.
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
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/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220909
+BL_DATE=20220912
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -79,12 +79,14 @@ RUN     | rap_control_dyn64_phy32_debug
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################
 
-COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp                                   |                | fv3         |
-RUN     | cpld_control_noaero_p8                                                                                                  |                | fv3         |
-RUN     | cpld_control_nowave_noaero_p8                                                                                           |                | fv3         |
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp                                   |                | fv3         |
+RUN     | cpld_control_p8                                                                                                          |                | fv3         |
 
-COMPILE | -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp                        |                | fv3         |
-RUN     | cpld_debug_noaero_p8                                                                                                    |                | fv3         |
+COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp                                     |                | fv3         |
+RUN     | cpld_control_nowave_noaero_p8                                                                                            |                | fv3         |
+
+COMPILE | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp                        |                | fv3         |
+RUN     | cpld_debug_p8                                                                                                            |                | fv3         |
 
 ##################################################################################################################################################################
 # CDEPS Data Atmosphere test                                                                                                                                     #