Skip to content

Commit

Permalink
Merge branch 'develop' into release/MAPL-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathomp4
mathomp4 committed Jan 17, 2025
2 parents 4037714 + 2b7162c commit 9f64a67
Show file tree
Hide file tree
Showing 9 changed files with 229 additions and 118 deletions.
70 changes: 42 additions & 28 deletions HISTORY_FP.rc.03z.tmpl
View file

Large diffs are not rendered by default.

74 changes: 44 additions & 30 deletions HISTORY_FP.rc.09z.tmpl
View file

Large diffs are not rendered by default.

70 changes: 42 additions & 28 deletions HISTORY_FP.rc.15z.tmpl
View file

Large diffs are not rendered by default.

70 changes: 42 additions & 28 deletions HISTORY_FP.rc.21z.tmpl
View file

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion gcm_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,28 @@ if ( $SITE == 'NCCS' ) then
if ("$BUILT_ON_SLES15" == "TRUE") then
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
echo " ${C2}mil (Milan)${CN} (default)"
echo " ${C2}cas (Cascade Lake)${CN}"
echo " "
set MODEL = `echo $<`
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
if ( .$MODEL == .) then
set MODEL = 'mil'
endif

if( $MODEL != 'mil' ) goto ASKPROC
if( $MODEL != 'mil' & \
$MODEL != 'cas' ) goto ASKPROC

if ($MODEL == 'mil') then
# We save a couple processes for the kernel
set NCPUS_PER_NODE = 126
else if ($MODEL == 'cas') then
# NCCS currently recommends that users do not run with
# 48 cores per node on SCU16 due to OS issues and
# recommends that CPU-intensive works run with 46 or less
# cores. As 45 is a multiple of 3, it's the best value
# that doesn't waste too much
#set NCPUS_PER_NODE = 48
set NCPUS_PER_NODE = 45
endif
else
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
Expand Down Expand Up @@ -2279,6 +2289,9 @@ if ( $SITE == 'NCCS' ) then

if ("$BUILT_ON_SLES15" == "TRUE") then
cat >> $HOMDIR/SETENV.commands << EOF
setenv I_MPI_ADJUST_ALLREDUCE 12
setenv I_MPI_ADJUST_GATHERV 3
setenv I_MPI_FABRICS shm:ofi
setenv I_MPI_OFI_PROVIDER psm3
EOF
Expand Down
15 changes: 14 additions & 1 deletion geoschemchem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,28 @@ if ( $SITE == 'NCCS' ) then
if ("$BUILT_ON_SLES15" == "TRUE") then
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
echo " ${C2}mil (Milan)${CN} (default)"
echo " ${C2}cas (Cascade Lake)${CN}"
echo " "
set MODEL = `echo $<`
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
if ( .$MODEL == .) then
set MODEL = 'mil'
endif

if( $MODEL != 'mil' ) goto ASKPROC
if( $MODEL != 'mil' & \
$MODEL != 'cas' ) goto ASKPROC

if ($MODEL == 'mil') then
# We save a couple processes for the kernel
set NCPUS_PER_NODE = 126
else if ($MODEL == 'cas') then
# NCCS currently recommends that users do not run with
# 48 cores per node on SCU16 due to OS issues and
# recommends that CPU-intensive works run with 46 or less
# cores. As 45 is a multiple of 3, it's the best value
# that doesn't waste too much
#set NCPUS_PER_NODE = 48
set NCPUS_PER_NODE = 45
endif
else
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
Expand Down Expand Up @@ -2309,6 +2319,9 @@ if ( $SITE == 'NCCS' ) then

