From 77c94cd264e0b37ed6747759945c2f806cc5d24d Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Tue, 13 Dec 2022 19:39:57 +0000 Subject: [PATCH 1/2] matrix_cmake_ncep: update hpc-stack module path --- regtests/bin/matrix_cmake_ncep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 4c4efd4b3d..db380796c6 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -60,7 +60,7 @@ EOF then # If no other h, assuming Hera batchq='slurm' - hpcstackpath='/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack' + hpcstackpath='/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack' hpcstackversion='hpc/1.2.0' modcomp='hpc-intel/2022.1.2' modmpi='hpc-impi/2022.1.2' From f51b1e95d5bb4b6c0ca4ce5c496ed79e555cd6ad Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Tue, 13 Dec 2022 20:47:05 +0000 Subject: [PATCH 2/2] matrix_cmake_ncep: add explicit load of comp,mpi --- regtests/bin/matrix_cmake_ncep | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index db380796c6..4babaf54ab 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -62,6 +62,8 @@ EOF batchq='slurm' hpcstackpath='/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack' hpcstackversion='hpc/1.2.0' + basemodcomp='intel/2022.1.2' + basemodmpi='impi/2022.1.2' modcomp='hpc-intel/2022.1.2' modmpi='hpc-impi/2022.1.2' metispath='/scratch2/COASTAL/coastal/save/Ali.Abdolali/hpc-stack/parmetis-4.0.3' @@ -135,6 +137,12 @@ EOF echo " module load $modcmake" >> matrix.head echo " module use $hpcstackpath" >> matrix.head echo " module load $hpcstackversion" >> matrix.head + if [ ! -z $basemodcomp ]; then + echo " module load $basemodcomp" >> matrix.head + fi + if [ ! -z $basemodmpi ]; then + echo " module load $basemodmpi" >> matrix.head + fi echo " module load $modcomp" >> matrix.head echo " module load $modmpi" >> matrix.head echo " module load $modnetcdf" >> matrix.head