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

Addition of CompyMcNodeFace to Icepack machine files #353

Merged
merged 4 commits into from
Mar 17, 2021
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
15 changes: 15 additions & 0 deletions configuration/scripts/icepack.batch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,21 @@ cat >> ${jobfile} << EOFB
###SBATCH --mail-user username@domain.com
EOFB

else if (${ICE_MACHINE} =~ compy*) then
@ nthrds2 = ${nthrds} * 2
cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
#SBATCH -A ${acct}
#SBATCH --qos shared
#SBATCH --ntasks ${ncores}
#SBATCH --time ${ICE_RUNLENGTH}
#SBATCH --cpus-per-task ${nthrds2}
###SBATCH -e filename
###SBATCH -o filename
###SBATCH --mail-type FAIL
###SBATCH --mail-user username@domain.com
EOFB

else if (${ICE_MACHINE} =~ badger*) then
proteanplanet marked this conversation as resolved.
Show resolved Hide resolved
cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
Expand Down
39 changes: 39 additions & 0 deletions configuration/scripts/machines/Macros.compy_intel
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#==============================================================================
# Makefile macro for PNNL compy, intel compiler
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
FREEFLAGS := -FR
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost
FFLAGS_NOOPT:= -O0

ifeq ($(ICE_BLDDEBUG), true)
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
else
FFLAGS += -O2
endif

SCC := icc
SFC := ifort
CC := $(SCC)
FC := $(SFC)
LD := $(FC)

#NETCDF_PATH := /share/apps/netcdf/4.6.3/intel/19.0.3
INCLDIR := $(INCLDIR)

#LIB_NETCDF := $(NETCDF_PATH)/lib
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
#LIB_MPI := $(IMPILIBDIR)
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff

ifeq ($(ICE_THREADED), true)
LDFLAGS += -openmp
CFLAGS += -openmp
FFLAGS += -openmp
endif

42 changes: 42 additions & 0 deletions configuration/scripts/machines/env.compy_intel
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/csh -f

set inp = "undefined"
if ($#argv == 1) then
set inp = $1
endif

if ("$inp" != "-nomodules") then

source /share/apps/modules/init/csh

module purge
module load intel/19.0.3
module load gcc/8.1.0
module load intelmpi/2019u3
module load netcdf/4.6.3
module load hdf5/1.10.5

#setenv NETCDF_PATH ${NETCDF_DIR}
setenv NETCDF_PATH /share/apps/netcdf/4.6.3/intel/19.0.3
setenv OMP_PROC_BIND true
setenv OMP_PLACES threads
limit coredumpsize unlimited
limit stacksize unlimited

endif

setenv ICE_MACHINE_MACHNAME compy
setenv ICE_MACHINE_MACHINFO "intel/19.0.3 gcc/8.1.0 intelmpi/2019u3 netcdf/4.6.3"
setenv ICE_MACHINE_ENVNAME intel
setenv ICE_MACHINE_ENVINFO "ifort 19.0.3"
proteanplanet marked this conversation as resolved.
Show resolved Hide resolved
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR /compyfs/$USER/ICEPACK_RUNS
setenv ICE_MACHINE_INPUTDATA /compyfs/inputdata/cice-consortium/
setenv ICE_MACHINE_BASELINE /compyfs/$USER/ICEPACK_BASELINE
setenv ICE_MACHINE_SUBMIT "sbatch "
setenv ICE_MACHINE_ACCT e3sm
setenv ICE_MACHINE_QUEUE "regular"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "squeue --jobs="