From d4db4fa486531397804e17dd17800215914711ca Mon Sep 17 00:00:00 2001 From: giannozz Date: Thu, 21 Apr 2016 07:44:16 +0000 Subject: [PATCH] Preprocessing option __PARA should not be used. Use __MPI instead. git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@12321 c92efa57-630b-4861-b058-cf58834340f0 --- GWW/bse/bse_main.f90 | 2 +- GWW/bse/plot_excwfn.f90 | 2 +- GWW/bse/read_export.f90 | 2 -- GWW/bse/start_bse.f90 | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/GWW/bse/bse_main.f90 b/GWW/bse/bse_main.f90 index 23d475762..5c30a8fc1 100644 --- a/GWW/bse/bse_main.f90 +++ b/GWW/bse/bse_main.f90 @@ -217,7 +217,7 @@ ENDIF call read_file ! after read_file everything is known -#if defined __PARA +#if defined __MPI kunittmp = kunit #else kunittmp = 1 diff --git a/GWW/bse/plot_excwfn.f90 b/GWW/bse/plot_excwfn.f90 index 19d67e586..354af3263 100644 --- a/GWW/bse/plot_excwfn.f90 +++ b/GWW/bse/plot_excwfn.f90 @@ -65,7 +65,7 @@ v_rh(:)=0.d0 !get the valence wavefunctions at the nxh,nyh,nzh (only one processor has it!) -#ifndef __PARA +#ifndef __MPI nh=(nzh-1)*fc%nrx1t*fc%nrx2t+(nyh-1)*fc%nrx1t+nxh v_rh(:)=vstate_r%wfnrt(nh,:,1) #else diff --git a/GWW/bse/read_export.f90 b/GWW/bse/read_export.f90 index 6aa62b1ca..c4dd67b0a 100644 --- a/GWW/bse/read_export.f90 +++ b/GWW/bse/read_export.f90 @@ -201,9 +201,7 @@ subroutine read_export (pp_file,kunit,uspp_spsi, ascii, single_file, raw) write(stdout,*)"after wfc waves" -#ifdef __PARA call poolrecover (et, nbnd, nkstot, nks) -#endif wfc_scal = 1.0d0 twf0 = .true. diff --git a/GWW/bse/start_bse.f90 b/GWW/bse/start_bse.f90 index 9fc932525..be033ab76 100644 --- a/GWW/bse/start_bse.f90 +++ b/GWW/bse/start_bse.f90 @@ -9,7 +9,7 @@ subroutine start_bse implicit none character(len=9) :: code = 'BSE' ! -#ifdef __PARA +#ifdef __MPI CALL mp_startup ( ) #endif CALL environment_start ( code )