mirror of
https://github.com/pfloos/quack
synced 2024-12-22 20:34:46 +01:00
moved Cx in parameters
This commit is contained in:
parent
bfd5131dae
commit
d0020765fc
@ -2,4 +2,4 @@
|
|||||||
2 1 1 0 0
|
2 1 1 0 0
|
||||||
# Znuc x y z
|
# Znuc x y z
|
||||||
H 0. 0. 0.
|
H 0. 0. 0.
|
||||||
H 0. 0. 2.3
|
H 0. 0. 1.399
|
||||||
|
@ -15,3 +15,7 @@
|
|||||||
double precision,parameter :: pmtoau = 0.0188973d0
|
double precision,parameter :: pmtoau = 0.0188973d0
|
||||||
double precision,parameter :: BoToAn = 0.529177249d0
|
double precision,parameter :: BoToAn = 0.529177249d0
|
||||||
|
|
||||||
|
double precision,parameter :: CxLDA = - (3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
||||||
|
double precision,parameter :: Cx0 = - (4d0/3d0)*(1d0/pi)**(1d0/3d0)
|
||||||
|
double precision,parameter :: Cx1 = - (176d0/105d0)*(1d0/pi)**(1d0/3d0)
|
||||||
|
|
||||||
|
50
input/basis
50
input/basis
@ -1,26 +1,30 @@
|
|||||||
1 8
|
1 6
|
||||||
S 6
|
S 8
|
||||||
1 1264.5857000 0.0019448
|
1 2940.0000000 0.0006800
|
||||||
2 189.9368100 0.0148351
|
2 441.2000000 0.0052360
|
||||||
3 43.1590890 0.0720906
|
3 100.5000000 0.0266060
|
||||||
4 12.0986630 0.2371542
|
4 28.4300000 0.0999930
|
||||||
5 3.8063232 0.4691987
|
5 9.1690000 0.2697020
|
||||||
6 1.2728903 0.3565202
|
6 3.1960000 0.4514690
|
||||||
S 3
|
7 1.1590000 0.2950740
|
||||||
1 3.1964631 -0.1126487
|
8 0.1811000 0.0125870
|
||||||
2 0.7478133 -0.2295064
|
S 8
|
||||||
3 0.2199663 1.1869167
|
1 2940.0000000 -0.0001230
|
||||||
|
2 441.2000000 -0.0009660
|
||||||
|
3 100.5000000 -0.0048310
|
||||||
|
4 28.4300000 -0.0193140
|
||||||
|
5 9.1690000 -0.0532800
|
||||||
|
6 3.1960000 -0.1207230
|
||||||
|
7 1.1590000 -0.1334350
|
||||||
|
8 0.1811000 0.5307670
|
||||||
|
S 1
|
||||||
|
1 0.0589000 1.0000000
|
||||||
P 3
|
P 3
|
||||||
1 3.1964631 0.0559802
|
1 3.6190000 0.0291110
|
||||||
2 0.7478133 0.2615506
|
2 0.7110000 0.1693650
|
||||||
3 0.2199663 0.7939723
|
3 0.1951000 0.5134580
|
||||||
S 1
|
|
||||||
1 0.0823099 1.0000000
|
|
||||||
P 1
|
P 1
|
||||||
1 0.0823099 1.0000000
|
1 0.0601800 1.0000000
|
||||||
S 1
|
|
||||||
1 0.0207000 1.0000000
|
|
||||||
P 1
|
|
||||||
1 0.0207000 1.0000000
|
|
||||||
D 1
|
D 1
|
||||||
1 0.4000000 1.0000000
|
1 0.2380000 1.0000000
|
||||||
|
|
||||||
|
12
input/dft
12
input/dft
@ -2,16 +2,16 @@
|
|||||||
LIM-RKS
|
LIM-RKS
|
||||||
# exchange rung:
|
# exchange rung:
|
||||||
# Hartree = 0
|
# Hartree = 0
|
||||||
# LDA = 1: RS51,S51,RMFL20
|
# LDA = 1: RS51,RMFL20
|
||||||
# GGA = 2: G96,B88
|
# GGA = 2:
|
||||||
# Hybrid = 4
|
# Hybrid = 4
|
||||||
# Hartree-Fock = 666
|
# Hartree-Fock = 666
|
||||||
1 RS51
|
1 RS51
|
||||||
# correlation rung:
|
# correlation rung:
|
||||||
# Hartree = 0
|
# Hartree = 0
|
||||||
# LDA = 1: W38,VWN5,C16,RMFL20
|
# LDA = 1: RVWN5,RMFL20
|
||||||
# GGA = 2: LYP
|
# GGA = 2:
|
||||||
# Hybrid = 4: B3LYP
|
# Hybrid = 4:
|
||||||
# Hartree-Fock = 666
|
# Hartree-Fock = 666
|
||||||
1 RVWN5
|
1 RVWN5
|
||||||
# quadrature grid SG-n
|
# quadrature grid SG-n
|
||||||
@ -21,4 +21,4 @@
|
|||||||
# Ensemble weights: wEns(1),...,wEns(nEns-1)
|
# Ensemble weights: wEns(1),...,wEns(nEns-1)
|
||||||
0.50000 0.00000
|
0.50000 0.00000
|
||||||
# GOK-DFT: maxSCF thresh DIIS n_diis guess_type ortho_type
|
# GOK-DFT: maxSCF thresh DIIS n_diis guess_type ortho_type
|
||||||
64 0.0000001 T 5 1 1
|
32 0.0000001 T 5 1 1
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
# CIS RPA RPAx ppRPA ADC
|
# CIS RPA RPAx ppRPA ADC
|
||||||
F F F F F
|
F F F F F
|
||||||
# GF2 GF3
|
# GF2 GF3
|
||||||
T F
|
F F
|
||||||
# G0W0 evGW qsGW
|
# G0W0 evGW qsGW
|
||||||
F F F
|
|
||||||
# G0T0 evGT qsGT
|
|
||||||
T F F
|
T F F
|
||||||
|
# G0T0 evGT qsGT
|
||||||
|
F F F
|
||||||
# MCMP2
|
# MCMP2
|
||||||
F
|
F
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
# GF: maxSCF thresh DIIS n_diis renormalization
|
# GF: maxSCF thresh DIIS n_diis renormalization
|
||||||
256 0.00001 T 5 3
|
256 0.00001 T 5 3
|
||||||
# GW: maxSCF thresh DIIS n_diis COHSEX SOSEX BSE TDA G0W GW0 lin eta
|
# GW: maxSCF thresh DIIS n_diis COHSEX SOSEX BSE TDA G0W GW0 lin eta
|
||||||
256 0.00001 T 5 F F T F F F F 0.000
|
256 0.00001 T 5 F F T F F F T 0.000
|
||||||
# ACFDT: AC Kx XBS
|
# ACFDT: AC Kx XBS
|
||||||
T F F
|
T F T
|
||||||
# MCMP2: nMC nEq nWalk dt nPrint iSeed doDrift
|
# MCMP2: nMC nEq nWalk dt nPrint iSeed doDrift
|
||||||
1000000 100000 10 0.3 10000 1234 T
|
1000000 100000 10 0.3 10000 1234 T
|
||||||
|
50
input/weight
50
input/weight
@ -1,26 +1,30 @@
|
|||||||
1 8
|
1 6
|
||||||
S 6
|
S 8
|
||||||
1 1264.5857000 0.0019448
|
1 2940.0000000 0.0006800
|
||||||
2 189.9368100 0.0148351
|
2 441.2000000 0.0052360
|
||||||
3 43.1590890 0.0720906
|
3 100.5000000 0.0266060
|
||||||
4 12.0986630 0.2371542
|
4 28.4300000 0.0999930
|
||||||
5 3.8063232 0.4691987
|
5 9.1690000 0.2697020
|
||||||
6 1.2728903 0.3565202
|
6 3.1960000 0.4514690
|
||||||
S 3
|
7 1.1590000 0.2950740
|
||||||
1 3.1964631 -0.1126487
|
8 0.1811000 0.0125870
|
||||||
2 0.7478133 -0.2295064
|
S 8
|
||||||
3 0.2199663 1.1869167
|
1 2940.0000000 -0.0001230
|
||||||
|
2 441.2000000 -0.0009660
|
||||||
|
3 100.5000000 -0.0048310
|
||||||
|
4 28.4300000 -0.0193140
|
||||||
|
5 9.1690000 -0.0532800
|
||||||
|
6 3.1960000 -0.1207230
|
||||||
|
7 1.1590000 -0.1334350
|
||||||
|
8 0.1811000 0.5307670
|
||||||
|
S 1
|
||||||
|
1 0.0589000 1.0000000
|
||||||
P 3
|
P 3
|
||||||
1 3.1964631 0.0559802
|
1 3.6190000 0.0291110
|
||||||
2 0.7478133 0.2615506
|
2 0.7110000 0.1693650
|
||||||
3 0.2199663 0.7939723
|
3 0.1951000 0.5134580
|
||||||
S 1
|
|
||||||
1 0.0823099 1.0000000
|
|
||||||
P 1
|
P 1
|
||||||
1 0.0823099 1.0000000
|
1 0.0601800 1.0000000
|
||||||
S 1
|
|
||||||
1 0.0207000 1.0000000
|
|
||||||
P 1
|
|
||||||
1 0.0207000 1.0000000
|
|
||||||
D 1
|
D 1
|
||||||
1 0.4000000 1.0000000
|
1 0.2380000 1.0000000
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thresh, &
|
subroutine GOK_RKS(restart,x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thresh, &
|
||||||
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,Ew,EwGIC)
|
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,Ew,EwGIC,F)
|
||||||
|
|
||||||
! Perform restricted Kohn-Sham calculation for ensembles
|
! Perform restricted Kohn-Sham calculation for ensembles
|
||||||
|
|
||||||
@ -8,6 +8,7 @@ subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
|
|
||||||
! Input variables
|
! Input variables
|
||||||
|
|
||||||
|
logical,intent(in) :: restart
|
||||||
integer,intent(in) :: x_rung,c_rung
|
integer,intent(in) :: x_rung,c_rung
|
||||||
character(len=12),intent(in) :: x_DFA,c_DFA
|
character(len=12),intent(in) :: x_DFA,c_DFA
|
||||||
integer,intent(in) :: nEns
|
integer,intent(in) :: nEns
|
||||||
@ -29,6 +30,8 @@ subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
double precision,intent(in) :: ERI(nBas,nBas,nBas,nBas)
|
double precision,intent(in) :: ERI(nBas,nBas,nBas,nBas)
|
||||||
double precision,intent(in) :: ENuc
|
double precision,intent(in) :: ENuc
|
||||||
|
|
||||||
|
double precision,intent(inout):: F(nBas,nBas)
|
||||||
|
|
||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: xc_rung
|
integer :: xc_rung
|
||||||
@ -46,7 +49,6 @@ subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
double precision,allocatable :: c(:,:)
|
double precision,allocatable :: c(:,:)
|
||||||
double precision,allocatable :: cp(:,:)
|
double precision,allocatable :: cp(:,:)
|
||||||
double precision,allocatable :: J(:,:)
|
double precision,allocatable :: J(:,:)
|
||||||
double precision,allocatable :: F(:,:)
|
|
||||||
double precision,allocatable :: Fp(:,:)
|
double precision,allocatable :: Fp(:,:)
|
||||||
double precision,allocatable :: Fx(:,:)
|
double precision,allocatable :: Fx(:,:)
|
||||||
double precision,allocatable :: FxHF(:,:)
|
double precision,allocatable :: FxHF(:,:)
|
||||||
@ -118,14 +120,15 @@ subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
! Memory allocation
|
! Memory allocation
|
||||||
|
|
||||||
allocate(eps(nBas),c(nBas,nBas),cp(nBas,nBas), &
|
allocate(eps(nBas),c(nBas,nBas),cp(nBas,nBas), &
|
||||||
J(nBas,nBas),F(nBas,nBas),Fp(nBas,nBas), &
|
J(nBas,nBas),Fp(nBas,nBas),Fx(nBas,nBas), &
|
||||||
Fx(nBas,nBas),FxHF(nBas,nBas),Fc(nBas,nBas),err(nBas,nBas), &
|
FxHF(nBas,nBas),Fc(nBas,nBas),err(nBas,nBas), &
|
||||||
Pw(nBas,nBas),rhow(nGrid),drhow(ncart,nGrid), &
|
Pw(nBas,nBas),rhow(nGrid),drhow(ncart,nGrid), &
|
||||||
err_diis(nBasSq,max_diis),F_diis(nBasSq,max_diis), &
|
err_diis(nBasSq,max_diis),F_diis(nBasSq,max_diis), &
|
||||||
P(nBas,nBas,nEns),rho(nGrid,nEns),drho(ncart,nGrid,nEns))
|
P(nBas,nBas,nEns),rho(nGrid,nEns),drho(ncart,nGrid,nEns))
|
||||||
|
|
||||||
! Guess coefficients and eigenvalues
|
! Guess coefficients and eigenvalues
|
||||||
|
|
||||||
|
if(.not. restart) then
|
||||||
if(guess_type == 1) then
|
if(guess_type == 1) then
|
||||||
|
|
||||||
F(:,:) = Hc(:,:)
|
F(:,:) = Hc(:,:)
|
||||||
@ -135,6 +138,7 @@ subroutine GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
call random_number(F(:,:))
|
call random_number(F(:,:))
|
||||||
|
|
||||||
end if
|
end if
|
||||||
|
end if
|
||||||
|
|
||||||
! Initialization
|
! Initialization
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
subroutine LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thresh, &
|
subroutine LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thresh, &
|
||||||
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc)
|
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,F)
|
||||||
|
|
||||||
! Perform restricted Kohn-Sham calculation for ensembles
|
! Perform restricted Kohn-Sham calculation for ensembles
|
||||||
|
|
||||||
@ -29,6 +29,8 @@ subroutine LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
double precision,intent(in) :: ERI(nBas,nBas,nBas,nBas)
|
double precision,intent(in) :: ERI(nBas,nBas,nBas,nBas)
|
||||||
double precision,intent(in) :: ENuc
|
double precision,intent(in) :: ENuc
|
||||||
|
|
||||||
|
double precision,intent(out) :: F(nBas,nBas)
|
||||||
|
|
||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: iEns
|
integer :: iEns
|
||||||
@ -63,8 +65,8 @@ subroutine LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
write(*,'(A40)') '*************************************************'
|
write(*,'(A40)') '*************************************************'
|
||||||
write(*,*)
|
write(*,*)
|
||||||
|
|
||||||
call GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wLIM,nGrid,weight,maxSCF,thresh, &
|
call GOK_RKS(.false.,x_rung,x_DFA,c_rung,c_DFA,nEns,wLIM,nGrid,weight,maxSCF,thresh, &
|
||||||
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,EwZW,EwGICZW)
|
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,EwZW,EwGICZW,F)
|
||||||
|
|
||||||
!------------------------------------------------------------------------
|
!------------------------------------------------------------------------
|
||||||
! Equiensemble calculation
|
! Equiensemble calculation
|
||||||
@ -82,8 +84,8 @@ subroutine LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns,nGrid,weight,maxSCF,thres
|
|||||||
write(*,'(A40)') '*************************************************'
|
write(*,'(A40)') '*************************************************'
|
||||||
write(*,*)
|
write(*,*)
|
||||||
|
|
||||||
call GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wLIM,nGrid,weight,maxSCF,thresh, &
|
call GOK_RKS(.true.,x_rung,x_DFA,c_rung,c_DFA,nEns,wLIM,nGrid,weight,maxSCF,thresh, &
|
||||||
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,EwEW,EwGICEW)
|
max_diis,guess_type,nBas,AO,dAO,nO,nV,S,T,V,Hc,ERI,X,ENuc,EwEW,EwGICEW,F)
|
||||||
|
|
||||||
!------------------------------------------------------------------------
|
!------------------------------------------------------------------------
|
||||||
! LIM excitation energies
|
! LIM excitation energies
|
||||||
|
@ -26,8 +26,8 @@ subroutine RMFL20_lda_exchange_derivative_discontinuity(nEns,wEns,nGrid,weight,r
|
|||||||
|
|
||||||
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
||||||
|
|
||||||
Cx(1) = -(4d0/3d0)*(1d0/pi)**(1d0/3d0)
|
Cx(1) = Cx0
|
||||||
Cx(2) = -(176d0/105d0)*(1d0/pi)**(1d0/3d0)
|
Cx(2) = Cx1
|
||||||
|
|
||||||
! Compute correlation energy for ground, singly-excited and doubly-excited states
|
! Compute correlation energy for ground, singly-excited and doubly-excited states
|
||||||
|
|
||||||
|
@ -17,9 +17,6 @@ subroutine RMFL20_lda_exchange_energy(nEns,wEns,nGrid,weight,rho,Ex)
|
|||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: iG
|
integer :: iG
|
||||||
double precision :: Cx0
|
|
||||||
double precision :: Cx1
|
|
||||||
double precision :: CxLDA
|
|
||||||
double precision :: Cxw
|
double precision :: Cxw
|
||||||
double precision :: r
|
double precision :: r
|
||||||
|
|
||||||
@ -27,11 +24,7 @@ subroutine RMFL20_lda_exchange_energy(nEns,wEns,nGrid,weight,rho,Ex)
|
|||||||
|
|
||||||
double precision :: Ex
|
double precision :: Ex
|
||||||
|
|
||||||
! Cx coefficient for Slater LDA exchange
|
! Weight-denepdent Cx coefficient
|
||||||
|
|
||||||
Cx0 = - (4d0/3d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
Cx1 = - (176d0/105d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
CxLDA = - (3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
||||||
|
|
||||||
|
@ -17,9 +17,6 @@ subroutine RMFL20_lda_exchange_individual_energy(nEns,wEns,nGrid,weight,rhow,rho
|
|||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: iG
|
integer :: iG
|
||||||
double precision :: Cx0
|
|
||||||
double precision :: Cx1
|
|
||||||
double precision :: CxLDA
|
|
||||||
double precision :: Cxw
|
double precision :: Cxw
|
||||||
double precision :: r,rI
|
double precision :: r,rI
|
||||||
double precision :: e,dedr
|
double precision :: e,dedr
|
||||||
@ -30,10 +27,6 @@ subroutine RMFL20_lda_exchange_individual_energy(nEns,wEns,nGrid,weight,rhow,rho
|
|||||||
|
|
||||||
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
||||||
|
|
||||||
Cx0 = -(4d0/3d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
Cx1 = -(176d0/105d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
CxLDA = -(3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
||||||
|
|
||||||
! Compute LDA exchange matrix in the AO basis
|
! Compute LDA exchange matrix in the AO basis
|
||||||
|
@ -18,9 +18,6 @@ subroutine RMFL20_lda_exchange_potential(nEns,wEns,nGrid,weight,nBas,AO,rho,Fx)
|
|||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: mu,nu,iG
|
integer :: mu,nu,iG
|
||||||
double precision :: Cx0
|
|
||||||
double precision :: Cx1
|
|
||||||
double precision :: CxLDA
|
|
||||||
double precision :: Cxw
|
double precision :: Cxw
|
||||||
double precision :: r,vAO
|
double precision :: r,vAO
|
||||||
|
|
||||||
@ -30,10 +27,6 @@ subroutine RMFL20_lda_exchange_potential(nEns,wEns,nGrid,weight,nBas,AO,rho,Fx)
|
|||||||
|
|
||||||
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
! Weight-dependent Cx coefficient for RMFL20 exchange functional
|
||||||
|
|
||||||
Cx0 = -(4d0/3d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
Cx1 = -(176d0/105d0)*(1d0/pi)**(1d0/3d0)
|
|
||||||
CxLDA = -(3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
Cxw = CxLDA + wEns(2)*(Cx1 - Cx0)
|
||||||
|
|
||||||
! Compute LDA exchange matrix in the AO basis
|
! Compute LDA exchange matrix in the AO basis
|
||||||
|
@ -15,16 +15,11 @@ subroutine RS51_lda_exchange_energy(nGrid,weight,rho,Ex)
|
|||||||
|
|
||||||
integer :: iG
|
integer :: iG
|
||||||
double precision :: r
|
double precision :: r
|
||||||
double precision :: Cx
|
|
||||||
|
|
||||||
! Output variables
|
! Output variables
|
||||||
|
|
||||||
double precision :: Ex
|
double precision :: Ex
|
||||||
|
|
||||||
! Cx coefficient for Slater LDA exchange
|
|
||||||
|
|
||||||
Cx = -(3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
! Compute LDA exchange energy
|
! Compute LDA exchange energy
|
||||||
|
|
||||||
Ex = 0d0
|
Ex = 0d0
|
||||||
@ -34,7 +29,7 @@ subroutine RS51_lda_exchange_energy(nGrid,weight,rho,Ex)
|
|||||||
|
|
||||||
if(r > threshold) then
|
if(r > threshold) then
|
||||||
|
|
||||||
Ex = Ex + weight(iG)*Cx*r**(4d0/3d0)
|
Ex = Ex + weight(iG)*CxLDA*r**(4d0/3d0)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@ subroutine RS51_lda_exchange_individual_energy(nGrid,weight,rhow,rho,Ex)
|
|||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: iG
|
integer :: iG
|
||||||
double precision :: Cx
|
|
||||||
double precision :: r,rI
|
double precision :: r,rI
|
||||||
double precision :: e,dedr
|
double precision :: e,dedr
|
||||||
|
|
||||||
@ -23,10 +22,6 @@ subroutine RS51_lda_exchange_individual_energy(nGrid,weight,rhow,rho,Ex)
|
|||||||
|
|
||||||
double precision,intent(out) :: Ex
|
double precision,intent(out) :: Ex
|
||||||
|
|
||||||
! Cx coefficient for Slater LDA exchange
|
|
||||||
|
|
||||||
Cx = -(3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
! Compute LDA exchange matrix in the AO basis
|
! Compute LDA exchange matrix in the AO basis
|
||||||
|
|
||||||
Ex = 0d0
|
Ex = 0d0
|
||||||
@ -37,8 +32,8 @@ subroutine RS51_lda_exchange_individual_energy(nGrid,weight,rhow,rho,Ex)
|
|||||||
|
|
||||||
if(r > threshold .and. rI > threshold) then
|
if(r > threshold .and. rI > threshold) then
|
||||||
|
|
||||||
e = Cx*r**(1d0/3d0)
|
e = CxLDA*r**(1d0/3d0)
|
||||||
dedr = 1d0/3d0*Cx*r**(-2d0/3d0)
|
dedr = 1d0/3d0*CxLDA*r**(-2d0/3d0)
|
||||||
Ex = Ex + weight(iG)*(e*rI + dedr*r*rI - dedr*r*r)
|
Ex = Ex + weight(iG)*(e*rI + dedr*r*rI - dedr*r*r)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -16,17 +16,12 @@ subroutine RS51_lda_exchange_potential(nGrid,weight,nBas,AO,rho,Fx)
|
|||||||
! Local variables
|
! Local variables
|
||||||
|
|
||||||
integer :: mu,nu,iG
|
integer :: mu,nu,iG
|
||||||
double precision :: Cx
|
|
||||||
double precision :: r,vAO
|
double precision :: r,vAO
|
||||||
|
|
||||||
! Output variables
|
! Output variables
|
||||||
|
|
||||||
double precision,intent(out) :: Fx(nBas,nBas)
|
double precision,intent(out) :: Fx(nBas,nBas)
|
||||||
|
|
||||||
! Cx coefficient for Slater LDA exchange
|
|
||||||
|
|
||||||
Cx = -(3d0/4d0)*(3d0/pi)**(1d0/3d0)
|
|
||||||
|
|
||||||
! Compute LDA exchange matrix in the AO basis
|
! Compute LDA exchange matrix in the AO basis
|
||||||
|
|
||||||
Fx(:,:) = 0d0
|
Fx(:,:) = 0d0
|
||||||
@ -39,7 +34,7 @@ subroutine RS51_lda_exchange_potential(nGrid,weight,nBas,AO,rho,Fx)
|
|||||||
if(r > threshold) then
|
if(r > threshold) then
|
||||||
|
|
||||||
vAO = weight(iG)*AO(mu,iG)*AO(nu,iG)
|
vAO = weight(iG)*AO(mu,iG)*AO(nu,iG)
|
||||||
Fx(mu,nu) = Fx(mu,nu) + vAO*4d0/3d0*Cx*r**(1d0/3d0)
|
Fx(mu,nu) = Fx(mu,nu) + vAO*4d0/3d0*CxLDA*r**(1d0/3d0)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -18,8 +18,13 @@ program eDFT
|
|||||||
double precision,allocatable :: DShell(:,:)
|
double precision,allocatable :: DShell(:,:)
|
||||||
double precision,allocatable :: ExpShell(:,:)
|
double precision,allocatable :: ExpShell(:,:)
|
||||||
|
|
||||||
double precision,allocatable :: S(:,:),T(:,:),V(:,:),Hc(:,:),X(:,:)
|
double precision,allocatable :: S(:,:)
|
||||||
|
double precision,allocatable :: T(:,:)
|
||||||
|
double precision,allocatable :: V(:,:)
|
||||||
|
double precision,allocatable :: Hc(:,:)
|
||||||
|
double precision,allocatable :: X(:,:)
|
||||||
double precision,allocatable :: ERI(:,:,:,:)
|
double precision,allocatable :: ERI(:,:,:,:)
|
||||||
|
double precision,allocatable :: F(:,:)
|
||||||
|
|
||||||
character(len=7) :: method
|
character(len=7) :: method
|
||||||
integer :: x_rung,c_rung
|
integer :: x_rung,c_rung
|
||||||
@ -95,7 +100,8 @@ program eDFT
|
|||||||
|
|
||||||
! Memory allocation for one- and two-electron integrals
|
! Memory allocation for one- and two-electron integrals
|
||||||
|
|
||||||
allocate(S(nBas,nBas),T(nBas,nBas),V(nBas,nBas),Hc(nBas,nBas),X(nBas,nBas),ERI(nBas,nBas,nBas,nBas))
|
allocate(S(nBas,nBas),T(nBas,nBas),V(nBas,nBas),Hc(nBas,nBas), &
|
||||||
|
X(nBas,nBas),ERI(nBas,nBas,nBas,nBas),F(nBas,nBas))
|
||||||
|
|
||||||
! Read integrals
|
! Read integrals
|
||||||
|
|
||||||
@ -137,8 +143,9 @@ program eDFT
|
|||||||
if(method == 'GOK-RKS') then
|
if(method == 'GOK-RKS') then
|
||||||
|
|
||||||
call cpu_time(start_KS)
|
call cpu_time(start_KS)
|
||||||
call GOK_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns(:),nGrid,weight(:),maxSCF,thresh,max_diis,guess_type, &
|
call GOK_RKS(.false.,x_rung,x_DFA,c_rung,c_DFA,nEns,wEns(:),nGrid,weight(:),maxSCF,thresh,max_diis,guess_type, &
|
||||||
nBas,AO(:,:),dAO(:,:,:),nO(1),nV(1),S(:,:),T(:,:),V(:,:),Hc(:,:),ERI(:,:,:,:),X(:,:),ENuc,Ew,EwGIC)
|
nBas,AO(:,:),dAO(:,:,:),nO(1),nV(1),S(:,:),T(:,:),V(:,:),Hc(:,:),ERI(:,:,:,:),X(:,:),ENuc, &
|
||||||
|
Ew,EwGIC,F(:,:))
|
||||||
call cpu_time(end_KS)
|
call cpu_time(end_KS)
|
||||||
|
|
||||||
t_KS = end_KS - start_KS
|
t_KS = end_KS - start_KS
|
||||||
@ -155,7 +162,8 @@ program eDFT
|
|||||||
|
|
||||||
call cpu_time(start_KS)
|
call cpu_time(start_KS)
|
||||||
call LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns(:),nGrid,weight(:),maxSCF,thresh,max_diis,guess_type, &
|
call LIM_RKS(x_rung,x_DFA,c_rung,c_DFA,nEns,wEns(:),nGrid,weight(:),maxSCF,thresh,max_diis,guess_type, &
|
||||||
nBas,AO(:,:),dAO(:,:,:),nO(1),nV(1),S(:,:),T(:,:),V(:,:),Hc(:,:),ERI(:,:,:,:),X(:,:),ENuc)
|
nBas,AO(:,:),dAO(:,:,:),nO(1),nV(1),S(:,:),T(:,:),V(:,:),Hc(:,:),ERI(:,:,:,:),X(:,:),ENuc, &
|
||||||
|
F(:,:))
|
||||||
call cpu_time(end_KS)
|
call cpu_time(end_KS)
|
||||||
|
|
||||||
t_KS = end_KS - start_KS
|
t_KS = end_KS - start_KS
|
||||||
|
@ -21,9 +21,9 @@ subroutine fock_exchange_potential(nBas,P,ERI,Fx)
|
|||||||
! Compute HF exchange matrix
|
! Compute HF exchange matrix
|
||||||
|
|
||||||
Fx(:,:) = 0d0
|
Fx(:,:) = 0d0
|
||||||
do nu=1,nBas
|
|
||||||
do si=1,nBas
|
do si=1,nBas
|
||||||
do la=1,nBas
|
do la=1,nBas
|
||||||
|
do nu=1,nBas
|
||||||
do mu=1,nBas
|
do mu=1,nBas
|
||||||
Fx(mu,nu) = Fx(mu,nu) - P(la,si)*ERI(mu,la,si,nu)
|
Fx(mu,nu) = Fx(mu,nu) - P(la,si)*ERI(mu,la,si,nu)
|
||||||
enddo
|
enddo
|
||||||
|
@ -19,10 +19,10 @@ subroutine hartree_coulomb(nBas,P,ERI,J)
|
|||||||
double precision,intent(out) :: J(nBas,nBas)
|
double precision,intent(out) :: J(nBas,nBas)
|
||||||
|
|
||||||
J = 0d0
|
J = 0d0
|
||||||
do mu=1,nBas
|
|
||||||
do nu=1,nBas
|
|
||||||
do la=1,nBas
|
|
||||||
do si=1,nBas
|
do si=1,nBas
|
||||||
|
do la=1,nBas
|
||||||
|
do nu=1,nBas
|
||||||
|
do mu=1,nBas
|
||||||
J(mu,nu) = J(mu,nu) + P(la,si)*ERI(mu,la,nu,si)
|
J(mu,nu) = J(mu,nu) + P(la,si)*ERI(mu,la,nu,si)
|
||||||
enddo
|
enddo
|
||||||
enddo
|
enddo
|
||||||
|
Loading…
Reference in New Issue
Block a user