Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for regression tests on NCEP RDHPC orion machine #468

Merged
merged 26 commits into from
Sep 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f82d7ae
updates for running regtests on orion
JessicaMeixner-NOAA Aug 3, 2021
8b19cb2
actually hera should be srun too
JessicaMeixner-NOAA Aug 3, 2021
89206ee
use g2 3.4.1
JessicaMeixner-NOAA Aug 4, 2021
134ebc6
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Aug 4, 2021
f8efa4b
add ulimit -s unlimited to help with memory errors
JessicaMeixner-NOAA Aug 5, 2021
649c880
update input file
JessicaMeixner-NOAA Aug 9, 2021
d39c212
update run_test for slurm+oasis #440
JessicaMeixner-NOAA Aug 9, 2021
5caeaa9
fix inputfile
JessicaMeixner-NOAA Aug 10, 2021
6366ea2
updates for slurm + oasis
JessicaMeixner-NOAA Aug 19, 2021
4404319
update matrix_ncep so that needed modules are there for srun updates
JessicaMeixner-NOAA Aug 20, 2021
c7498db
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Aug 20, 2021
c38b826
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Aug 24, 2021
299a30c
Initial port of the WW3 model to S4 (#424)
DavidHuber-NOAA Aug 26, 2021
ba5b303
Merge upstream develop changes to port_2_s4.
DavidHuber-NOAA Sep 1, 2021
35daf1d
Regression test scriptfixes for S4. (#424)
DavidHuber-NOAA Sep 1, 2021
990aaec
Added support for OASIS tests with srun. (#424)
DavidHuber-NOAA Sep 3, 2021
ad227a3
Reverted the OASACM3 test call in matrix.base. (#424)
DavidHuber-NOAA Sep 3, 2021
c59c8ac
Merge remote-tracking branch 'DH/port_2_s4' into orion
JessicaMeixner-NOAA Sep 7, 2021
b5352db
remove temporary lines
JessicaMeixner-NOAA Sep 7, 2021
75f5294
remove extra modules that we shouldn't need after David's S4 update
JessicaMeixner-NOAA Sep 8, 2021
21f337d
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Sep 8, 2021
0a6e499
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Sep 10, 2021
28ad037
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Sep 14, 2021
1d55e29
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Sep 15, 2021
9e0ec9a
Merge branch 'NOAA-EMC:develop' into orion
JessicaMeixner-NOAA Sep 16, 2021
cf40ded
Merge remote-tracking branch 'EMC/develop' into orion
JessicaMeixner-NOAA Sep 23, 2021
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
2 changes: 1 addition & 1 deletion model/bin/cmplr.env
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
optc='-c -module $path_m -no-fma -ip -g -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias -sox'
optc='-c -module $path_m -no-fma -ip -g -traceback -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias -sox'
aliabdolali marked this conversation as resolved.
Show resolved Hide resolved
optl='-o $prog -g'

# list options
Expand Down
3 changes: 2 additions & 1 deletion regtests/bin/matrix.base
Original file line number Diff line number Diff line change
Expand Up @@ -2103,7 +2103,8 @@
echo "$rtst -s OASACM2 -w work_OASACM2 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body
echo "mkdir -p ww3_tp2.14/work_OASACM3" >> matrix.body
echo "cp ww3_tp2.14/input/ww3_shel_OASACM3.nml ww3_tp2.14/work_OASACM3/ww3_shel.nml" >> matrix.body
echo "$rtst -s OASACM3 -w work_OASACM3 -f -p $mpi -n $np/2 -o netcdf $ww3 ww3_tp2.14" >> matrix.body
halfnp=$(($np / 2))
echo "$rtst -s OASACM3 -w work_OASACM3 -f -p $mpi -n $halfnp -o netcdf $ww3 ww3_tp2.14" >> matrix.body
echo "mkdir -p ww3_tp2.14/work_OASACM4" >> matrix.body
echo "ln -sf ../work_OASACM3/restart001.ww3 ww3_tp2.14/work_OASACM4/restart.ww3" >> matrix.body
echo "$rtst -r ww3_grid -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body
Expand Down
21 changes: 10 additions & 11 deletions regtests/bin/matrix_ncep
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
batchq='slurm'
hpcstackpath='/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack'
hpcstackversion='hpc/1.1.0'
modcomp='hpc-intel/2019.5'
modmpi='hpc-impi/2019.6'
modcomp='hpc-intel/2018.4'
modmpi='hpc-impi/2018.4'
modnetcdf='netcdf/4.7.4'
metispath='/work/noaa/marine/ali.abdolali/Source/hpc-stack/parmetis-4.0.3'
modjasper='jasper/2.0.25'
Expand All @@ -85,10 +85,10 @@

# 1. Set up

export np='24' #number of mpi tasks
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
export np='24' #number of mpi tasks
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
export nth='6' #number of threads
export nth1='4' #number of threads (b4b check)

Expand All @@ -106,6 +106,7 @@
echo '#SBATCH -J ww3_regtest' >> matrix.head
echo '#SBATCH -o matrix.out' >> matrix.head
echo '#SBATCH -p orion' >> matrix.head
echo 'ulimit -s unlimited' >> matrix.head
elif [ $batchq = "slurm" ]
then
echo "#SBATCH -n ${np}" >> matrix.head
Expand All @@ -123,8 +124,8 @@
echo '#PBS -N ww3_regtest' >> matrix.head
echo '#PBS -j oe' >> matrix.head
echo '#PBS -o matrix.out' >> matrix.head
echo ' ' >> matrix.head
fi
echo ' ' >> matrix.head
echo " cd $(dirname $main_dir)/regtests" >> matrix.head
echo ' ' >> matrix.head

Expand All @@ -143,6 +144,7 @@
echo " module load $modg2" >> matrix.head
echo " module load $modw3nco" >> matrix.head
echo " module load $modesmf" >> matrix.head

echo ' export NETCDF_CONFIG=$NETCDF_ROOT/bin/nc-config' >> matrix.head
echo " export METIS_PATH=${metispath}" >> matrix.head
echo ' export JASPER_LIB=$JASPER_ROOT/lib64/libjasper.a' >> matrix.head
Expand All @@ -154,7 +156,7 @@

if [ "$batchq" = 'slurm' ]
then
export mpi='mpirun'
export mpi='srun'
aliabdolali marked this conversation as resolved.
Show resolved Hide resolved
else
export mpi='mpirun'
fi
Expand Down Expand Up @@ -243,9 +245,6 @@
fi





# --------------------------------------------------------------------------- #
# End to the matrix #
# --------------------------------------------------------------------------- #