From 28a209ab1527ab750874ee530eb3897898c0f9b8 Mon Sep 17 00:00:00 2001
From: giannozz <giannozz@c92efa57-630b-4861-b058-cf58834340f0>
Date: Sun, 29 Sep 2013 14:37:23 +0000
Subject: [PATCH] xctest.f90 now compiles again (but it doesn't link, since
 some needed routines are in CPV/)

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@10499 c92efa57-630b-4861-b058-cf58834340f0
---
 PP/src/make.depend |  3 ++-
 PP/src/xctest.f90  | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/PP/src/make.depend b/PP/src/make.depend
index 74f71bfcd..91632320f 100644
--- a/PP/src/make.depend
+++ b/PP/src/make.depend
@@ -665,8 +665,9 @@ write_proj.o : ../../PW/src/atomic_wfc_mod.o
 write_proj.o : ../../PW/src/pwcom.o
 write_proj.o : ../../iotk/src/iotk_module.o
 xctest.o : ../../Modules/funct.o
+xctest.o : ../../Modules/io_global.o
 xctest.o : ../../Modules/kind.o
-xctest.o : ../../Modules/mp.o
+xctest.o : ../../Modules/mp_global.o
 xk_et_collect.o : ../../Modules/kind.o
 xk_et_collect.o : ../../Modules/mp.o
 xk_et_collect.o : ../../Modules/mp_global.o
diff --git a/PP/src/xctest.f90 b/PP/src/xctest.f90
index 23f393caa..61d299207 100644
--- a/PP/src/xctest.f90
+++ b/PP/src/xctest.f90
@@ -6,7 +6,8 @@
 ! or http://www.gnu.org/copyleft/gpl.txt .
 !
 PROGRAM xctest
-  USE mp, ONLY: mp_start, mp_end
+  USE mp_global, ONLY: mp_startup, mp_global_end
+  USE io_global, ONLY: ionode
   USE kinds, ONLY: DP
   USE funct, ONLY: set_dft_from_indices
   IMPLICIT NONE
@@ -14,17 +15,18 @@ PROGRAM xctest
   INTEGER :: nspin = 2
   real(DP), ALLOCATABLE :: rhor( :, : )
   real(DP), ALLOCATABLE :: grhor( :, :, : )
-  INTEGER :: iexch,icorr,igcx,igcc
-  INTEGER :: nproc, mpime, gid
+  INTEGER :: iexch,icorr,igcx,igcc,inlc
+  INTEGER :: nproc, mpime
 
-  CALL mp_start(nproc, mpime, gid)
+  CALL mp_startup( )
 
-  if ( mpime == 0 ) then
+  if ( ionode ) then
   iexch=1
   icorr=3
   igcx=1
   igcc=3
-  CALL set_dft_from_indices(iexch,icorr,igcx,igcc)
+  inlc=0
+  CALL set_dft_from_indices(iexch,icorr,igcx,igcc,inlc)
 
   OPEN(unit=17,form='unformatted',status='old')
   READ(17) nnr, nspin
@@ -38,7 +40,7 @@ PROGRAM xctest
   CALL test_xc( nnr, nspin, rhor, grhor )
 
   end if
-  CALL mp_end()
+  CALL mp_global_end()
 END PROGRAM xctest
 
 SUBROUTINE test_gcxc( nnr, nspin, rhor, grhor )