ufs-community · BrianCurtis-NOAA · May 26, 2022 · May 6, 2022 · May 6, 2022 · May 6, 2022
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -13,7 +13,7 @@ are specified below.
 
 ## Instructions: All subsequent sections of text should be filled in as appropriate.
 
-The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model. 
+The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsibility to keep the PR up-to-date with the develop branch of ufs-weather-model. 
 
 ## Description
 
@@ -37,6 +37,7 @@ How were these changes tested? What compilers / HPCs was it tested with? Are the
 - [ ] cheyenne.gnu
 - [ ] gaea.intel 
 - [ ] jet.intel
+- [ ] wcoss2.intel
 - [ ] wcoss_cray
 - [ ] wcoss_dell_p3
 - [ ] opnReqTest for newly added/changed feature

diff --git a/.gitmodules b/.gitmodules
@@ -40,5 +40,5 @@
   branch = develop
 [submodule "AQM"]
   path = AQM
-  url = https://github.com/NOAA-EMC/AQM
+  url = https://github.com/NOAA-EMC/AQM 
   branch = develop
diff --git a/AQM b/AQM
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -58,7 +58,7 @@ module load udreg
 module load ugni
 
 module load esmf/8.3.0b09
-module load fms/2021.04
+module load fms/2022.01
 
 module swap pmi pmi/5.0.11
 

diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
@@ -58,7 +58,7 @@ module load udreg
 module load ugni
 
 module load esmf/8.3.0b09-debug
-module load fms/2021.04
+module load fms/2022.01
 
 module swap pmi pmi/5.0.11
 

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/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -148,26 +148,26 @@ RUN     | control_wam_debug
 # HAFS tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 #
-COMPILE | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON | - wcoss2.intel | fv3 |
-RUN     | hafs_regional_atm                                                                                                       | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_atm_thompson_gfdlsf                                                                                       | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_atm_ocn                                                                                                   | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_atm_wav                                                                                                   | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_atm_ocn_wav                                                                                               | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_1nest_atm                                                                                                 | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_regional_telescopic_2nests_atm                                                                                     | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_global_1nest_atm                                                                                                   | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_global_multiple_4nests_atm                                                                                         | - jet.intel wcoss_cray wcoss2.intel     | fv3 |
-RUN     | hafs_regional_specified_moving_1nest_atm                                                                                | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_regional_storm_following_1nest_atm                                                                                 | - jet.intel wcoss2.intel hera.intel     | fv3 |
-RUN     | hafs_regional_storm_following_1nest_atm_ocn                                                                             | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_regional_storm_following_1nest_atm_ocn_wav                                                                         | - jet.intel wcoss2.intel                | fv3 |
-RUN     | hafs_global_storm_following_1nest_atm                                                                                   | - jet.intel wcoss2.intel                | fv3 |
-
-COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON                        | - wcoss_cray wcoss2.intel | fv3 |
-RUN     | hafs_regional_docn                                                                                                      | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | hafs_regional_docn_oisst                                                                                                | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | hafs_regional_datm_cdeps                                                                                                | - wcoss_cray wcoss2.intel               | fv3 |
+COMPILE | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON |                | fv3 |
+RUN     | hafs_regional_atm                                                                                                       |                                         | fv3 |
+RUN     | hafs_regional_atm_thompson_gfdlsf                                                                                       |                                         | fv3 |
+RUN     | hafs_regional_atm_ocn                                                                                                   |                                         | fv3 |
+RUN     | hafs_regional_atm_wav                                                                                                   |                                         | fv3 |
+RUN     | hafs_regional_atm_ocn_wav                                                                                               |                                         | fv3 |
+RUN     | hafs_regional_1nest_atm                                                                                                 | - jet.intel                             | fv3 |
+RUN     | hafs_regional_telescopic_2nests_atm                                                                                     | - jet.intel                             | fv3 |
+RUN     | hafs_global_1nest_atm                                                                                                   | - jet.intel                             | fv3 |
+RUN     | hafs_global_multiple_4nests_atm                                                                                         | - jet.intel wcoss_cray                  | fv3 |
+RUN     | hafs_regional_specified_moving_1nest_atm                                                                                | - jet.intel                             | fv3 |
+RUN     | hafs_regional_storm_following_1nest_atm                                                                                 | - jet.intel                             | fv3 |
+RUN     | hafs_regional_storm_following_1nest_atm_ocn                                                                             | - jet.intel                             | fv3 |
+RUN     | hafs_regional_storm_following_1nest_atm_ocn_wav                                                                         | - jet.intel                             | fv3 |
+RUN     | hafs_global_storm_following_1nest_atm                                                                                   | - jet.intel                             | fv3 |
+
+COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON                        | - wcoss_cray                            | fv3 |
+RUN     | hafs_regional_docn                                                                                                      | - wcoss_cray                            | fv3 |
+RUN     | hafs_regional_docn_oisst                                                                                                | - wcoss_cray                            | fv3 |
+RUN     | hafs_regional_datm_cdeps                                                                                                | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################
 # CDEPS Data Atmosphere tests                                                                                                                                                     #

diff --git a/tests/tests/hafs_global_1nest_atm b/tests/tests/hafs_global_1nest_atm
@@ -26,7 +26,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_global_multiple_4nests_atm b/tests/tests/hafs_global_multiple_4nests_atm
@@ -32,7 +32,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_global_storm_following_1nest_atm b/tests/tests/hafs_global_storm_following_1nest_atm
@@ -27,7 +27,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_1nest_atm b/tests/tests/hafs_regional_1nest_atm
@@ -26,7 +26,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_atm b/tests/tests/hafs_regional_atm
@@ -25,7 +25,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_atm_ocn b/tests/tests/hafs_regional_atm_ocn
@@ -28,7 +28,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
@@ -28,7 +28,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_atm_thompson_gfdlsf b/tests/tests/hafs_regional_atm_thompson_gfdlsf
@@ -24,7 +24,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
@@ -26,7 +26,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_docn b/tests/tests/hafs_regional_docn
@@ -28,7 +28,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_docn_oisst b/tests/tests/hafs_regional_docn_oisst
@@ -28,7 +28,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_specified_moving_1nest_atm b/tests/tests/hafs_regional_specified_moving_1nest_atm
@@ -26,7 +26,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm b/tests/tests/hafs_regional_storm_following_1nest_atm
@@ -26,7 +26,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
@@ -29,7 +29,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
@@ -31,7 +31,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08

diff --git a/tests/tests/hafs_regional_telescopic_2nests_atm b/tests/tests/hafs_regional_telescopic_2nests_atm
@@ -28,7 +28,7 @@ export IDEFLATE=1
 export NFHMAX_HF=-1
 export NFHOUT_HF=3
 export NFHOUT=3
-export OUTPUT_FILE="'netcdf_parallel' 'netcdf'"
+export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
 export SMONTH=08