From 84d98a6450c0ce751bb29f0280ceba86b101b585 Mon Sep 17 00:00:00 2001 From: Daniel Abdi Date: Tue, 15 Nov 2022 14:19:01 +0000 Subject: [PATCH 1/3] Add hera gnu fundamental test to Jenkins. --- .cicd/Jenkinsfile | 2 +- tests/WE2E/machine_suites/fundamental.hera.gnu.com | 6 ++++++ .../{fundamental.hera.nco => fundamental.hera.intel.nco} | 0 tests/WE2E/run_WE2E_tests.sh | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 tests/WE2E/machine_suites/fundamental.hera.gnu.com rename tests/WE2E/machine_suites/{fundamental.hera.nco => fundamental.hera.intel.nco} (100%) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 75a9e96308..64a45b1808 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -90,7 +90,7 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'gaea', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'gaea', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { diff --git a/tests/WE2E/machine_suites/fundamental.hera.gnu.com b/tests/WE2E/machine_suites/fundamental.hera.gnu.com new file mode 100644 index 0000000000..b5d00e1d26 --- /dev/null +++ b/tests/WE2E/machine_suites/fundamental.hera.gnu.com @@ -0,0 +1,6 @@ +MET_verification +community_ensemble_2mems +grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional diff --git a/tests/WE2E/machine_suites/fundamental.hera.nco b/tests/WE2E/machine_suites/fundamental.hera.intel.nco similarity index 100% rename from tests/WE2E/machine_suites/fundamental.hera.nco rename to tests/WE2E/machine_suites/fundamental.hera.intel.nco diff --git a/tests/WE2E/run_WE2E_tests.sh b/tests/WE2E/run_WE2E_tests.sh index 18063eee33..461041c08d 100755 --- a/tests/WE2E/run_WE2E_tests.sh +++ b/tests/WE2E/run_WE2E_tests.sh @@ -432,9 +432,9 @@ elif [ -n "${tests_file}" ] || [ -n "${test_type}" ] ; then if [ -n "${test_type}" ] ; then # Check for a pre-defined set. It could be machine dependent or has the mode # (community or nco), or default - user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine}.nco + user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine}.${compiler}.nco if [ ! -f ${user_spec_tests_fp} ]; then - user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine}.com + user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine}.${compiler}.com if [ ! -f ${user_spec_tests_fp} ]; then user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine}.${compiler} if [ ! -f ${user_spec_tests_fp} ]; then From 5df2b732e95dbba6ab68ea5c830f254ba9cb333b Mon Sep 17 00:00:00 2001 From: Daniel Abdi Date: Tue, 15 Nov 2022 22:05:09 +0000 Subject: [PATCH 2/3] Remove a couple of test cases. --- tests/WE2E/machine_suites/fundamental.hera.gnu.com | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/WE2E/machine_suites/fundamental.hera.gnu.com b/tests/WE2E/machine_suites/fundamental.hera.gnu.com index b5d00e1d26..bd59be10a8 100644 --- a/tests/WE2E/machine_suites/fundamental.hera.gnu.com +++ b/tests/WE2E/machine_suites/fundamental.hera.gnu.com @@ -1,6 +1,4 @@ MET_verification community_ensemble_2mems -grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional From 4d01087602ae44c7ef2de0a2eecd64672597d25e Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Mon, 14 Nov 2022 21:21:43 +0000 Subject: [PATCH 3/3] [develop] Add build_hera_gnu.lua file. Completes #476. --- modulefiles/build_hera_gnu.lua | 30 ++++++++++++++++++++++++++++++ modulefiles/build_hera_intel.lua | 9 ++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 modulefiles/build_hera_gnu.lua diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua new file mode 100644 index 0000000000..45bdd736a3 --- /dev/null +++ b/modulefiles/build_hera_gnu.lua @@ -0,0 +1,30 @@ +help([[ +This module loads libraries for building the UFS SRW App on +the NOAA RDHPC machine Hera using GNU 9.2.0 +]]) + +whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) + +prepend_path("MODULEPATH","/contrib/sutils/modulefiles") +load("sutils") + +load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1")) + +gnu_ver=os.getenv("gnu_ver") or "9.2.0" +load(pathJoin("gnu", gnu_ver)) + +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) +load(pathJoin("hpc-gnu", os.getenv("hpc-gnu_ver") or "9.2")) +load(pathJoin("hpc-mpich", os.getenv("hpc-mpich_ver") or "3.3.2")) + +load("srw_common") + +load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9")) +load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) + +setenv("CMAKE_C_COMPILER","mpicc") +setenv("CMAKE_CXX_COMPILER","mpicxx") +setenv("CMAKE_Fortran_COMPILER","mpif90") +setenv("CMAKE_Platform","hera.gnu") diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua index 69d74a0dd6..02af59a626 100644 --- a/modulefiles/build_hera_intel.lua +++ b/modulefiles/build_hera_intel.lua @@ -10,7 +10,14 @@ load("sutils") load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1")) -prepend_path("MODULEPATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") +intel_ver=os.getenv("intel_ver") or "2022.1.2" +load(pathJoin("intel", intel_ver)) + +impi_ver=os.getenv("impi_ver") or "2022.1.2" +load(pathJoin("impi", impi_ver)) + +prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack") + load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1.2")) load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver") or "2022.1.2"))