if ("$BUILT_ON_SLES15" == "TRUE") then
cat >> $HOMDIR/SETENV.commands << EOF
setenv I_MPI_ADJUST_ALLREDUCE 12
setenv I_MPI_ADJUST_GATHERV 3
setenv I_MPI_FABRICS shm:ofi
setenv I_MPI_OFI_PROVIDER psm3
EOF
Expand Down
15 changes: 14 additions & 1 deletion gmichem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,28 @@ if ( $SITE == 'NCCS' ) then
if ("$BUILT_ON_SLES15" == "TRUE") then
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
echo " ${C2}mil (Milan)${CN} (default)"
echo " ${C2}cas (Cascade Lake)${CN}"
echo " "
set MODEL = `echo $<`
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
if ( .$MODEL == .) then
set MODEL = 'mil'
endif

if( $MODEL != 'mil' ) goto ASKPROC
if( $MODEL != 'mil' & \
$MODEL != 'cas' ) goto ASKPROC

if ($MODEL == 'mil') then
# We save a couple processes for the kernel
set NCPUS_PER_NODE = 126
else if ($MODEL == 'cas') then
# NCCS currently recommends that users do not run with
# 48 cores per node on SCU16 due to OS issues and
# recommends that CPU-intensive works run with 46 or less
# cores. As 45 is a multiple of 3, it's the best value
# that doesn't waste too much
#set NCPUS_PER_NODE = 48
set NCPUS_PER_NODE = 45
endif
else
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
Expand Down Expand Up @@ -2481,6 +2491,9 @@ if ( $SITE == 'NCCS' ) then

if ("$BUILT_ON_SLES15" == "TRUE") then
cat >> $HOMDIR/SETENV.commands << EOF
setenv I_MPI_ADJUST_ALLREDUCE 12
setenv I_MPI_ADJUST_GATHERV 3
setenv I_MPI_FABRICS shm:ofi
setenv I_MPI_OFI_PROVIDER psm3
EOF
Expand Down
3 changes: 3 additions & 0 deletions scm_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,9 @@ cat $expdir/WSUB_ExtData.tmp | sed '/collection:/ s#WSUB_SWclim.*#/dev/null#' >
/bin/cp $SOURCEDIR/sedfile.CASE $expdir
/bin/cp $SOURCEDIR/AGCM.CASE.txt $expdir

# These are the weights files
/bin/cp $SOURCEDIR/rh_* $expdir

# MAT These sed commands have to be done in the experiment directory.
# This should probably be fixed at some point

Expand Down
15 changes: 14 additions & 1 deletion stratchem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,28 @@ if ( $SITE == 'NCCS' ) then
if ("$BUILT_ON_SLES15" == "TRUE") then
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
echo " ${C2}mil (Milan)${CN} (default)"
echo " ${C2}cas (Cascade Lake)${CN}"
echo " "
set MODEL = `echo $<`
set MODEL = `echo $MODEL | tr "[:upper:]" "[:lower:]"`
if ( .$MODEL == .) then
set MODEL = 'mil'
endif

if( $MODEL != 'mil' ) goto ASKPROC
if( $MODEL != 'mil' & \
$MODEL != 'cas' ) goto ASKPROC

if ($MODEL == 'mil') then
# We save a couple processes for the kernel
set NCPUS_PER_NODE = 126
else if ($MODEL == 'cas') then
# NCCS currently recommends that users do not run with
# 48 cores per node on SCU16 due to OS issues and
# recommends that CPU-intensive works run with 46 or less
# cores. As 45 is a multiple of 3, it's the best value
# that doesn't waste too much
#set NCPUS_PER_NODE = 48
set NCPUS_PER_NODE = 45
endif
else
echo "Enter the ${C1}Processor Type${CN} you wish to run on:"
Expand Down Expand Up @@ -2294,6 +2304,9 @@ if ( $SITE == 'NCCS' ) then

if ("$BUILT_ON_SLES15" == "TRUE") then
cat >> $HOMDIR/SETENV.commands << EOF
setenv I_MPI_ADJUST_ALLREDUCE 12
setenv I_MPI_ADJUST_GATHERV 3
setenv I_MPI_FABRICS shm:ofi
setenv I_MPI_OFI_PROVIDER psm3
EOF
Expand Down

0 comments on commit 9f64a67

Please sign in to comment.