Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions regtests/bin/matrix_cmake_ncep
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ EOF
# 1. Set up

export np='24' #number of mpi tasks
if [ $batchq = "slurm" ] && [ $ishera ] && [ $compiler = "gnu" ]
then
export np='12'
fi
export npl='140' #number of mpi tasks for ufs applications and large setups
export npl1='100' #number of mpi tasks for ufs/large setups (b4b check)
export nr='4' #number of mpi tasks for hybrid
Expand Down Expand Up @@ -243,9 +247,17 @@ EOF
echo " module load $modw3emc" >> matrix.head
echo " module load $modesmf" >> matrix.head
echo " module load $modscotch" >> matrix.head
echo " export METIS_PATH=${metispath}" >> matrix.head
echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> matrix.head
echo ' [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}' >> matrix.head
echo ' '
if [ $ishera ] && [ $compiler = "gnu" ]
then
echo " export CPPFLAGS=\"-I/apps/slurm_hera/23.11.3/include/slurm \$CPPFLAGS\"" >> matrix.head
echo " export LD_LIBRARY_PATH=\"/apps/slurm_hera/23.11.3/lib:\$LD_LIBRARY_PATH\"" >> matrix.head
echo " export OMPI_MCA_btl_openib_allow_ib=true" >> matrix.head
echo " export UCX_TLS=rc,ud,self" >> matrix.head
fi
echo " export METIS_PATH=${metispath}" >> matrix.head
echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> matrix.head
echo ' [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}' >> matrix.head
echo ' '

if [ "$batchq" = 'slurm' ]
Expand Down
1 change: 1 addition & 0 deletions regtests/bin/matrix_divider_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ count=0
if [ -f "matrix${countf}" ]; then rm -f matrix${countf}; fi
cat before >> matrix${countf}
sed -i 's/'n\ 24'/'n\ 140'/gI' matrix${countf}
sed -i 's/'n\ 12'/'n\ 140'/gI' matrix${countf}
cat list_ufs >> matrix${countf}
sed -i 's/'matrix.out'/'matrix${countf}.out'/gI' matrix${countf}
sed -i 's/'##SBATCH'/'#SBATCH'/gI' matrix${countf}
Expand Down