Enable pdlib tests on more platforms (#1967)

* enable pdlib tests on more platforms * fix bug and use scotch 7.0.4
ufs-community · Nov 22, 2023 · f431fbe · f431fbe
1 parent 6a874d1
commit f431fbe
Show file tree

Hide file tree

Showing 9 changed files with 7,930 additions and 5,846 deletions.
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
@@ -49,7 +49,7 @@ for i = 1, #ufs_modules do
 end
 
 prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
-scotch_ver=os.getenv("scotch_ver") or "7.0.3"
+scotch_ver=os.getenv("scotch_ver") or "7.0.4"
 load(pathJoin("scotch",scotch_ver))
 
 setenv("CC", "cc")

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -25,14 +25,14 @@ COMPILE | s2swa_32bit  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v1
 RUN | cpld_control_p8_mixedmode                         |    - noaacloud                     | baseline |
 
 #GFS
-COMPILE | s2swa_32bit_pdlib  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
-RUN | cpld_control_gfsv17                               | + hera orion cheyenne wcoss2 acorn | baseline |
-RUN | cpld_control_gfsv17_iau                           | + hera orion cheyenne wcoss2 acorn | baseline | cpld_control_gfsv17
-RUN | cpld_restart_gfsv17                               | + hera orion cheyenne wcoss2 acorn |          | cpld_control_gfsv17 
-RUN | cpld_mpi_gfsv17                                   | + hera orion cheyenne wcoss2 acorn |          |
+COMPILE | s2swa_32bit_pdlib  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | - noaacloud | fv3 |
+RUN | cpld_control_gfsv17                               |    - noaacloud                     | baseline |
+RUN | cpld_control_gfsv17_iau                           |    - noaacloud                     | baseline | cpld_control_gfsv17
+RUN | cpld_restart_gfsv17                               |    - noaacloud                     |          | cpld_control_gfsv17 
+RUN | cpld_mpi_gfsv17                                   |    - noaacloud                     |          |
 
-COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
-RUN | cpld_debug_gfsv17                                 | + hera orion cheyenne wcoss2 acorn | baseline |
+COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
+RUN | cpld_debug_gfsv17                                 |    - noaacloud                     | baseline |
 
 COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | cpld_control_p8                                   |   - noaacloud                       | baseline |
@@ -72,13 +72,13 @@ COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p
 RUN | cpld_control_p8_faster                            | - cheyenne  noaacloud                 | baseline |
 
 # Unstructured WW3 mesh
-COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_control_pdlib_p8                             | + hera orion cheyenne wcoss2    | baseline |
-RUN | cpld_restart_pdlib_p8                             | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
-RUN | cpld_mpi_pdlib_p8                                 | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
+COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | - noaacloud | fv3 |
+RUN | cpld_control_pdlib_p8                             | - noaacloud                | baseline |
+RUN | cpld_restart_pdlib_p8                             | - noaacloud                |          | cpld_control_pdlib_p8
+RUN | cpld_mpi_pdlib_p8                                 | - noaacloud                |          | cpld_control_pdlib_p8
 
-COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_debug_pdlib_p8                               | + hera orion cheyenne wcoss2    | baseline |
+COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
+RUN | cpld_debug_pdlib_p8                               | - noaacloud                | baseline |
 
 ### ATM tests ###
 COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 |