Skip to content

Fix hobart and cheyenne compile issues #303

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.

Sign up for GitHub

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

Merged
apcraig merged 2 commits into from
Mar 28, 2019
Merged

Fix hobart and cheyenne compile issues #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e652ff
serial fix for cheyenne
apcraig Mar 28, 2019
4815715
fix hobart compile
apcraig Mar 28, 2019
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
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.hobart_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
CPP := /usr/bin/cpp
CPPFLAGS := $(CFLAGS) -lifcore
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -qno-opt-dynamic-align -fp-model precise -std=gnu99
CFLAGS := -c -qno-opt-dynamic-align -fp-model precise -std=gnu99

FIXEDFLAGS := -fixed -132
FREEFLAGS := -free
Expand Down
6 changes: 3 additions & 3 deletions configuration/scripts/machines/Macros.hobart_nag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

CPP := /usr/bin/cpp
CPPFLAGS := -P -traditional
CPPDEFS := -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG $(ICE_CPPDEFS)
CFLAGS := -std=gnu99
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 $(ICE_CPPDEFS)
CFLAGS := -c -std=gnu99

FIXEDFLAGS := -fixed
FREEFLAGS := -free
Expand All @@ -18,7 +18,7 @@ ifeq ($(ICE_BLDDEBUG), true)
FFLAGS := -Wp,-macro=no_com -convert=BIG_ENDIAN -wmismatch=mpi_bcast,mpi_isend,mpi_irecv,mpi_send,mpi_recv,mpi_allreduce -gline -C=all -g -time -f2003 -ieee=stop
endif

SCC := nagcc
SCC := cc
SFC := nagfor
MPICC := mpicc
MPIFC := mpif90
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.cheyenne_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module load ncarenv/1.2
module load intel/17.0.1
module load mpt/2.19
module load ncarcompilers/0.4.1
module load netcdf-mpi/4.6.1
module load netcdf/4.6.1

endif

Expand Down