mirror of https://gitlab.com/QEF/q-e.git
Yet another line continuation problem in bp_c_phase.f90 (with ifc)
DEC __QSW TRU64 => __ALPHA for Alpha machines (with OSF/Tru64 or whatever it is called now: any Alpha Linux around?) git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@232 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
parent
004396bb4a
commit
6dc987f2fe
|
@ -62,7 +62,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
#if defined __SGI64 || defined __COMPAQ || defined __TRU64
|
||||
#if defined __SGI64 || defined __ALPHA
|
||||
|
||||
INTEGER, PARAMETER :: ipt = 8
|
||||
|
||||
|
|
|
@ -777,7 +777,7 @@ SUBROUTINE c_phase
|
|||
& /,8X,'of the reciprocal lattice gives the following contribution to', &
|
||||
& /,8X,'the polarization vector (in different units, and being Omega', &
|
||||
& /,8X,'the volume of the unit cell):')") &
|
||||
& gdir
|
||||
gdir
|
||||
! --- Calculate direction of polarization and modulus of lattice vector ---
|
||||
rmod=SQRT(at(1,gdir)*at(1,gdir)+at(2,gdir)*at(2,gdir) &
|
||||
+at(3,gdir)*at(3,gdir))
|
||||
|
|
|
@ -200,11 +200,6 @@ end subroutine cft3s
|
|||
#else
|
||||
|
||||
# define NOPENCILS
|
||||
# ifdef DEC
|
||||
# ifdef DXML
|
||||
# define NOPENCILS
|
||||
# endif
|
||||
# endif
|
||||
|
||||
#if defined __HPM
|
||||
# include "/cineca/prod/hpm/include/f_hpm.h"
|
||||
|
|
|
@ -531,7 +531,6 @@ subroutine cft_3 (f, n1, n2, n3, nx1, nx2, nx3, igrid, sign)
|
|||
|
||||
end subroutine cft_3
|
||||
#endif
|
||||
#ifdef DEC
|
||||
#ifdef DXML
|
||||
#define PRESENT
|
||||
!----------------------------------------------------------------------
|
||||
|
@ -603,7 +602,6 @@ subroutine cft_3 (f, n1, n2, n3, nm1, nm2, nm3, igrid, sign)
|
|||
|
||||
end subroutine cft_3
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef FUJ64
|
||||
#define PRESENT
|
||||
|
|
|
@ -210,7 +210,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
#if defined __TRU64
|
||||
#if defined __ALPHA
|
||||
|
||||
# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_
|
||||
# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_
|
||||
|
@ -250,7 +250,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
#if defined __QSW && defined __LINUX
|
||||
#if defined __ALPHA && defined __LINUX
|
||||
|
||||
# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_
|
||||
# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
void MEMSTAT(int *me)
|
||||
{
|
||||
#if defined __QSW
|
||||
#if defined __ALPHA
|
||||
/* printf("\n MEMORY STATISTICS FROM PE(%d) : \n",*me); */
|
||||
#endif
|
||||
#if defined __LINUX
|
||||
|
|
|
@ -14,7 +14,7 @@ function scnds ()
|
|||
implicit none
|
||||
real(kind=DP) :: scnds
|
||||
!
|
||||
#if defined(__PGI) || defined(DEC)
|
||||
#if defined(__PGI) || defined(__ALPHA)
|
||||
real(kind=4) :: etime, tarry(2)
|
||||
! etime: system function, returns the CPU time in sec.
|
||||
! PGI compiler has no intrinsic f90 cpu_time
|
||||
|
@ -25,7 +25,7 @@ function scnds ()
|
|||
logical :: first=.true.
|
||||
save first, t0
|
||||
!
|
||||
#if defined(__PGI) || defined (DEC)
|
||||
#if defined(__PGI) || defined (__ALPHA)
|
||||
t1 = etime( tarry )
|
||||
#elif defined(HITACHI)
|
||||
call CLOCK(IT,2)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# define C_POINTER integer
|
||||
#endif
|
||||
|
||||
#if defined (FUJ64)|| defined (DEC) || defined (__SX6)
|
||||
#if defined (FUJ64)|| defined (__ALPHA) || defined (__SX6)
|
||||
# define C_POINTER integer*8
|
||||
#endif
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
|||
|
||||
#if defined(__SX4)
|
||||
# define DIRECT_IO_FACTOR 1
|
||||
#elif defined(DEC)
|
||||
#elif defined(__ALPHA)
|
||||
# define DIRECT_IO_FACTOR 2
|
||||
#else
|
||||
# define DIRECT_IO_FACTOR 8
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
__SGI all sgi machines
|
||||
__SGI64 64-bit mode for sgi machines
|
||||
__ORIGIN sgi origin 2k or 3k machines
|
||||
DEC compaq (formerly dec) alphas
|
||||
__ALPHA hp-compaq (formerly dec) alphas
|
||||
__SX4 nec sx-4/5 vector machines (obsolete)
|
||||
__SX6 nec sx-6 vector machines
|
||||
CRAYY cray vector machines (obsolete)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Use fft routines from the dxml or cxml library:
|
||||
|
||||
# CPPFLAGS = -DDEC -D__QSW -D__TRU64 -DDXML -I$(OSHOME)/include
|
||||
# CPPFLAGS = -D__ALPHA -DDXML -I$(OSHOME)/include
|
||||
|
||||
# Use precompiled fftw library (version <= 2.1.5, NOT v.3!)
|
||||
#
|
||||
|
@ -13,12 +13,12 @@
|
|||
# and the path to the fftw.h include file (FFTW_INC_DIR). Example:
|
||||
# FFTW_LIB= -L/usr/local/src/fftw-2.1.3/fftw/.libs -lfftw
|
||||
# FFTW_INC_DIR=/usr/local/src/fftw-2.1.3/fftw
|
||||
# CPPFLAGS = -DDEC -D__QSW -D__TRU64 -D__FFTW -I$(OSHOME)/include \
|
||||
# CPPFLAGS = -D__ALPHA -D__FFTW -I$(OSHOME)/include \
|
||||
# -I$(FFTW_INC_DIR)
|
||||
|
||||
# Use the local copy of fftw
|
||||
#
|
||||
CPPFLAGS = -DDEC -D__QSW -D__TRU64 -D__FFTW -D__USE_INTERNAL_FFTW \
|
||||
CPPFLAGS = -D__ALPHA -D__FFTW -D__USE_INTERNAL_FFTW \
|
||||
-I$(OSHOME)/include -I./
|
||||
|
||||
#
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Use fft routines from the dxml or cxml library:
|
||||
|
||||
# CPPFLAGS = -DDEC -D__QSW -D__TRU64 -D__PARA -D__MPI -DDXML -I$(OSHOME)/include
|
||||
# CPPFLAGS = -D__ALPHA -D__PARA -D__MPI -DDXML -I$(OSHOME)/include
|
||||
|
||||
# Use precompiled fftw library (version <= 2.1.5, NOT v.3!)
|
||||
#
|
||||
|
@ -13,13 +13,13 @@
|
|||
# and the path to the fftw.h include file (FFTW_INC_DIR). Example:
|
||||
# FFTW_LIB=-L/usr/local/src/fftw-2.1.3/fftw/.libs -lfftw
|
||||
# FFTW_INC_DIR=/usr/local/src/fftw-2.1.3/fftw
|
||||
# CPPFLAGS = -DDEC -D__QSW -D__TRU64 -D__PARA -D__MPI -D__FFTW \
|
||||
# CPPFLAGS = -D__ALPHA -D__PARA -D__MPI -D__FFTW \
|
||||
# -I$(OSHOME)/include -I$(FFTW_INC_DIR)
|
||||
|
||||
# Use the local copy of fftw
|
||||
#
|
||||
CPPFLAGS = -DDEC -D__QSW -D__TRU64 -D__PARA -D__MPI -D__FFTW \
|
||||
-D__USE_INTERNAL_FFTW -I$(OSHOME)/include -I./
|
||||
CPPFLAGS = -D__ALPHA -D__PARA -D__MPI -D__FFTW -D__USE_INTERNAL_FFTW \
|
||||
-I$(OSHOME)/include -I./
|
||||
|
||||
#
|
||||
# Fortran compiler:
|
||||
|
|
Loading…
Reference in New Issue