Skip to content

Commit

Permalink
Update ECCC machine files (CICE-Consortium#751)
Browse files Browse the repository at this point in the history
* machines: eccc: unify baseline directory

* machines: eccc: fix modules initialization

Make sure to source the Csh initialization script for environment
modules ourselves, as it is not done in all environments.

While at it, for convenience add I_MPI_LIBRARY_KIND=debug to the
commented lines.

(cherry picked from commit 75ef5d2)
  • Loading branch information
phil-blain committed Dec 12, 2022
1 parent 7ec729f commit 692fbc7
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.gpsc3_intel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ setenv ICE_MACHINE_ENVNAME intel
setenv ICE_MACHINE_MAKE make
setenv ICE_MACHINE_WKDIR ~/data/site3/cice/runs/
setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
setenv ICE_MACHINE_BASELINE ~/data/site3/cice/baseline/
setenv ICE_MACHINE_BASELINE ~/data/site3/cice/baselines/
setenv ICE_MACHINE_SUBMIT "sbatch"
setenv ICE_MACHINE_TPNODE 44
setenv ICE_MACHINE_ACCT "eccc_cmdd"
Expand Down
2 changes: 2 additions & 0 deletions configuration/scripts/machines/env.ppp5_intel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ source /fs/ssm/main/opt/ssmuse/ssmuse-1.11/ssmuse_1.11_all/bin/ssmuse-boot.csh >
set ssmuse=`which ssmuse-csh`
# Intel compiler + Intel MPI
source $ssmuse -d /fs/ssm/main/opt/intelcomp/inteloneapi-2022.1.2/intelcomp+mpi+mkl
# source /etc/profile.d/modules.csh
# module use /home/sice500/modulefiles
# setenv I_MPI_LIBRARY_KIND debug
# module load -s icc mpi
setenv FOR_DUMP_CORE_FILE 1
setenv I_MPI_DEBUG_COREDUMP 1
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.ppp6_gnu
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ setenv ICE_MACHINE_ENVNAME gnu
setenv ICE_MACHINE_MAKE make
setenv ICE_MACHINE_WKDIR ~/data/site6/cice/runs/
setenv ICE_MACHINE_INPUTDATA /space/hall6/sitestore/eccc/cmd/e/sice500/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baseline/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baselines/
setenv ICE_MACHINE_SUBMIT qsub
setenv ICE_MACHINE_TPNODE 80
setenv ICE_MACHINE_ACCT unused
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.ppp6_gnu-impi
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ setenv ICE_MACHINE_ENVNAME gnu-impi
setenv ICE_MACHINE_MAKE make
setenv ICE_MACHINE_WKDIR ~/data/site6/cice/runs/
setenv ICE_MACHINE_INPUTDATA /space/hall6/sitestore/eccc/cmd/e/sice500/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baseline/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baselines/
setenv ICE_MACHINE_SUBMIT qsub
setenv ICE_MACHINE_TPNODE 80
setenv ICE_MACHINE_ACCT unused
Expand Down
2 changes: 2 additions & 0 deletions configuration/scripts/machines/env.ppp6_intel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ source /fs/ssm/main/opt/ssmuse/ssmuse-1.11/ssmuse_1.11_all/bin/ssmuse-boot.csh >
set ssmuse=`which ssmuse-csh`
# Intel compiler + Intel MPI
source $ssmuse -d /fs/ssm/main/opt/intelcomp/inteloneapi-2022.1.2/intelcomp+mpi+mkl
# source /etc/profile.d/modules.csh
# module use /home/sice500/modulefiles
# setenv I_MPI_LIBRARY_KIND debug
# module load -s icc mpi
setenv FOR_DUMP_CORE_FILE 1
setenv I_MPI_DEBUG_COREDUMP 1
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.ppp6_intel19
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ setenv ICE_MACHINE_ENVNAME intel19
setenv ICE_MACHINE_MAKE make
setenv ICE_MACHINE_WKDIR ~/data/site6/cice/runs/
setenv ICE_MACHINE_INPUTDATA /space/hall6/sitestore/eccc/cmd/e/sice500/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baseline/
setenv ICE_MACHINE_BASELINE ~/data/site6/cice/baselines/
setenv ICE_MACHINE_SUBMIT "qsub"
setenv ICE_MACHINE_TPNODE 80
setenv ICE_MACHINE_ACCT P0000000
Expand Down
2 changes: 2 additions & 0 deletions configuration/scripts/machines/env.robert_intel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ source /fs/ssm/main/opt/ssmuse/ssmuse-1.11/ssmuse_1.11_all/bin/ssmuse-boot.csh >
set ssmuse=`which ssmuse-csh`
# Intel compiler + Intel MPI
source $ssmuse -d /fs/ssm/main/opt/intelcomp/inteloneapi-2022.1.2/intelcomp+mpi+mkl
# source /etc/profile.d/modules.csh
# module use /home/sice500/modulefiles
# setenv I_MPI_LIBRARY_KIND debug
# module load -s icc mpi
setenv FOR_DUMP_CORE_FILE 1
setenv I_MPI_DEBUG_COREDUMP 1
Expand Down
2 changes: 2 additions & 0 deletions configuration/scripts/machines/env.underhill_intel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ source /fs/ssm/main/opt/ssmuse/ssmuse-1.11/ssmuse_1.11_all/bin/ssmuse-boot.csh >
set ssmuse=`which ssmuse-csh`
# Intel compiler + Intel MPI
source $ssmuse -d /fs/ssm/main/opt/intelcomp/inteloneapi-2022.1.2/intelcomp+mpi+mkl
# source /etc/profile.d/modules.csh
# module use /home/sice500/modulefiles
# setenv I_MPI_LIBRARY_KIND debug
# module load -s icc mpi
setenv FOR_DUMP_CORE_FILE 1
setenv I_MPI_DEBUG_COREDUMP 1
Expand Down

0 comments on commit 692fbc7

Please sign in to comment.