From 3a4e950efae7cbc7b68ad0a0c06e2bb8a9ca8652 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Wed, 10 Jun 2009 22:30:47 +0000
Subject: [PATCH] tweaks from mahone
---
define_bc.f90 | 6 +++++-
douar.run.mahone | 19 +++----------------
scanfile.f90 | 7 +++----
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/define_bc.f90 b/define_bc.f90
index 7f42da86..23e6de60 100644
--- a/define_bc.f90
+++ b/define_bc.f90
@@ -48,6 +48,7 @@ type (void) vo
integer i,iproc,nproc,ierr
double precision eps,lsf0,pi,l,h,x0,x1,x2,phi
integer ie,ij,j,jp
+character fname*256
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
@@ -69,7 +70,10 @@ phi=phi/180.d0*pi
!x1=x0-l*(1.d0-cos(phi))/sin(phi)
!x2=x0+l/tan(phi)
-select case(trim(params%infile))
+!select case(trim(params%infile))
+j = index(params%infile, '/', .true.)
+fname = params%infile(j+1:len(params%infile))
+select case(trim(fname))
case('input.txt','input.small.txt')
diff --git a/douar.run.mahone b/douar.run.mahone
index 9c0e1b93..192101e2 100755
--- a/douar.run.mahone
+++ b/douar.run.mahone
@@ -21,16 +21,9 @@ echo "Will use ${PROCS} processes."
export MALLOC_TRIM_THRESHOLD_=-1
export MALLOC_MMAP_MAX_=0
# WSMP needs to know where its license file is.
-# But this doesn't seem to work yet....)
-# It looks like the license must be where we start the job.
-# When using the licemse from AIX, we get:
-# ERROR**: This License is registered for an AIX system
# export WSMPLICPATH=/home/dguptill/software/wsmp/
-# export WSMPLICPATH=/home/pfullsac/PROGRAMS2008/v0.1/run_test_all/pbwithlic/wsmp.lic
-# The PGPLOT routines need this.
-export PGPLOT_DIR=/home/dguptill/software/pgplot-5.2.2
-export LD_LIBRARY_PATH=${PGPLOT_DIR}:${LD_LIBRARY_PATH}
-echo "LD_LIBRARY_PATH is ${LD_LIBRARY_PATH}"
+# But this doesn't seem to work....)
+# It looks like the license must be where we start the job.
# douar needs some directories..
make_dir DEBUG
make_dir DEBUG/mpilogs
@@ -40,13 +33,7 @@ make_dir OUT
BIN=/home/dguptill/software/douar/douar
# Here is the run command
-# COM="mpirun -np ${PROCS} --host localhost,localhost,localhost,localhost --byslot ${BIN}"
-# for the head node and MPICH
-# trouble:
-#p0_15929: p4_error: Child process exited while making connection to remote process on cl003: 0
-#p0_15929: (6.230469) net_send: could not write to fd=5, errno = 32
-#
-# COM="/usr/local/mpich.pgi.64/bin/mpirun -machinefile /home/dguptill/douar/machinefile -np ${PROCS} ${BIN}"
+# MPICH wants the input file on the command line.
COM="/usr/local/mpich.pgi.64/bin/mpirun -arch LINUX -machinefile /home/dguptill/douar/machinefile -np ${PROCS} ${BIN} /home/dguptill/douar/input.txt"
echo "COM is <${COM}>"
diff --git a/scanfile.f90 b/scanfile.f90
index b3a4d0d0..77bf477a 100644
--- a/scanfile.f90
+++ b/scanfile.f90
@@ -50,9 +50,8 @@ call mpi_comm_size (mpi_comm_world,nproc,ierr)
call mpi_comm_rank (mpi_comm_world,iproc,ierr)
ires=0
-
open (7,file=fnme(1:len_trim(fnme)),status='old',iostat=ios)
-if (ios/=0) write(*,*) 'pb opening input.txt in iscanfile'
+if (ios/=0) write(*,*) 'pb opening <',fname,'> in iscanfile'
111 continue
@@ -118,7 +117,7 @@ call mpi_comm_rank (mpi_comm_world,iproc,ierr)
ires=0
open (7,file=fnme(1:len_trim(fnme)),status='old',iostat=ios)
-if (ios/=0) write(*,*) 'pb opening input.txt in iscanfile'
+if (ios/=0) write(*,*) 'pb opening <',fnme(1:len_trim(fnme)),'> in dscanfile'
111 continue
@@ -183,7 +182,7 @@ call mpi_comm_rank (mpi_comm_world,iproc,ierr)
ires=0
open (7,file=fnme(1:len_trim(fnme)),status='old',iostat=ios)
-if (ios/=0) write(*,*) 'pb opening input.txt in iscanfile'
+if (ios/=0) write(*,*) 'pb opening <',fnme(1:len_trim(fnme)),'> in cscanfile'
111 continue
--
GitLab