From 44b82c321caec5799390c1e1367512bac57ff910 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Tue, 2 Jul 2024 14:26:42 -0500 Subject: [PATCH 1/4] matrix_cmake_ncep: fix empty 'batchq' assignment --- regtests/bin/matrix_cmake_ncep | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 2eafd8986..7969dfe9f 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -22,11 +22,11 @@ usage () { cat 2>&1 << EOF - Usage: $myname model_dir compiler + Usage: $myname model_dir compiler Required: model_dir : path to model dir of WW3 source - Optional: - compiler : intel (default) or gnu + Optional: + compiler : intel (default) or gnu EOF } @@ -36,16 +36,16 @@ EOF main_dir="$1" ; shift if [ ! $# = 0 ] then - compiler="$1"; shift - else + compiler="$1"; shift + else compiler='intel' - fi + fi else usage exit 1 fi - - + + # Convert main_dir to absolute path main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" @@ -66,29 +66,29 @@ EOF # Set batchq queue, choose modules and other custom variables to fit system and # to define headers etc (default to original version if empty) ishera=`hostname | grep hfe` - isorion=`hostname | grep Orion` + isorion=`hostname | grep orion` ishercules=`hostname | grep hercules` if [ $ishera ] then batchq='slurm' if [ $compiler = "intel" ] - then + then 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' modcmake='cmake/3.23.1' elif [ $compiler = "gnu" ] - then + 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' modcmake='cmake/3.23.1' - else - echo "Compiler $compiler not supported on hera" - exit 1 - fi + else + echo "Compiler $compiler not supported on hera" + exit 1 + fi elif [ $isorion ] then if [ $compiler = "intel" ] @@ -100,11 +100,11 @@ EOF 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" + echo "Compiler $compiler not supported on orion" exit 1 - fi - elif [ $ishercules ] - then + fi + elif [ $ishercules ] + then batchq='slurm' if [ $compiler = "intel" ] then @@ -114,7 +114,7 @@ EOF 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 + then 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/12.2.0' @@ -122,7 +122,7 @@ EOF 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" + echo "Compiler $compiler not supported on hercules" exit 1 fi else @@ -195,7 +195,7 @@ EOF echo " module use $spackstackpath" >> matrix.head if [ ! -z $spackstackpath2 ]; then echo " module use $spackstackpath2" >> matrix.head - fi + fi echo " module load $modcomp" >> matrix.head echo " module load $modmpi" >> matrix.head echo " module load $modcmake" >> matrix.head From 9925cc3f4da626c991da5f101fbb46c73c0593fe Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Tue, 2 Jul 2024 16:45:30 -0500 Subject: [PATCH 2/4] matrix_cmake_ncep: update modules for rocky9 OS --- regtests/bin/matrix_cmake_ncep | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep index 7969dfe9f..2e0714474 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.5.0' + modesmf='esmf/8.6.0' modscotch='scotch/7.0.4' # Set batchq queue, choose modules and other custom variables to fit system and @@ -94,10 +94,10 @@ EOF if [ $compiler = "intel" ] then batchq='slurm' - 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.6.0/parmetis-4.0.3/install' + spackstackpath='module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core' + modcomp='stack-intel/2021.9.0' + modmpi='stack-intel-oneapi-mpi/2021.9.0' + metispath='' modcmake='cmake/3.23.1' else echo "Compiler $compiler not supported on orion" From 9a5a43b4f8cd78a39e2524011b042bec88edd2d6 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Tue, 2 Jul 2024 16:51:23 -0500 Subject: [PATCH 3/4] matrix_cmake_ncep: update Parmetis 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 2e0714474..0f40e2167 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -97,7 +97,7 @@ EOF spackstackpath='module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core' modcomp='stack-intel/2021.9.0' modmpi='stack-intel-oneapi-mpi/2021.9.0' - metispath='' + 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 9142ff904cc180cdb167b7456ebf4a710793773b Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Mon, 8 Jul 2024 10:08:14 -0500 Subject: [PATCH 4/4] matrix_cmake_ncep: fix "module use" typo --- 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 0f40e2167..1fa1a2d6f 100755 --- a/regtests/bin/matrix_cmake_ncep +++ b/regtests/bin/matrix_cmake_ncep @@ -94,7 +94,7 @@ EOF if [ $compiler = "intel" ] then batchq='slurm' - spackstackpath='module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core' + spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/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/orion/intel/spack-stack/1.6.0/parmetis-4.0.3/install'