From 700fbe41bd4046ec51c6738302cce2d410d8e99d Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Mon, 25 May 2009 13:47:34 +0000
Subject: [PATCH] ready for a test
---
Makefile | 12 +++++++-----
Makefile.p690 | 6 +++---
read_input_file.f90 | 4 ++++
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index eed0c2a3..a9670bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,13 @@ DOUAR.o \
write_global_output.o vrm.o
OPTIONS=-bnoquiet
+
+all: $(NAME)
+$(NAME): subdirs $(OBJECTS)
+ $(F90) $(FLAGS) $(OPTIONS) $(OBJECTS) $(LIBS) -o $(NAME) \
+ >$(NAME).link 2>&1
+
+
subdirs:
cd CASCADE; make all
cd NN; make all
@@ -87,11 +94,6 @@ objclean:
cd RESAMPLE; make $@
rm -f *.o *.mod $(COMPILE_OUT)
-all: $(NAME)
-$(NAME): subdirs $(OBJECTS)
- $(F90) $(FLAGS) $(OPTIONS) $(OBJECTS) $(LIBS) -o $(NAME) \
- >$(NAME).link 2>&1
-
.PHONY: clean
clean: objclean
diff --git a/Makefile.p690 b/Makefile.p690
index 60d4f169..ba01fcd9 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -15,12 +15,11 @@ CFLAGS = -O3 -qstrict -Q -qarch=auto -qtune=auto \
# Define other things
#
-# PGPLOT = /work/cedrict/Douar/PGI/PGPLOT
+PGPLOT = /home/beaumnt1/software/pgplot-5.2.2
X11 = /usr/lpp/X11
WSMP = /home/beaumnt1/software/wsmp/lib/Power4
# libs removed on p690...
-# -L$(PGPLOT) -lpgplot \
# -lacml
LIBS = \
-LOCTREE -lOctree \
@@ -28,7 +27,8 @@ LIBS = \
-LCASCADE -lcascade \
-LRESAMPLE -lresample \
-L$(X11) -lX11 \
--L$(WSMP) -lpwsmp64 \
+-L$(WSMP) -lpwsmp \
+-L$(PGPLOT) -lpgplot \
-lpthread
# INCLUDE = -I$(MUMPS)/include
diff --git a/read_input_file.f90 b/read_input_file.f90
index 30a0c325..f6575e92 100644
--- a/read_input_file.f90
+++ b/read_input_file.f90
@@ -860,12 +860,16 @@ if (iproc.eq.0) then
call scanfile (params%infile,'isostasy',answer,ires)
params%isostasy=(trim(answer)=='T')
endif
+call mpi_bcast(params%isostasy,1,mpi_logical,0,mpi_comm_world,ierr)
+write(threadinfo%Logunit,*) 'isostasy',params%isostasy
params%flexure=.false.
if (iproc.eq.0) then
call scanfile (params%infile,'flexure',answer,ires)
params%flexure=(trim(answer)=='T')
endif
+call mpi_bcast(params%flexure,1,mpi_logical,0,mpi_comm_world,ierr)
+write(threadinfo%Logunit,*) 'flexure',params%flexure
params%elastic_plate_thickness=20.d3
if (iproc==0) call scanfile (params%infile,'elastic_plate_thickness',params%elastic_plate_thickness,ires)
--
GitLab