use updateHallo to replace mpigather

git-svn-id: https://access-svn.nci.org.au/svn/cice/branches/access/cice5@300 f6bd92a4-46cf-401b-8a38-b7f7993d28bf
COSIMA · Dec 10, 2014 · 49b80b6 · 49b80b6
1 parent 899f278
commit 49b80b6
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 308 deletions.
diff --git a/bld/Macros.Linux.raijin.nci.org.au-mct b/bld/Macros.Linux.raijin.nci.org.au-mct
@@ -9,7 +9,7 @@ SLIBS      :=
 ULIBS      := 
 CPP        := /usr/bin/cpp
 CPPFLAGS   := -P -traditional
-CPPDEFS    := -DLINUX
+CPPDEFS    := -DLINUX -DPAROPT
 ifeq ($(DEBUG), yes)
     CFLAGS     := -c -g -O0
 else
@@ -24,13 +24,13 @@ FC         := mpif90
 #FFLAGS     := -r8 -i4 -O2 -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium
 #FFLAGS     := -r8 -i4 -g -O0 -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium
 ifeq ($(DEBUG), yes)
-    FFLAGS     := -g -r8 -i4 -O0 -g -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium
+    FFLAGS     := -r8 -i4 -O0 -g -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium -xHost -fp-model precise
 else
-    FFLAGS     := -g -traceback -fpe0 -r8 -i4 -O2 -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium
+    FFLAGS     := -r8 -i4 -O2 -align all -w -ftz -convert big_endian -assume byterecl -no-vec -mcmodel=medium -xHost -fp-model precise
 endif
 MOD_SUFFIX := mod
 LD         := $(FC)
-LDFLAGS    := $(FFLAGS) -v -static-intel
+LDFLAGS    := $(FFLAGS) -v #-static-intel 
 
     CPPDEFS :=  $(CPPDEFS) -DNXGLOB=$(NXGLOB) -DNYGLOB=$(NYGLOB) -DN_ILYR=$(N_ILYR) \
                 -DNUMIN=$(NUMIN) -DNUMAX=$(NUMAX) \