From 4cfbd73e8ca22c5a69a4c8282f04b792ec5298d8 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Thu, 7 Dec 2023 14:48:25 -0600 Subject: [PATCH 01/14] update regtests for ncep to remove login for shell and first intel loads --- regtests/bin/matrix_cmake_ncep | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 300af93e3..7d0d26bec 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -62,8 +62,6 @@ EOF then # If no other h, assuming Hera batchq='slurm' - basemodcomp='intel/2022.1.2' - basemodmpi='impi/2022.1.2' spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' @@ -72,8 +70,6 @@ EOF elif [ $isorion ] then batchq='slurm' - basemodcomp='intel/2022.1.2' - basemodmpi='impi/2022.1.2' spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2022.0.2' modmpi='stack-intel-oneapi-mpi/2021.5.1' @@ -94,7 +90,7 @@ EOF # 1.a Computer/ user dependent set up - echo '#!/bin/sh --login' > matrix.head + echo '#!/bin/sh' > matrix.head echo ' ' >> matrix.head if [ $batchq = "slurm" ] && [ $isorion ] then From da634507f42a128e7f33d24cf4793282939b4bf2 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 8 Dec 2023 14:35:43 +0000 Subject: [PATCH 02/14] updates to matrix_cmake_ncep for gnu and hercules --- regtests/bin/matrix_cmake_ncep | 91 ++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 7d0d26bec..d0a180e2a 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -22,21 +22,30 @@ usage () { cat 2>&1 << EOF - Usage: $myname model_dir + Usage: $myname model_dir compiler Required: model_dir : path to model dir of WW3 source + Optional: + compiler : intel (default) or gnu EOF } - # Get required arguments if [ ! $# = 0 ] then main_dir="$1" ; shift + if [ ! $# = 0 ] + then + compiler="$1"; shift + else + compiler='intel' + fi else usage exit 1 fi + + # Convert main_dir to absolute path main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" @@ -58,23 +67,68 @@ EOF # to define headers etc (default to original version if empty) ishera=`hostname | grep hfe` isorion=`hostname | grep Orion` + ishercules=`hostname | grep hercules` if [ $ishera ] then - # If no other h, assuming Hera batchq='slurm' - spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' - modcomp='stack-intel/2021.5.0' - modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' - modcmake='cmake/3.23.1' + if [ $compiler = "intel" ] + then + spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' + modcomp='stack-intel/2021.5.0' + modmpi='stack-intel-oneapi-mpi/2021.5.1' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + modcmake='cmake/3.23.1' + elif [ $compiler = "gnu" ] + then + spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' + modcomp='stack-gcc/9.2.0' + spackstackpath2='/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles' + modmpi='stack-openmpi/4.1.5' + #TODO Need Metis GNU on hera + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + modcmake='cmake/3.23.1' + else + echo "Compiler $compiler not supported on hera" + exit 1 + fi elif [ $isorion ] then + if [ $compiler = "intel" ] + then + batchq='slurm' + spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' + modcomp='stack-intel/2022.0.2' + modmpi='stack-intel-oneapi-mpi/2021.5.1' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + modcmake='cmake/3.23.1' + else + echo "Compiler $compiler not supported on orion" + exit 1 + fi + elif [ $ishercules ] + then batchq='slurm' - spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' - modcomp='stack-intel/2022.0.2' - modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' - modcmake='cmake/3.23.1' + if [ $compiler = "intel" ] + then + spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' + modcomp='stack-intel/2021.9.0' + modmpi='stack-intel-oneapi-mpi/2021.9.0' + #TO DO: Need METIS PATH + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + modcmake='cmake/3.23.1' + elif [ $compiler = "gnu" ] + then + spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env-mvap2/install/modulefiles/Core' + spackstackpath2='/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles' + modcomp='stack-gcc/11.3.1' + modmpi='stack-mvapich2/2.3.7' + #TO DO: Need METIS PATH + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + modcmake='cmake/2021.9.0' + else + echo "Compiler $compiler not supported on hercules" + exit 1 + fi else batchq= fi @@ -133,13 +187,10 @@ EOF # Netcdf, Parmetis and SCOTCH modules & variables echo " module purge" >> 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 use $spackstackpath" >> matrix.head + echo " module use $spackstackpath" >> matrix.head + if [ ! -z $spackstackpath2 ]; then + echo " module use $spackstackpath2" >> matrix.head + fi echo " module load $modcomp" >> matrix.head echo " module load $modmpi" >> matrix.head echo " module load $modcmake" >> matrix.head From 6bc9379fe365a51b27f32a7bb5299b11ffffabb9 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 8 Dec 2023 08:40:38 -0600 Subject: [PATCH 03/14] updates for hercules --- regtests/bin/matrix_cmake_ncep | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index d0a180e2a..a590646f6 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -163,6 +163,19 @@ EOF echo 'export KMP_STACKSIZE=2G' >> matrix.head echo 'export FI_OFI_RXM_BUFFER_SIZE=128000' >> matrix.head echo 'export FI_OFI_RXM_RX_SIZE=64000' >> matrix.head + elif [ $batchq = "slurm" ] && [ $ishercules ] + then + echo "#SBATCH -n ${np}" >> matrix.head + echo "##SBATCH --cpus-per-task=${nth}" >> matrix.head + echo '#SBATCH -q batch' >> matrix.head + echo '#SBATCH -t 08:00:00' >> matrix.head + echo '#SBATCH -A marine-cpu' >> matrix.head + echo '#SBATCH -J ww3_regtest' >> matrix.head + echo '#SBATCH -o matrix.out' >> matrix.head + echo '#SBATCH -p hercules' >> matrix.head + echo '#SBATCH --exclusive' >> matrix.head + echo ' ' >> matrix.head + echo 'ulimit -s unlimited' >> matrix.head elif [ $batchq = "slurm" ] then echo "#SBATCH -n ${np}" >> matrix.head From 4af83574a18da7c272c1547c41ea504612d3b47c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 8 Dec 2023 11:52:18 -0600 Subject: [PATCH 04/14] update cmake on hercules --- 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 a590646f6..c5a092f3f 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -124,7 +124,7 @@ EOF modmpi='stack-mvapich2/2.3.7' #TO DO: Need METIS PATH metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' - modcmake='cmake/2021.9.0' + modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hercules" exit 1 From 665b2fbcbc0f1d5d1d3b14093d2f3ccda990939f Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 11 Dec 2023 21:28:04 +0000 Subject: [PATCH 05/14] updated hera metis paths for intel and gnu --- regtests/bin/matrix_cmake_ncep | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index c5a092f3f..59e478007 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -76,7 +76,7 @@ EOF spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then @@ -84,8 +84,7 @@ EOF modcomp='stack-gcc/9.2.0' spackstackpath2='/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles' modmpi='stack-openmpi/4.1.5' - #TODO Need Metis GNU on hera - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hera" From 183e86a2db27f1fba31391c04088048479bfdbd8 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 12 Dec 2023 16:07:39 -0600 Subject: [PATCH 06/14] update orion intel metis 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 59e478007..60ddefffa 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -98,7 +98,7 @@ EOF spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2022.0.2' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/orion/intel/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on orion" From 95446b57f1fc0d4a7267ea4ece6d926b0e2f0f0c Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Fri, 5 Jan 2024 08:48:39 -0600 Subject: [PATCH 07/14] update orion env variables after testing, these are now the same as hercules --- regtests/bin/matrix_cmake_ncep | 4 ---- 1 file changed, 4 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 250e7b90d..b30162daf 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -156,10 +156,6 @@ EOF echo '#SBATCH --exclusive' >> matrix.head echo ' ' >> matrix.head echo 'ulimit -s unlimited' >> matrix.head - echo 'ulimit -c 0' >> matrix.head - echo 'export KMP_STACKSIZE=2G' >> matrix.head - echo 'export FI_OFI_RXM_BUFFER_SIZE=128000' >> matrix.head - echo 'export FI_OFI_RXM_RX_SIZE=64000' >> matrix.head elif [ $batchq = "slurm" ] && [ $ishercules ] then echo "#SBATCH -n ${np}" >> matrix.head From c1976605d21110b0793a9dedeac65d7ba6912f79 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 12 Mar 2024 15:25:16 +0000 Subject: [PATCH 08/14] update 1.6.0 for all platforms and to rocky-8 on hera --- regtests/bin/matrix_cmake_ncep | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index b30162daf..68ec26d77 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -52,7 +52,7 @@ EOF # Module Versions from spack-stack that are common for all platforms modnetcdfc='netcdf-c/4.9.2' - modnetcdff='netcdf-fortran/4.6.0' + modnetcdff='netcdf-fortran/4.6.1' modjasper='jasper/2.0.32' modzlib='zlib/1.2.13' modpng='libpng/1.6.37' @@ -73,19 +73,19 @@ EOF batchq='slurm' if [ $compiler = "intel" ] then - spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' + spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then - spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core' + spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-gcc/9.2.0' spackstackpath2='/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles' modmpi='stack-openmpi/4.1.5' metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.5.0/parmetis-4.0.3/install' - modcmake='cmake/3.23.1' + modcmake='3.23.1' else echo "Compiler $compiler not supported on hera" exit 1 @@ -95,7 +95,7 @@ EOF if [ $compiler = "intel" ] then batchq='slurm' - spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' + spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2022.0.2' modmpi='stack-intel-oneapi-mpi/2021.5.1' metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/orion/intel/spack-stack/1.5.0/parmetis-4.0.3/install' @@ -109,16 +109,16 @@ EOF batchq='slurm' if [ $compiler = "intel" ] then - spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core' + spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2021.9.0' modmpi='stack-intel-oneapi-mpi/2021.9.0' metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then - spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env-mvap2/install/modulefiles/Core' + spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core' spackstackpath2='/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles' - modcomp='stack-gcc/11.3.1' + modcomp='stack-gcc/12.2.0' modmpi='stack-mvapich2/2.3.7' metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.5.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' From 688f176251ac1879ae10109e7f406140bd3934ac Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 18 Mar 2024 20:15:38 +0000 Subject: [PATCH 09/14] update hera modules --- regtests/bin/matrix_cmake_ncep | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 68ec26d77..7a6d4efc8 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -76,7 +76,7 @@ EOF spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then @@ -84,8 +84,8 @@ EOF modcomp='stack-gcc/9.2.0' spackstackpath2='/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles' modmpi='stack-openmpi/4.1.5' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.5.0/parmetis-4.0.3/install' - modcmake='3.23.1' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' + modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hera" exit 1 From a6d37626087cf491f10ca31f46a65da8ac7943e2 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 18 Mar 2024 20:41:55 +0000 Subject: [PATCH 10/14] remove extra module for 1.6.0 rocky on hera for gnu --- regtests/bin/matrix_cmake_ncep | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 7a6d4efc8..cd4a31860 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -60,7 +60,7 @@ EOF modbacio='bacio/2.4.1' modg2='g2/3.4.5' modw3emc='w3emc/2.10.0' - modesmf='esmf/8.4.2' + modesmf='esmf/8.5.0' modscotch='scotch/7.0.4' # Set batchq queue, choose modules and other custom variables to fit system and @@ -82,7 +82,6 @@ EOF then spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-gcc/9.2.0' - spackstackpath2='/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles' modmpi='stack-openmpi/4.1.5' metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' From 07b92a65220e7dbfcb509aa6360f0ee9724a0b6c Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Wed, 20 Mar 2024 08:21:35 -0500 Subject: [PATCH 11/14] add orion-intel metis 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 cd4a31860..7ba2d6d5a 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -97,7 +97,7 @@ EOF spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2022.0.2' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/orion/intel/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/orion/intel/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on orion" From 894f9a4c68be8d3347efa22b00f8d35eaa7d7d62 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Wed, 20 Mar 2024 11:41:17 -0500 Subject: [PATCH 12/14] update hercules --- regtests/bin/matrix_cmake_ncep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 7ba2d6d5a..2de189c2f 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -76,14 +76,14 @@ EOF spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.6.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-gcc/9.2.0' modmpi='stack-openmpi/4.1.5' - metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hera" From 15fe747e01a9c8222b50b06a9f1909848d0fffe8 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 21 Mar 2024 21:06:47 +0000 Subject: [PATCH 13/14] initialize array that the rocky8 hera intel transition exposed. --- model/src/wminitmd.F90 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/model/src/wminitmd.F90 b/model/src/wminitmd.F90 index 956490b5e..768b6d91e 100644 --- a/model/src/wminitmd.F90 +++ b/model/src/wminitmd.F90 @@ -1273,6 +1273,12 @@ SUBROUTINE WMINIT ( IDSI, IDSO, IDSS, IDST, IDSE, IFNAME, & IF (WORDS(6) .EQ. 'T') THEN CALL NEXTLN ( COMSTR , MDSI , MDSE2 ) READ (MDSI,*,END=2001,ERR=2002)(ODAT(I,1),I=5*(8-1)+1,5*8) + ELSE + ODAT(5*(8-1)+1,1)=0 + ODAT(5*(8-1)+2,1)=0 + ODAT(5*(8-1)+3,1)=0 + ODAT(5*(8-1)+4,1)=0 + ODAT(5*8,1)=0 END IF ELSE READ (MDSI,*,END=2001,ERR=2002)(ODAT(I,1),I=5*(J-1)+1,5*J) From 5a8da619cf58a4e2018d31325dc24b5fa4e9fca9 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 27 Mar 2024 12:41:12 +0000 Subject: [PATCH 14/14] move hercules paths to hercules section, revert hera --- regtests/bin/matrix_cmake_ncep | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 2de189c2f..2eafd8986 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -76,14 +76,14 @@ EOF spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-intel/2021.5.0' modmpi='stack-intel-oneapi-mpi/2021.5.1' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.6.0/parmetis-4.0.3/install' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core' modcomp='stack-gcc/9.2.0' modmpi='stack-openmpi/4.1.5' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' + metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hera" @@ -111,7 +111,7 @@ EOF spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core' modcomp='stack-intel/2021.9.0' modmpi='stack-intel-oneapi-mpi/2021.9.0' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] then @@ -119,7 +119,7 @@ EOF spackstackpath2='/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles' modcomp='stack-gcc/12.2.0' modmpi='stack-mvapich2/2.3.7' - metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.5.0/parmetis-4.0.3/install' + metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.6.0/parmetis-4.0.3/install' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on hercules"