[develop] Add Hera GNU modulefile and fundamental test suite and upda…

…te Hera Intel modulefile. (#477) * Add hera gnu fundamental test to Jenkins. * Remove a couple of test cases. * [develop] Add build_hera_gnu.lua file. Completes #476. Co-authored-by: Daniel Abdi <[email protected]>
ufs-community · Nov 17, 2022 · d03e646 · d03e646
1 parent db1302f
commit d03e646
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 4 deletions.
diff --git 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/modulefiles/build_hera_gnu.lua 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
@@ -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"))

diff --git a/tests/WE2E/machine_suites/fundamental.hera.gnu.com b/tests/WE2E/machine_suites/fundamental.hera.gnu.com
@@ -0,0 +1,4 @@
+MET_verification
+community_ensemble_2mems
+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/.../WE2E/machine_suites/fundamental.hera.nco → ...machine_suites/fundamental.hera.intel.nco b/.../WE2E/machine_suites/fundamental.hera.nco → ...machine_suites/fundamental.hera.intel.nco
diff --git 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