More T3E glitches: getarg must be preprocessed

|| instead of | in clib/cp.h


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@985 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2004-06-21 14:13:24 +00:00
parent 85ce938f79
commit 45760a7a5f
9 changed files with 12 additions and 8 deletions

View File

@ -10,6 +10,7 @@
subroutine cg_readin
!-----------------------------------------------------------------------
!
#include "machine.h"
USE ions_base, ONLY : nat
use pwcom
use cgcom
@ -130,7 +131,6 @@ end subroutine cg_readin
subroutine cg_readmodes(iunit)
!-----------------------------------------------------------------------
!
#include "machine.h"
USE ions_base, ONLY : nat
USE kinds, only: DP
use pwcom

View File

@ -8,6 +8,7 @@
!-----------------------------------------------------------------------
program bands
!-----------------------------------------------------------------------
#include "machine.h"
use io_files, only: nd_nmbr, prefix, tmp_dir
#ifdef __PARA
use para, only: me, npool
@ -97,7 +98,6 @@ subroutine punch_band (filband)
! method works in many, but not in all the cases.
!
!
#include "machine.h"
#ifdef __PARA
use para, only: me
#endif

View File

@ -29,6 +29,7 @@ program dos
! if degauss1, ngauss1 are specified they override what is
! specified in the input file wrt summation method
!
#include "machine.h"
USE io_global, ONLY : stdout, ionode_id
USE io_files, ONLY : nd_nmbr, prefix, tmp_dir
USE kinds, ONLY : DP

View File

@ -1,5 +1,6 @@
program read_bands
#include "machine.h"
USE io_global, ONLY : stdout

View File

@ -16,6 +16,7 @@ program postproc
!
! DESCRIPTION of the INPUT: see file pwdocs/INPUT_PP
!
#include "machine.h"
USE kinds, ONLY: DP
USE cell_base, ONLY: bg
USE ions_base, ONLY: nat, ntyp=>nsp, ityp, tau

View File

@ -24,6 +24,7 @@ program projwfc
! DeltaE ...in steps of DeltaE (eV, default: 0.01)
! smoothing gaussian broadening (eV, default: DeltaE)
!
#include "machine.h"
USE io_global, ONLY : stdout
USE kinds, only : DP
use io_files, only : nd_nmbr, prefix, tmp_dir
@ -121,7 +122,6 @@ end program projwfc
subroutine projwave (io_choice,Emin, Emax, DeltaE, smoothing)
!-----------------------------------------------------------------------
!
#include "machine.h"
USE io_global, ONLY : stdout
use atom
USE ions_base, ONLY : nat, ityp, atm, ntyp => nsp

View File

@ -543,10 +543,10 @@ SUBROUTINE c_phase
ENDDO
! --- Calculate matrix determinant ---
CALL zgefa(mat,nbnd,nbnd,ivpt,info)
CALL ZGEFA(mat,nbnd,nbnd,ivpt,info)
CALL errore('c_phase','error in zgefa',abs(info))
job=10
CALL zgedi(mat,nbnd,nbnd,ivpt,cdet,cdwork,job)
CALL ZGEDI(mat,nbnd,nbnd,ivpt,cdet,cdwork,job)
det=cdet(1)*10.d0**cdet(2)
! --- Multiply by the already calculated determinants ---

View File

@ -7,7 +7,7 @@
*/
#if defined __T3E | defined __ABSOFT
#if defined __T3E || defined __ABSOFT
# define FFTW_INPLACE_DRV_1D FFTW_INPLACE_DRV_1D
# define FFTW_INPLACE_DRV_2D FFTW_INPLACE_DRV_2D
@ -34,7 +34,7 @@
#endif
#if defined __SGI | defined __FUJITSU | defined __SX4 | defined __INTEL | defined __LAHEY | defined __SX6 | defined SUN | defined __ALTIX
#if defined __SGI || defined __FUJITSU || defined __SX4 || defined __INTEL || defined __LAHEY || defined __SX6 || defined SUN || defined __ALTIX
# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_
# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_
@ -158,7 +158,7 @@
#endif
#if defined __AIX | defined __HP
#if defined __AIX || defined __HP
# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d
# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d

View File

@ -56,6 +56,7 @@ program matdyn
! For low-symmetry crystals, specify twice q = 0 in the list
! if you want to have q = 0 results for two different directions
!
#include "machine.h"
implicit none
!
! variables *_blk refer to the original cell, other variables