Fix hobart and cheyenne compile issues (CICE-Consortium#303)

* serial fix for cheyenne * fix hobart compile
lettie-roach · Mar 28, 2019 · e2822e3 · e2822e3
1 parent d417b97
commit e2822e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/configuration/scripts/machines/Macros.hobart_intel b/configuration/scripts/machines/Macros.hobart_intel
@@ -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

diff --git a/configuration/scripts/machines/Macros.hobart_nag b/configuration/scripts/machines/Macros.hobart_nag
@@ -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
@@ -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

diff --git a/configuration/scripts/machines/env.cheyenne_intel b/configuration/scripts/machines/env.cheyenne_intel
@@ -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