Intrinsic AND that some compilers don't like replaced with stanbdard IAND

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@6054 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2009-10-20 10:58:58 +00:00
parent 4fbb7a66c4
commit 7370db21a7
2 changed files with 5 additions and 4 deletions

View File

@ -173,12 +173,14 @@ SUBROUTINE do_cond(nodenumber, done)
#ifdef __PARA
IF (npool > 1) CALL errore('pwcond','pools not implemented',npool)
ik = AND(nproc,nproc-1)
IF (nproc.ne.1.and.ik.ne.0) CALL errore('pwcond','you should use 2^N number of CPUs',1)
ik = IAND ( nproc, nproc-1 )
IF ( nproc /= 1 .AND. ik /= 0 ) &
CALL errore('pwcond','you should use 2^N number of CPUs',1)
#endif
!-- Some check and initialization for plotting the scattering states
IF (lorb.and.ikind.eq.2) call errore('do_cond','lorb not working with ikind = 2',1)
IF ( lorb .AND. ikind == 2 ) &
CALL errore('do_cond','lorb not working with ikind = 2',1)
IF (lorb3d) lorb = .TRUE.
IF (lcharge) lorb = .TRUE.
!--

View File

@ -146,7 +146,6 @@ scat_states_plot.o : ../Modules/mp.o
scat_states_plot.o : ../Modules/mp_global.o
scat_states_plot.o : ../Modules/splinelib.o
scat_states_plot.o : ../Modules/uspp.o
scat_states_plot.o : ../PW/becmod.o
scat_states_plot.o : ../PW/noncol.o
scat_states_plot.o : ../PW/pwcom.o
scat_states_plot.o : ../PW/scf_mod.o