update hobart scripts (CICE-Consortium#261)

mgcooper · Jun 18, 2019 · 4f28bdd · 4f28bdd
1 parent a31e755
commit 4f28bdd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/configuration/scripts/machines/Macros.hobart_nag b/configuration/scripts/machines/Macros.hobart_nag
@@ -4,7 +4,7 @@
 
 CPP        := /usr/bin/cpp
 CPPFLAGS   := -P -traditional
-CPPDEFS    := -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG
+CPPDEFS    := -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG ${ICE_CPPDEFS}
 CFLAGS     := -std=gnu99
 
 FIXEDFLAGS := -fixed
@@ -19,7 +19,7 @@ else
   FFLAGS   += -O2 -ieee=full
 endif
 
-SCC := nagcc
+SCC := cc
 SFC := nagfor
 CC := $(SCC)
 FC := $(SFC)

diff --git a/configuration/scripts/machines/env.hobart_nag b/configuration/scripts/machines/env.hobart_nag
@@ -2,6 +2,7 @@
 
 source /usr/share/Modules/init/csh
 
+module purge
 module load compiler/nag/6.2
 
 setenv ICE_MACHINE_ENVNAME hobart
@@ -11,7 +12,8 @@ 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_QSTAT "qstat "
 setenv ICE_MACHINE_QUEUE "debug"
+setenv ICE_MACHINE_ACCT P00000000
 setenv ICE_MACHINE_TPNODE 24
 setenv ICE_MACHINE_BLDTHRDS 1