From dd0999c63156d33961cc4c1da85e17a97b7aeee2 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Fri, 29 May 2009 02:12:55 +0000
Subject: [PATCH] tweaks

---
 Makefile.p690 | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Makefile.p690 b/Makefile.p690
index c6dc6004..20e134db 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -15,21 +15,27 @@ PGPLOT = /home/beaumnt1/software/pgplot-5.2.2
 WSMP_LIB = -L$(WSMP_DIR) -lpwsmp
 
 # for 64 bit compile
-# AR=ar -X 64
-# BITS=-q64
-# OPTIONS = -b 64 -bmaxdata:0x80000000 -bhalt:0 -bnoquiet
-# PGPLOT = /home/beaumnt1/software/pgplot-5.2.2-q64
-# WSMP_LIB = -L$(WSMP_DIR) -lpwsmp64
+AR=ar -X 64
+BITS=-q64
+OPTIONS = -b 64 -bmaxdata:0x80000000 -bhalt:0 -bnoquiet
+PGPLOT = /home/beaumnt1/software/pgplot-5.2.2-q64
+WSMP_LIB = -L$(WSMP_DIR) -lpwsmp64
 
 
 # Define FORTRAN compiler flags
 # I would like to add -u here, but Wow!  Just try it.
 # FLAGS  = -O3 -qstrict -Q -qarch=auto -qtune=auto -qfloat=nomaf:nofold
 # Trouble on the p690; time to get serious.
+# douar bombs quickly; removing inexact
+# Signal generated for floating-point exception:
+#      FP inexact
+# So we'll take that one out.
+# -qflttrap=overflow:underflow:zerodivide:invalid:inexact:enable 
+
 # take -qextchk out for the final compile
 FLAGS  = -O2 -qmaxmem=-1 -qstrict -Q $(BITS)  -qarch=pwr4 -qtune=pwr4 \
 -qfloat=nomaf:nofold:norsqrt:strictnmaf \
--qflttrap=overflow:underflow:zerodivide:invalid:inexact:enable \
+-qflttrap=overflow:underflow:zerodivide:invalid:enable \
 -qsigtrap \
 -qhalt=s -qextchk
 
@@ -38,7 +44,7 @@ FLAGS  = -O2 -qmaxmem=-1 -qstrict -Q $(BITS)  -qarch=pwr4 -qtune=pwr4 \
 # take -qextchk out for the final compile
 CFLAGS  = -O2 -qstrict -Q $(BITS)  -qarch=pwr4 -qtune=pwr4 \
 -qfloat=nomaf:nofold:norsqrt \
--qflttrap=overflow:underflow:zerodivide:invalid:inexact:enable \
+-qflttrap=overflow:underflow:zerodivide:invalid:enable \
 -qhalt=e -qextchk
 
 # libs removed on p690...
@@ -62,13 +68,13 @@ COMPILE_OUT=$(NAME)$(BITS).compile
 .f90.o:
 	@echo "--"                                               >>$(COMPILE_OUT) 2>&1
 	@echo "xlf is `which xlf`"                               >>$(COMPILE_OUT) 2>&1
-	@echo "$(F90) -qsuffix=f=f90 $(FFLAGS) $(INCLUDE) -c $<" >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) -qsuffix=f=f90 $(FLAGS) $(INCLUDE) -c $<"  >>$(COMPILE_OUT) 2>&1
 	$(F90) -qsuffix=f=f90 $(FLAGS) $(INCLUDE) -c $<          >>$(COMPILE_OUT) 2>&1
 
 .f.o:
 	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
 	@echo "xlf is `which xlf`"                   >>$(COMPILE_OUT) 2>&1
-	@echo "$(F77) -qsuffix=f=f $(FFLAGS) -c $<"  >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) -qsuffix=f=f $(FLAGS) -c $<"   >>$(COMPILE_OUT) 2>&1
 	$(F77) -qsuffix=f=f $(FLAGS) -c $<           >>$(COMPILE_OUT) 2>&1
 
 .c.o:
-- 
GitLab