rearrange things; douar is running on the p690, so prepare for non-debug compile options

Makefile.p690

@@ -17,67 +17,49 @@ LIBS = \
  -LNN -lnn_f$(BITS) \
  -LNN -lnn_c$(BITS) \
  -LCASCADE -lcascade$(BITS) \
- $(WSMP_LIB) \
  -LRESAMPLE -lresample$(BITS) \
+ -L/home/beaumnt1/software/wsmp/lib/Power4 -lpwsmp64 \
  -lpthread -lhm -lhu -lm_r 
 
-
 # The Makefiles look at compile output with this
 PAGER=more
 
-# wsmp lives here.
-#
-WSMP_DIR   = /home/beaumnt1/software/wsmp/lib/Power4
-
 # for 64 bit compile..................................
 #
 AR =ar -X 64
 BITS=-q64
 OPTIONS = -b64 -bmaxdata:0x80000000 -bhalt:0 -bnoquiet
-WSMP_LIB = -L$(WSMP_DIR) -lpwsmp64
 FLG64=-b64
 
 
 # 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 qflttrap=inexact
-# -qport options might be worth looking at later
-# -qwarn64 casues interesting messages in NN
-#
-# for xlf 8.1
-# -qflttrap=overflow:underflow:zerodivide:invalid:enable 
-# for xlf 10.1
-# -qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable 
-#
+# -qsave is the default for Fortran77, -qnosave for Fortran90
 # take -qextchk out for the final compile
 # Need -qhalt=s, else the compiler stops on the multiple errors from MPI calls.
-# For no optimzation, use "-O0" and remove "-qstrict"
+# For debugging.............
 FFLAGS  = -g -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
 -qmaxmem=-1 \
 -qcheck -qwarn64  \
 -qfloat=nomaf:nofold:norsqrt:strictnmaf \
 -qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable \
 -qsigtrap -qnosave -qhalt=s -qextchk
+# For speed................
+# FFLAGS  = -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
+# -qmaxmem=-1 \
+# -qfloat=nomaf:nofold:norsqrt:strictnmaf \
+# -qhalt=s
 
 # Define C compiler flags.............................
 #
 # take -qextchk out for the final compile
-# For no optimzation, remove the "-O" option and remove "-qstrict"
+# For debugging.............
 CFLAGS  = -g -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
 -qcheck -qwarn64 \
 -qfloat=nomaf:nofold:norsqrt \
 -qflttrap=overflow:underflow:zerodivide:invalid:enable \
 -qhalt=e -qextchk
-
-# full speed ahead and damn the torpedos..................
-#
-# FFLAGS  = -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
-# -qmaxmem=-1 \
-# -qfloat=nomaf:nofold:norsqrt:strictnmaf \
-# -qhalt=e
+# For speed................
 # CFLAGS  = -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
 # -qfloat=nomaf:nofold:norsqrt \
 # -qhalt=e