diff --git a/src/fft/pfft1.0/pfft/wrkspc2.F b/src/fft/pfft1.0/pfft/wrkspc2.F index 285a148f18..0f544b2b13 100644 --- a/src/fft/pfft1.0/pfft/wrkspc2.F +++ b/src/fft/pfft1.0/pfft/wrkspc2.F @@ -56,17 +56,21 @@ c integer nelebk INTEGER NAPROC, ME, N1MAX, N2MAX, I INTEGER LSTCNT - integer max - INTEGER MXNPRC, MXMYND integer m2, mmax,nmax, iii, nele - intrinsic max c EXTERNAL LSTCNT +#ifdef PEIGS EXTERNAL MXNPRC, MXMYND -*----------------------------------------------------------------------- -c + INTEGER MXNPRC, MXMYND NAPROC = MXNPRC() ME = MXMYND() +#else + integer util_mpicommsize,util_mpicommrank + external util_mpicommsize,util_mpicommrank + naproc=util_mpicommsize() + me=util_mpicommrank() +#endif + INFO = 0 c c computes the large number of panels that is stored on map1(1:n3) and diff --git a/src/fft/pfftwrap/iessl.F b/src/fft/pfftwrap/iessl.F index 2bd104a900..5b7d41c681 100644 --- a/src/fft/pfftwrap/iessl.F +++ b/src/fft/pfftwrap/iessl.F @@ -7,12 +7,13 @@ c************************************************************************ #include "errquit.fh" INTEGER icontext integer nprow, npcol, myrow, mycol - integer nnodes, nodeid, nproc, me +#include "nwfft3d.fh" + integer nproc, me integer icontext1, icontext2 common /xparms/nprow,npcol,myrow,mycol - nproc = nnodes() - me = nodeid() + me = util_mpicommrank() + nproc = util_mpicommsize() nprow = 1 npcol = nproc c obtain system default and map to a row diff --git a/src/fft/pfftwrap/nwfft3d.F b/src/fft/pfftwrap/nwfft3d.F index cbbc23cefb..792572473d 100644 --- a/src/fft/pfftwrap/nwfft3d.F +++ b/src/fft/pfftwrap/nwfft3d.F @@ -68,8 +68,9 @@ c *** local variables c integer isize c parameter (isize=128*128*128) c integer iwork(isize) -c double precision work(isize) - integer nodeid,nnodes,me,nproc +c double precision work(isize) +#include "nwfft3d.fh" + integer me,nproc #ifdef ESSLFFT data iESSL /0/ save iESSL @@ -82,8 +83,12 @@ c double precision work(isize) data computedMap /0/ save computedMap * - me = nodeid() - nproc = nnodes() + me = util_mpicommrank() + nproc = util_mpicommsize() + if(nproc.eq.0) then + write(0,*) ' error me nproc ',me,nproc + call errquit(" error ",0,0) + endif isign=idir if(isign.lt.-1) isign=-1 diff --git a/src/fft/pfftwrap/nwfft3d.fh b/src/fft/pfftwrap/nwfft3d.fh new file mode 100644 index 0000000000..3ebaf5fffd --- /dev/null +++ b/src/fft/pfftwrap/nwfft3d.fh @@ -0,0 +1,3 @@ + integer util_mpicommsize,util_mpicommrank + external util_mpicommsize,util_mpicommrank + \ No newline at end of file