From fd604e0a916224b082f2aa64b987e1c8a557f44f Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Mon, 25 May 2009 16:48:22 +0000
Subject: [PATCH] latest tweaks backported from p690
---
CASCADE/Makefile | 3 +++
Makefile | 3 +++
Makefile.p690 | 6 +++---
NN/Makefile | 3 +++
OCTREE/Makefile | 3 +++
RESAMPLE/Makefile | 3 +++
douar.run | 20 +++++++++++++++++---
7 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/CASCADE/Makefile b/CASCADE/Makefile
index a5b04857..08b2ed3d 100644
--- a/CASCADE/Makefile
+++ b/CASCADE/Makefile
@@ -52,6 +52,9 @@ del_flip.o
all: lib$(NAME).a
lib$(NAME).a: $(OBJECTS) $(UTILS)
ar -rv lib$(NAME).a $(OBJECTS)
+ echo "--"
+ echo "compiler output...."
+ more $(COMPILE_OUT)
.PHONY: objclean
objclean:
diff --git a/Makefile b/Makefile
index a9670bd2..44695255 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,9 @@ all: $(NAME)
$(NAME): subdirs $(OBJECTS)
$(F90) $(FLAGS) $(OPTIONS) $(OBJECTS) $(LIBS) -o $(NAME) \
>$(NAME).link 2>&1
+ echo "--"
+ echo "compiler output...."
+ more $(COMPILE_OUT)
subdirs:
diff --git a/Makefile.p690 b/Makefile.p690
index ba01fcd9..2d7da19a 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -8,10 +8,10 @@ CC = mpcc_r
#
# I would like to add -u here, but Wow! Just try it.
FFLAGS = -O3 -qstrict -Q -qarch=auto -qtune=auto \
--qfloat=nomaf:nofold
+-qfloat=nomaf:nofold
#*****check these*******
CFLAGS = -O3 -qstrict -Q -qarch=auto -qtune=auto \
--qfloat=nomaf:nofold
+-qfloat=nomaf:nofold
# Define other things
#
@@ -33,7 +33,7 @@ LIBS = \
# INCLUDE = -I$(MUMPS)/include
-OPTIONS =
+OPTIONS = -bmaxdata:0x80000000 -bhalt:0 -bnoquiet
# compile rules
#
diff --git a/NN/Makefile b/NN/Makefile
index 65d448c6..4cdfee2d 100644
--- a/NN/Makefile
+++ b/NN/Makefile
@@ -14,6 +14,9 @@ volume.o
all: lib$(NAME).a
lib$(NAME).a: $(OBJECTS_NN)
ar rcv lib$(NAME).a $(OBJECTS_NN)
+ echo "--"
+ echo "compiler output...."
+ more $(COMPILE_OUT)
.PHONY: objclean
objclean:
diff --git a/OCTREE/Makefile b/OCTREE/Makefile
index 330c6938..4e6e12ff 100644
--- a/OCTREE/Makefile
+++ b/OCTREE/Makefile
@@ -15,6 +15,9 @@ rootls_sloan.o
all: lib$(NAME).a
lib$(NAME).a: $(OBJECTS_OCTREE)
ar rcv lib$(NAME).a $(OBJECTS_OCTREE)
+ echo "--"
+ echo "compiler output...."
+ more $(COMPILE_OUT)
.PHONY: objclean
objclean:
diff --git a/RESAMPLE/Makefile b/RESAMPLE/Makefile
index a310095b..05330934 100644
--- a/RESAMPLE/Makefile
+++ b/RESAMPLE/Makefile
@@ -19,6 +19,9 @@ resample.o
all: lib$(NAME).a
lib$(NAME).a: $(OBJECTS)
ar rcv lib$(NAME).a $(OBJECTS)
+ echo "--"
+ echo "compiler output...."
+ more $(COMPILE_OUT)
.PHONY: objclean
objclean:
diff --git a/douar.run b/douar.run
index 3d1e6fa6..a957a843 100644
--- a/douar.run
+++ b/douar.run
@@ -5,23 +5,37 @@
# Author: Douglas Guptill
# 2009-05-25: new
+if test $# -lt 1 ; then
+ echo "Usage: $0 <number-of-processors>"
+ exit
+fi
+
+PROCS=$1
+echo "Will use ${PROCS} processes."
+
+make_dir() {
+ if ! test -d $1; then mkdir $1; fi
+}
+
# For poe, set NLSPATH.
if test "x${NLSPATH}" = x ; then
export NLSPATH=/usr/lib/nls/msg/%L/%N:/usr/lib/nls/msg/%L/%N.cat
echo "setting NLSPATH=${NLSPATH}"
fi
-
# The PGPLOT routines need this.
export PGPLOT_DIR=/home/beaumnt1/software/pgplot-5.2.2
# WSMP needs to know where its license file is.
export WSMPLICPATH=/home/beaumnt1/software/wsmp/wsmp.lic
+# douar needs some directories..
+make_dir DEBUG
+make_dir DEBUG/mpilogs
# define the binary of douar
BIN=/home/beaumnt1/software/douar/douar
# How many processes to run?
-PROCS=16
+# PROCS=4
# Here is the run command
COM="poe ${BIN} -procs ${PROCS} -hostfile ${HOME}/host.list -euilib ip"
# start douar!
nohup ${COM} &
-
+echo "douar has been started. Look in nohup.out ."
--
GitLab