From 0f878c306ca9233eaa516780ceaa1910eece7ef1 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Thu, 28 May 2009 20:05:17 +0000
Subject: [PATCH] ready for another try

---
 Makefile      |  3 +++
 Makefile.p690 | 47 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 6299a874..689d1de5 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,9 @@ $(NAME): subdirs $(OBJECTS)
 	echo "--"
 	echo "compiler output...."
 	more $(COMPILE_OUT)
+	echo "--"
+	echo "linker output...."
+	more $(NAME).link
 
 .PHONY: install
 install:
diff --git a/Makefile.p690 b/Makefile.p690
index 2d7da19a..0f6e7f0f 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -4,30 +4,55 @@ F90    = mpxlf90_r
 F77    = mpxlf_r
 CC     =  mpcc_r
 
-# Define compiler flags
+# Define FORTRAN compiler flags
 #
 # I would like to add -u here, but Wow!  Just try it.
-FFLAGS  = -O3 -qstrict -Q -qarch=auto -qtune=auto \
--qfloat=nomaf:nofold
-#*****check these*******
-CFLAGS  = -O3 -qstrict -Q -qarch=auto -qtune=auto \
--qfloat=nomaf:nofold
+# FFLAGS  = -O3 -qstrict -Q -qarch=auto -qtune=auto -qfloat=nomaf:nofold
+# Trouble on the p690; time to get serious.
+FFLAGS  = -O2 -qstrict -Q -q64 -b64 -qarch=pwr4 -qtune=pwr4 \
+-qfloat=nomaf:nofold:norsqrt:strictnmaf \
+-qrealsize=8 \
+-qflttrap=overflow:underflow:zerodivide:invalid:inexact:enable \
+-qsigtrap \
+-qhalt=e \
+-qextchk
 
-# Define other things
-#
-PGPLOT = /home/beaumnt1/software/pgplot-5.2.2
+# Define C compiler flags
+CFLAGS  = -O2 -qstrict -Q -q64  -qarch=pwr4 -qtune=pwr4 \
+-qfloat=nomaf:nofold:norsqrt \
+-qflttrap=overflow:underflow:zerodivide:invalid:inexact:enable \
+-qsigtrap \
+-qhalt=e \
+-qextchk
+
+
+# define pgplot
+# pgplot - 32bit
+# PGPLOT = /home/beaumnt1/software/pgplot-5.2.2
+# pgplot - 64bit
+PGPLOT = /home/beaumnt1/software/pgplot-5.2.2-q64
+
+# define X11
 X11    = /usr/lpp/X11
-WSMP   = /home/beaumnt1/software/wsmp/lib/Power4
+
+# define wsmp
+WSMP_DIR   = /home/beaumnt1/software/wsmp/lib/Power4
+# wsmp - 32bit
+# WSMP_LIB = -L$(WSMP_DIR) -lpwsmp
+# wsmp - 64bit
+WSMP_LIB = -L$(WSMP_DIR) -lpwsmp64
 
 # libs removed on p690...
 # -lacml
+# -L$(WSMP) -lpwsmp \
+
 LIBS = \
 -LOCTREE -lOctree \
 -LNN -lnn \
 -LCASCADE -lcascade \
 -LRESAMPLE -lresample \
+$(WSMP_LIB) \
 -L$(X11) -lX11 \
--L$(WSMP) -lpwsmp \
 -L$(PGPLOT) -lpgplot \
 -lpthread 
 
-- 
GitLab