-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove INTEL20_WORKAROUND and port to mustang (#462)
- Loading branch information
Showing
10 changed files
with
276 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,14 +91,15 @@ cat >> ${jobfile} << EOFB | |
| #PBS -l walltime=${batchtime} | ||
| EOFB | ||
|
|
||
| else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr*) then | ||
| else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang) then | ||
| cat >> ${jobfile} << EOFB | ||
| #PBS -N ${shortcase} | ||
| #PBS -q ${queue} | ||
| #PBS -A ${acct} | ||
| #PBS -l select=${nnodes}:ncpus=${maxtpn}:mpiprocs=${taskpernode} | ||
| #PBS -l walltime=${batchtime} | ||
| #PBS -j oe | ||
| #PBS -W umask=022 | ||
| ###PBS -M [email protected] | ||
| ###PBS -m be | ||
| EOFB | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #============================================================================== | ||
| # Macros file for AFRL mustang, 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 | ||
| MPICC := icc | ||
| MPIFC := ifort | ||
|
|
||
| ifeq ($(ICE_COMMDIR), mpi) | ||
| FC := $(MPIFC) | ||
| CC := $(MPICC) | ||
| else | ||
| FC := $(SFC) | ||
| CC := $(SCC) | ||
| endif | ||
| LD:= $(FC) | ||
|
|
||
| #defined by env | ||
| #NETCDF_PATH := $(NETCDF_PATH) | ||
|
|
||
| INCLDIR += -I$(NETCDF_PATH)/include | ||
| LIB_NETCDF := $(NETCDF_PATH)/lib | ||
| SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -lmpi | ||
|
|
||
| ifeq ($(ICE_THREADED), true) | ||
| LDFLAGS += -qopenmp | ||
| CFLAGS += -qopenmp | ||
| FFLAGS += -qopenmp | ||
| endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #============================================================================== | ||
| # Macros file for AFRL mustang, 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 | ||
| MPICC := icc | ||
| MPIFC := ifort | ||
|
|
||
| ifeq ($(ICE_COMMDIR), mpi) | ||
| FC := $(MPIFC) | ||
| CC := $(MPICC) | ||
| else | ||
| FC := $(SFC) | ||
| CC := $(SCC) | ||
| endif | ||
| LD:= $(FC) | ||
|
|
||
| #defined by env | ||
| #NETCDF_PATH := $(NETCDF_PATH) | ||
|
|
||
| INCLDIR += -I$(NETCDF_PATH)/include | ||
| LIB_NETCDF := $(NETCDF_PATH)/lib | ||
| SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -lmpi | ||
|
|
||
| ifeq ($(ICE_THREADED), true) | ||
| LDFLAGS += -qopenmp | ||
| CFLAGS += -qopenmp | ||
| FFLAGS += -qopenmp | ||
| endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #============================================================================== | ||
| # Macros file for AFRL mustang, 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 | ||
| MPICC := icc | ||
| MPIFC := ifort | ||
|
|
||
| ifeq ($(ICE_COMMDIR), mpi) | ||
| FC := $(MPIFC) | ||
| CC := $(MPICC) | ||
| else | ||
| FC := $(SFC) | ||
| CC := $(SCC) | ||
| endif | ||
| LD:= $(FC) | ||
|
|
||
| #defined by env | ||
| #NETCDF_PATH := $(NETCDF_PATH) | ||
|
|
||
| INCLDIR += -I$(NETCDF_PATH)/include | ||
| LIB_NETCDF := $(NETCDF_PATH)/lib | ||
| SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -lmpi | ||
|
|
||
| ifeq ($(ICE_THREADED), true) | ||
| LDFLAGS += -qopenmp | ||
| CFLAGS += -qopenmp | ||
| FFLAGS += -qopenmp | ||
| endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.