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

CICE port to cori #314

Merged
merged 1 commit into from
May 24, 2019
Merged
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
12 changes: 7 additions & 5 deletions configuration/scripts/cice.batch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,16 @@ cat >> ${jobfile} << EOFB
EOFB

else if (${ICE_MACHINE} =~ cori*) then
@ nthrds2 = ${nthrds} * 2
cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
#SBATCH -p ${queue}
###SBATCH -A ${acct}
#SBATCH -n ${ncores}
#SBATCH -t ${batchtime}
#SBATCH -L SCRATCH
#SBATCH -C haswell
#SBATCH --qos ${queue}
#SBATCH --time ${batchtime}
#SBATCH --nodes ${nnodes}
#SBATCH --ntasks ${ntasks}
#SBATCH --cpus-per-task ${nthrds2}
#SBATCH --constraint haswell
###SBATCH -e filename
###SBATCH -o filename
###SBATCH --mail-type FAIL
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/cice.launch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ cat >> ${jobfile} << EOFR
EOFR
else
cat >> ${jobfile} << EOFR
srun -n ${ntasks} -c ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
srun --cpu-bind=cores ./cice >&! \$ICE_RUNLOG_FILE
EOFR
endif

Expand Down
18 changes: 9 additions & 9 deletions configuration/scripts/machines/env.cori_intel
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@ module unload PrgEnv-cray
module unload PrgEnv-gnu
module unload PrgEnv-intel
module unload PrgEnv-pgi
module load PrgEnv-intel/6.0.3
module load PrgEnv-intel/6.0.4

module unload intel
module load intel/17.0.2.174
module load intel/18.0.1.163

module unload cray-mpich
module unload cray-mpich-abi
module load cray-mpich/7.4.4
module load cray-mpich/7.7.3

module unload cray-hdf5
module unload cray-hdf5-parallel
module unload cray-netcdf
module unload cray-netcdf-hdf5parallel
module unload cray-parallel-netcdf
module load cray-netcdf/4.4.1
module load cray-hdf5/1.10.0
module load cray-parallel-netcdf/1.7.0
module load cray-netcdf/4.6.1.3

module unload cray-libsci

module unload craype
module load craype/2.5.7
module load craype/2.5.15

setenv NETCDF_PATH ${NETCDF_DIR}
setenv OMP_PROC_BIND true
setenv OMP_PLACES threads
limit coredumpsize unlimited
limit stacksize unlimited

Expand All @@ -46,11 +46,11 @@ setenv ICE_MACHINE_ENVNAME cori
setenv ICE_MACHINE_COMPILER intel
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR $SCRATCH/CICE_RUNS
setenv ICE_MACHINE_INPUTDATA /global/homes/t/tcraig/cice_consortium
setenv ICE_MACHINE_INPUTDATA /project/projectdirs/ccsm1/cice-consortium/
setenv ICE_MACHINE_BASELINE $SCRATCH/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "sbatch "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_QUEUE "regular"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "squeue --jobs="