Skip to content

Commit ca58c13

Browse files
authoredJul 15, 2024··
Updates to NCEP regtests for Orion Rocky9 OS(#1263)
1 parent af38c43 commit ca58c13

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed
 

‎regtests/bin/matrix_cmake_ncep

+26-26
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ usage ()
2222
{
2323
cat 2>&1 << EOF
2424
25-
Usage: $myname model_dir compiler
25+
Usage: $myname model_dir compiler
2626
Required:
2727
model_dir : path to model dir of WW3 source
28-
Optional:
29-
compiler : intel (default) or gnu
28+
Optional:
29+
compiler : intel (default) or gnu
3030
EOF
3131
}
3232

@@ -36,16 +36,16 @@ EOF
3636
main_dir="$1" ; shift
3737
if [ ! $# = 0 ]
3838
then
39-
compiler="$1"; shift
40-
else
39+
compiler="$1"; shift
40+
else
4141
compiler='intel'
42-
fi
42+
fi
4343
else
4444
usage
4545
exit 1
4646
fi
47-
48-
47+
48+
4949

5050
# Convert main_dir to absolute path
5151
main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`"
@@ -60,51 +60,51 @@ EOF
6060
modbacio='bacio/2.4.1'
6161
modg2='g2/3.4.5'
6262
modw3emc='w3emc/2.10.0'
63-
modesmf='esmf/8.5.0'
63+
modesmf='esmf/8.6.0'
6464
modscotch='scotch/7.0.4'
6565

6666
# Set batchq queue, choose modules and other custom variables to fit system and
6767
# to define headers etc (default to original version if empty)
6868
ishera=`hostname | grep hfe`
69-
isorion=`hostname | grep Orion`
69+
isorion=`hostname | grep orion`
7070
ishercules=`hostname | grep hercules`
7171
if [ $ishera ]
7272
then
7373
batchq='slurm'
7474
if [ $compiler = "intel" ]
75-
then
75+
then
7676
spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core'
7777
modcomp='stack-intel/2021.5.0'
7878
modmpi='stack-intel-oneapi-mpi/2021.5.1'
7979
metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/intel/spack-stack/1.6.0/parmetis-4.0.3/install'
8080
modcmake='cmake/3.23.1'
8181
elif [ $compiler = "gnu" ]
82-
then
82+
then
8383
spackstackpath='/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core'
8484
modcomp='stack-gcc/9.2.0'
8585
modmpi='stack-openmpi/4.1.5'
8686
metispath='/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hera/gnu/spack-stack/1.6.0/parmetis-4.0.3/install'
8787
modcmake='cmake/3.23.1'
88-
else
89-
echo "Compiler $compiler not supported on hera"
90-
exit 1
91-
fi
88+
else
89+
echo "Compiler $compiler not supported on hera"
90+
exit 1
91+
fi
9292
elif [ $isorion ]
9393
then
9494
if [ $compiler = "intel" ]
9595
then
9696
batchq='slurm'
97-
spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core'
98-
modcomp='stack-intel/2022.0.2'
99-
modmpi='stack-intel-oneapi-mpi/2021.5.1'
97+
spackstackpath='/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core'
98+
modcomp='stack-intel/2021.9.0'
99+
modmpi='stack-intel-oneapi-mpi/2021.9.0'
100100
metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/orion/intel/spack-stack/1.6.0/parmetis-4.0.3/install'
101101
modcmake='cmake/3.23.1'
102102
else
103-
echo "Compiler $compiler not supported on orion"
103+
echo "Compiler $compiler not supported on orion"
104104
exit 1
105-
fi
106-
elif [ $ishercules ]
107-
then
105+
fi
106+
elif [ $ishercules ]
107+
then
108108
batchq='slurm'
109109
if [ $compiler = "intel" ]
110110
then
@@ -114,15 +114,15 @@ EOF
114114
metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/intel/spack-stack/1.6.0/parmetis-4.0.3/install'
115115
modcmake='cmake/3.23.1'
116116
elif [ $compiler = "gnu" ]
117-
then
117+
then
118118
spackstackpath='/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core'
119119
spackstackpath2='/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles'
120120
modcomp='stack-gcc/12.2.0'
121121
modmpi='stack-mvapich2/2.3.7'
122122
metispath='/work/noaa/marine/Matthew.Masarik/waves/opt/hercules/gnu/spack-stack/1.6.0/parmetis-4.0.3/install'
123123
modcmake='cmake/3.23.1'
124124
else
125-
echo "Compiler $compiler not supported on hercules"
125+
echo "Compiler $compiler not supported on hercules"
126126
exit 1
127127
fi
128128
else
@@ -195,7 +195,7 @@ EOF
195195
echo " module use $spackstackpath" >> matrix.head
196196
if [ ! -z $spackstackpath2 ]; then
197197
echo " module use $spackstackpath2" >> matrix.head
198-
fi
198+
fi
199199
echo " module load $modcomp" >> matrix.head
200200
echo " module load $modmpi" >> matrix.head
201201
echo " module load $modcmake" >> matrix.head

0 commit comments

Comments
 (0)
Please sign in to comment.