diff --git a/configuration/scripts/icepack.batch.csh b/configuration/scripts/icepack.batch.csh index 841f1cd9f..94ac0696c 100755 --- a/configuration/scripts/icepack.batch.csh +++ b/configuration/scripts/icepack.batch.csh @@ -59,6 +59,16 @@ cat >> ${jobfile} << EOFB #PBS -l nodes=1:ppn=24 EOFB +else if (${ICE_MACHINE} =~ izumi*) then +cat >> ${jobfile} << EOFB +#PBS -j oe +###PBS -m ae +#PBS -V +#PBS -q short +#PBS -N ${ICE_CASENAME} +#PBS -l nodes=1:ppn=48 +EOFB + else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr*) then cat >> ${jobfile} << EOFB #PBS -N ${shortcase} diff --git a/configuration/scripts/machines/Macros.izumi_intel b/configuration/scripts/machines/Macros.izumi_intel new file mode 100755 index 000000000..5a538874e --- /dev/null +++ b/configuration/scripts/machines/Macros.izumi_intel @@ -0,0 +1,26 @@ +#============================================================================== +# Makefile macros for NCAR cheyenne, intel compiler +#============================================================================== + +CPP := fpp +CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} +CFLAGS := -qno-opt-dynamic-align -fp-model precise -std=gnu99 + +FIXEDFLAGS := -fixed -132 +FREEFLAGS := -free +FFLAGS := -qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -lifcore +FFLAGS_NOOPT:= -O0 +FC_AUTO_R8 := -r8 + +ifeq ($(ICE_BLDDEBUG), true) + FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created +else + FFLAGS += -O2 -debug minimal +endif + +SCC := icc +SFC := ifort +CC := $(SCC) +FC := $(SFC) +LD := $(FC) + diff --git a/configuration/scripts/machines/Macros.izumi_nag b/configuration/scripts/machines/Macros.izumi_nag new file mode 100755 index 000000000..c56852abb --- /dev/null +++ b/configuration/scripts/machines/Macros.izumi_nag @@ -0,0 +1,29 @@ +#============================================================================== +# Makefile macros for NCAR cheyenne, nag compiler +#============================================================================== + +CPP := /usr/bin/cpp +CPPFLAGS := -P -traditional +CPPDEFS := -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG ${ICE_CPPDEFS} +CFLAGS := -std=gnu99 + +FIXEDFLAGS := -fixed +FREEFLAGS := -free +FFLAGS := -Wp,-macro=no_com -convert=BIG_ENDIAN +FFLAGS_NOOPT:= -Wp,-macro=no_com -convert=BIG_ENDIAN +FC_AUTO_R8 := -r8 + +ifeq ($(ICE_BLDDEBUG), true) + FFLAGS += -C=all -g -gline -time -f2003 -ieee=stop +else + FFLAGS += -O2 -ieee=full +endif + +SCC := cc +SFC := nagfor +CC := $(SCC) +FC := $(SFC) +LD := $(FC) + +SLIBS := -L$(COMPILER_PATH)/lib/NAG_Fortran + diff --git a/configuration/scripts/machines/env.hobart_intel b/configuration/scripts/machines/env.hobart_intel index 254996a02..7a14e35ba 100755 --- a/configuration/scripts/machines/env.hobart_intel +++ b/configuration/scripts/machines/env.hobart_intel @@ -5,7 +5,7 @@ source /usr/share/Modules/init/csh module load compiler/intel/18.0.3 setenv ICE_MACHINE_ENVNAME hobart -setenv ICE_MACHINE_COMPILER nag +setenv ICE_MACHINE_COMPILER intel setenv ICE_MACHINE_MAKE gmake setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/ICEPACK_RUNS setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata diff --git a/configuration/scripts/machines/env.izumi_intel b/configuration/scripts/machines/env.izumi_intel new file mode 100755 index 000000000..7567a447a --- /dev/null +++ b/configuration/scripts/machines/env.izumi_intel @@ -0,0 +1,17 @@ +#!/bin/csh -f + +source /usr/share/Modules/init/csh + +module load compiler/intel/19.0.1 + +setenv ICE_MACHINE_ENVNAME izumi +setenv ICE_MACHINE_COMPILER intel +setenv ICE_MACHINE_MAKE gmake +setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/ICEPACK_RUNS +setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata +setenv ICE_MACHINE_BASELINE /scratch/cluster/$user/ICEPACK_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub" +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_QUEUE "debug" +setenv ICE_MACHINE_TPNODE 24 +setenv ICE_MACHINE_BLDTHRDS 1 diff --git a/configuration/scripts/machines/env.izumi_nag b/configuration/scripts/machines/env.izumi_nag new file mode 100755 index 000000000..aec52a0ad --- /dev/null +++ b/configuration/scripts/machines/env.izumi_nag @@ -0,0 +1,19 @@ +#!/bin/csh -f + +source /usr/share/Modules/init/csh + +module purge +module load compiler/nag/6.2 + +setenv ICE_MACHINE_ENVNAME izumi +setenv ICE_MACHINE_COMPILER nag +setenv ICE_MACHINE_MAKE gmake +setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/ICEPACK_RUNS +setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata +setenv ICE_MACHINE_BASELINE /scratch/cluster/$user/ICEPACK_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub" +setenv ICE_MACHINE_QSTAT "qstat " +setenv ICE_MACHINE_QUEUE "debug" +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_TPNODE 24 +setenv ICE_MACHINE_BLDTHRDS 1