reworked c97864e17c

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

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

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
 

src/fft/pfftwrap/nwfft3d.fh

@@ -0,0 +1,3 @@
+        integer util_mpicommsize,util_mpicommrank
+        external util_mpicommsize,util_mpicommrank
+