Skip to content

GitLab

IffGit has a new shared runner for building Docker images in GitLab CI. Visit https://iffgit.fz-juelich.de/examples/ci-docker-in-docker for more details.

Commit 95185571 authored by Daniel Wortmann's avatar Daniel Wortmann
Browse files

Bugfixes for juqueen & MPI version

parent 8af7d700
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 35 deletions
diagonalization/chani.F90
View file @ 95185571
......@@ -35,6 +35,7 @@ CONTAINS
USE m_juDFT
USE m_types
USE m_subredist1
USE m_subredist2
IMPLICIT NONE
INCLUDE 'mpif.h'
......@@ -74,7 +75,7 @@ CONTAINS
REAL, ALLOCATABLE :: asca_r(:,:), bsca_r(:,:),work2_r(:)
COMPLEX, ALLOCATABLE :: asca_c(:,:), bsca_c(:,:),work2_c(:)
EXTERNAL subredist2, iceil, numroc
EXTERNAL iceil, numroc
EXTERNAL CPP_LAPACK_slamch, descinit
EXTERNAL blacs_pinfo, blacs_gridinit
EXTERNAL MPI_COMM_DUP
......@@ -426,7 +427,7 @@ endif
if (hamovlp%l_real) THEN
CALL subredist2(m,num2,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb,zmat%z_r,eigvec_r)
ELSE
CALL subredist2(m,num2,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb,zmat%z_c,eigvec_c)
CALL subredist2(m,num2,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb,achi_c=zmat%z_c,asca_c=eigvec_c)
end if
!
!DEALLOCATE ( eigvec)
......
diagonalization/eigen_diag.F90
View file @ 95185571
......@@ -162,7 +162,11 @@ CONTAINS
SELECT CASE (priv_select_solver(parallel))
#ifdef CPP_ELPA
CASE (diag_elpa)
CALL elpa(lapw%nmat,n,SUB_COMM,eig,ne_found,hamOvlp%a_r,hamOvlp%b_r,zMat%z_r,hamOvlp%a_c,hamOvlp%b_c,zMat%z_c)
IF (hamovlp%l_real) THEN
CALL elpa(lapw%nmat,n,SUB_COMM,hamOvlp%a_r,hamOvlp%b_r,zMat%z_r,eig,ne_found)
ELSE
CALL elpa(lapw%nmat,n,SUB_COMM,hamOvlp%a_c,hamOvlp%b_c,zMat%z_c,eig,ne_found)
ENDIF
#endif
#ifdef CPP_ELEMENTAL
CASE (diag_elemental)
......
diagonalization/elpa.F90
View file @ 95185571
......@@ -26,6 +26,7 @@ CONTAINS
#define CPP_ONE 1.0
#define CPP_ZERO 0.0
#define CPP_mult mult_at_b_real
#define CPP_REAL
SUBROUTINE elpa_r(m,n, SUB_COMM, a,b, z,eig,num)
!
!----------------------------------------------------
......@@ -61,7 +62,7 @@ CONTAINS
#define CPP_ONE cmplx(1.,0.)
#define CPP_ZERO cmplx(0.,0.)
#define CPP_mult mult_ah_b_complex
#undef CPP_REAL
SUBROUTINE elpa_c(m,n, SUB_COMM, a,b, z,eig,num)
!
!----------------------------------------------------
......
diagonalization/elpa_cpp.F90
View file @ 95185571
......@@ -5,6 +5,8 @@
!--------------------------------------------------------------------------------
USE m_juDFT
USE elpa1
USE m_subredist1
USE m_subredist2
#ifdef CPP_ELPA2
USE elpa2
#endif
......@@ -19,9 +21,6 @@
CPP_REALCOMPLEX, INTENT (OUT) :: z(:,:)
!
#include "elpa_cpp.F90"
END SUBROUTINE elpa_r
!... Local variables
!
INTEGER :: sc_desc(9) !SCALAPACK DESCRIPTOR
......@@ -56,9 +55,13 @@
! block-size nb
!
!print *,"Before subredist"
CALL subredist1(a,m,asca,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb )
CALL subredist1(b,m,bsca,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb )
#ifdef CPP_REAL
CALL subredist1(m,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb, achi_r=a, asca_r=asca )
CALL subredist1(m,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb, achi_r=b, asca_r=bsca)
#else
CALL subredist1(m,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb, achi_c=a, asca_c=asca )
CALL subredist1(m,myrowssca,SUB_COMM, nprow, npcol, myid, ierr, nb, achi_c=b, asca_c=bsca)
#endif
! for saving memory one might deallocate(a,b)
!print *,"Before Allocate"
ALLOCATE ( eig2(m), stat=err ) ! The eigenvalue array for ScaLAPACK
......@@ -181,7 +184,11 @@
! Redistribute eigvec from ScaLAPACK distribution to each process
! having all eigenvectors corresponding to his eigenvalues as above
!
CALL subredist2(z,m,num2,asca,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb)
#ifdef CPP_REAL
CALL subredist2(m,num2,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb,z,asca)
#else
CALL subredist2(m,num2,myrowssca,SUB_COMM,nprow,npcol, myid,ierr,nb,achi_c=z,asca_c=asca)
#endif
!
DEALLOCATE ( asca )
......
diagonalization/ssubredist1.F90
View file @ 95185571
......@@ -31,9 +31,9 @@ SUBROUTINE subredist1(n,lda,SUB_COMM,nprow,npcol,iam,ierr,nb,achi_r,asca_r,achi_
!
! Parameters, I/O channel numbers
REAL,OPTIONAL :: achi_r(:) ! Input, matrix in chani-distribution
REAL,OPTIONAL :: asca_r(lda,*) ! Output, matrix in ScaLAPACK distribution
COMPLEX,OPTIONAL :: achi_c(*) ! Input, matrix in chani-distribution
COMPLEX,OPTIONAL :: asca_c(lda,*) ! Output, matrix in ScaLAPACK distribution
REAL,OPTIONAL :: asca_r(:,:)!(lda,*) ! Output, matrix in ScaLAPACK distribution
COMPLEX,OPTIONAL :: achi_c(:) ! Input, matrix in chani-distribution
COMPLEX,OPTIONAL :: asca_c(:,:)!(lda,*) ! Output, matrix in ScaLAPACK distribution
! Matrix might be real or complex
INTEGER :: n,lda ! Global matrix size, local leading dimension of asca
......@@ -668,4 +668,4 @@ SUBROUTINE subredist1(n,lda,SUB_COMM,nprow,npcol,iam,ierr,nb,achi_r,asca_r,achi_
DEALLOCATE(icommcol)
RETURN
END SUBROUTINE subredist1
END
\ No newline at end of file
END
diagonalization/ssubredist2.F90
View file @ 95185571
MODULE m_subredist2
CONTAINS
!--------------------------------------------------------------------------------
! Copyright (c) 2016 Peter Grünberg Institut, Forschungszentrum Jülich, Germany
! This file is part of FLEUR and available as free software under the conditions
......@@ -516,3 +518,4 @@ SUBROUTINE subredist2(n,m,lda,SUB_COMM,nprow,npcol,&
DEALLOCATE(icommcol)
RETURN
END SUBROUTINE subredist2
END
inpgen/crystal.f
View file @ 95185571
......@@ -60,8 +60,8 @@
INTEGER, PARAMETER :: neig12=12
!===> Local Variables
LOGICAL lerr,err_setup,invsym,inversionOp
INTEGER i,j,k,n,m,na,nt,mdet,mtr,nop0,fh
LOGICAL lerr,err_setup,invsym
INTEGER i,j,k,n,m,na,nt,mdet,mtr,nop0,fh,inversionOp
REAL t,volume,eps7,eps12
INTEGER optype(nop48)
......
vgen/vdW.F90
View file @ 95185571
......@@ -89,20 +89,20 @@
! transform. At the moment it is designed to use fftw3.
SUBROUTINE inplfft( fftin, idir )
USE m_juDFT
USE param, ONLY: jnlout
USE nonlocal_data,ONLY: nx,ny,nz,n_grid
implicit none
include 'fftw3.f' ! some definitions for fftw3
complex, intent(inout) :: fftin(n_grid)
integer :: idir
integer*8 :: plan
#ifdef CPP_FFTW
include 'fftw3.f' ! some definitions for fftw3
if ( idir == -1 ) then
......@@ -125,6 +125,9 @@
STOP 'Error in FFT'
endif
#else
CALL judft_error("VdW functionals only available if compiled with CPP_FFTW")
#endif
END SUBROUTINE inplfft
!
END MODULE driver_fft
......@@ -203,30 +206,30 @@
! we also need LDA correlation per particle so I repeat here the formulas from calc_q0
sqrt_r_s = dsqrt(r_s)
sqrt_r_s = sqrt(r_s)
LDA_dummy_1 = (8.0*pi/3.0)*A*(1.0+ alpha_1*r_s)
LDA_dummy_2 = 2.0*A*(beta_1*sqrt_r_s + beta_2*r_s + &
beta_3*sqrt_r_s*r_s + beta_4*r_s*r_s)
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*dlog(1.0+1.0/LDA_dummy_2)
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*log(1.0+1.0/LDA_dummy_2)
! now start calculation of PBE correlation. first check wether density is very small (approx
! zero) or negative which is also not correct
!
k_F = (3.0*pi*pi*n(i1))**(1.0/3.0)
k_s = dsqrt( 4.0 * k_F / pi)
k_s = sqrt( 4.0 * k_F / pi)
grad_n_squ = grad_n(i1,1)**2 + grad_n(i1,2)**2 + grad_n(i1,3)**2
t = dsqrt(grad_n_squ)/(2.0*phi_zeta*k_s*n(i1))
t = sqrt(grad_n_squ)/(2.0*phi_zeta*k_s*n(i1))
AA = (beta_H/gamma_H)* &
(1.0/(dexp(-1.0*eLDA_c/(gamma_H*phi_zeta**3))- 1.0 ))
(1.0/(exp(-1.0*eLDA_c/(gamma_H*phi_zeta**3))- 1.0 ))
H = gamma_H*phi_zeta**3 * &
dlog(1.0+ &
log(1.0+ &
(beta_H/gamma_H)*(t**2)* &
(1.0+AA*t**2)/(1.0+AA*t**2+AA**2 * t**4))
!
......@@ -289,7 +292,7 @@
!
k_F = (3.0*pi*pi*n(i1))**(1.0/3.0)
!
sqrt_grad_n = dsqrt(grad_n(i1,1)**2 + grad_n(i1,2)**2 + grad_n(i1,3)**2)
sqrt_grad_n = sqrt(grad_n(i1,1)**2 + grad_n(i1,2)**2 + grad_n(i1,3)**2)
!
ss=sqrt_grad_n/(2.0*k_F*n(i1))
!
......@@ -1034,7 +1037,7 @@
beta_3*sqrt_r_s*r_s + beta_4*r_s*r_s)
eLDA_x = (-3.0/(4.0*pi))*k_F
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*dlog(1.0+1.0/LDA_dummy_2)
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*log(1.0+1.0/LDA_dummy_2)
!
! LDA correlation energy density is epsilon_c[n(r)]*n(r)
!
......@@ -1053,7 +1056,7 @@
enddo
q_0(i) = q_cut*(1.0 - dexp(-sum_m))
q_0(i) = q_cut*(1.0 - exp(-sum_m))
enddo
......@@ -1131,7 +1134,7 @@
ind = G_ind(i)
k = dsqrt(dble( G(i,1)**2 + G(i,2)**2 + G(i,3)**2))
k = sqrt(dble( G(i,1)**2 + G(i,2)**2 + G(i,3)**2))
call interpolate_kernel(k, phi_k)
......@@ -1472,7 +1475,7 @@
beta_3*sqrt_r_s*r_s + beta_4*r_s*r_s)
eLDA_x = (-3.0/(4.0*pi))*k_F
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*dlog(1.0+1.0/LDA_dummy_2)
eLDA_c = (-3.0/(4.0*pi))*LDA_dummy_1*log(1.0+1.0/LDA_dummy_2)
q = (1.0 + ( eLDA_c / eLDA_x) - (Zab/9.0)*grad_n_squ &
/(4.0*(n(i)**2.0)*(k_F**2.0)))*k_F
......@@ -1490,7 +1493,7 @@
enddo
dq0_dq = dq0_dq * dexp(-sum_m)
dq0_dq = dq0_dq * exp(-sum_m)
! here we calculate the derivatives needed for the potential later. i.e. we calculate
! n*dq0/dn and n*dq0/dgrad_n so that we do not have to divide by n which might be very
......@@ -1499,13 +1502,13 @@
dq0_dn(i) = dq0_dq * ( k_F/3.0 &
+ k_F*7.0/3.0*(Zab/9.0)*grad_n_squ &
/(4.0*(n(i)**2.0)*(k_F**2.0)) &
- (8.0*pi/9.0)*A*alpha_1*r_s*dlog(1.0+1.0/LDA_dummy_2) &
- (8.0*pi/9.0)*A*alpha_1*r_s*log(1.0+1.0/LDA_dummy_2) &
+ LDA_dummy_1/(LDA_dummy_2*(1.0 + LDA_dummy_2)) &
* (2.0*A*(beta_1/6.0*sqrt_r_s + beta_2/3.0*r_s &
+ beta_3/2.0*r_s*sqrt_r_s + 2.0*beta_4/3.0*r_s**2)))
dq0_dgrad_n(i) = dq0_dq * 2.0 * (-1.0*Zab/9.0) &
* dsqrt(grad_n_squ) / (4.0*n(i)*k_F)
* sqrt(grad_n_squ) / (4.0*n(i)*k_F)
enddo
......@@ -1618,7 +1621,7 @@
! the following sum we need for h_j which will be fourier transformed later. The IF
! condition excludes the contributions of high q values.
grad_n_abs = dsqrt(grad_n(i,1)**2.0 + grad_n(i,2)**2.0 + grad_n(i,3)**2.0)
grad_n_abs = sqrt(grad_n(i,1)**2.0 + grad_n(i,2)**2.0 + grad_n(i,3)**2.0)
if ( q_0(i) .ne. q_cut ) then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment