PTEROSOR/QuantumPackage
10
0
Fork 0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-22 20:34:58 +01:00
Code Releases Activity

implemented the f_hf_sparse for open systems in basis set correction

Browse Source
This commit is contained in:
eginer 2024-05-27 10:21:29 +02:00
parent 70745cbeaa
commit 1e886ac128
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dft_utils_func/on_top_from_ueg.irp.f
View File

@ -32,7 +32,6 @@ double precision function g0_UEG_mu_inf(rho_a,rho_b)
C = 0.08193d0 C = 0.08193d0
D = -0.01277d0 D = -0.01277d0
E = 0.001859d0 E = 0.001859d0
x = -d2*rs
if (dabs(rho) > 1.d-20) then if (dabs(rho) > 1.d-20) then
rs = (3d0 / (4d0*pi*rho))**(1d0/3d0) ! JT: serious bug fixed 20/03/19 rs = (3d0 / (4d0*pi*rho))**(1d0/3d0) ! JT: serious bug fixed 20/03/19
x = -d2*rs x = -d2*rs

4
src/mo_two_e_ints/cholesky.irp.f
View File

@ -34,8 +34,10 @@ BEGIN_PROVIDER [ double precision, cholesky_mo_transp, (cholesky_mo_num, mo_num,
END_DOC END_DOC
double precision, allocatable :: X(:,:,:) double precision, allocatable :: X(:,:,:)
double precision :: wall0, wall1
integer :: ierr integer :: ierr
print *, 'AO->MO Transformation of Cholesky vectors' print *, 'AO->MO Transformation of Cholesky vectors'
call wall_time(wall0)
allocate(X(mo_num,cholesky_mo_num,ao_num), stat=ierr) allocate(X(mo_num,cholesky_mo_num,ao_num), stat=ierr)
if (ierr /= 0) then if (ierr /= 0) then
@ -46,6 +48,8 @@ BEGIN_PROVIDER [ double precision, cholesky_mo_transp, (cholesky_mo_num, mo_num,
call dgemm('T','N', cholesky_mo_num*mo_num, mo_num, ao_num, 1.d0, & call dgemm('T','N', cholesky_mo_num*mo_num, mo_num, ao_num, 1.d0, &
X, ao_num, mo_coef, ao_num, 0.d0, cholesky_mo_transp, cholesky_mo_num*mo_num) X, ao_num, mo_coef, ao_num, 0.d0, cholesky_mo_transp, cholesky_mo_num*mo_num)
deallocate(X) deallocate(X)
call wall_time(wall1)
print*,'Time for AO->MO Cholesky vectors = ',wall1-wall0
END_PROVIDER END_PROVIDER

41
src/mu_of_r/f_hf_cholesky.irp.f
View File

@ -199,7 +199,7 @@ BEGIN_PROVIDER [ double precision, f_hf_cholesky_sparse, (n_points_final_grid)]
!! V_AR = \sum_{I}Phi_IR V_AI = \sum_{I}Phi^t_RI V_AI !! V_AR = \sum_{I}Phi_IR V_AI = \sum_{I}Phi^t_RI V_AI
double precision :: u_dot_v,wall0,wall1,accu_1, accu_2,mo_i_r1,mo_b_r1 double precision :: u_dot_v,wall0,wall1,accu_1, accu_2,mo_i_r1,mo_b_r1
double precision :: thresh_1,thresh_2 double precision :: thresh_1,thresh_2
double precision, allocatable :: accu_vec(:) double precision, allocatable :: accu_vec(:),delta_vec(:)
thresh_2 = ao_cholesky_threshold * 100.d0 thresh_2 = ao_cholesky_threshold * 100.d0
thresh_1 = dsqrt(thresh_2) thresh_1 = dsqrt(thresh_2)
provide cholesky_mo_transp provide cholesky_mo_transp
@ -223,12 +223,12 @@ BEGIN_PROVIDER [ double precision, f_hf_cholesky_sparse, (n_points_final_grid)]
mo_b_r1 = mos_in_r_array_omp(m,ipoint) mo_b_r1 = mos_in_r_array_omp(m,ipoint)
if(dabs(mo_i_r1*mo_b_r1).lt.thresh_2)cycle if(dabs(mo_i_r1*mo_b_r1).lt.thresh_2)cycle
do p = 1, cholesky_mo_num do p = 1, cholesky_mo_num
accu_vec(p) += mo_i_r1 * mo_b_r1 * cholesky_mo_transp(p,m,i) accu_vec(p) = accu_vec(p) + mo_i_r1 * mo_b_r1 * cholesky_mo_transp(p,m,i)
enddo enddo
enddo enddo
enddo enddo
do p = 1, cholesky_mo_num do p = 1, cholesky_mo_num
f_hf_cholesky_sparse(ipoint) += accu_vec(p) * accu_vec(p) f_hf_cholesky_sparse(ipoint) = f_hf_cholesky_sparse(ipoint) + accu_vec(p) * accu_vec(p)
enddo enddo
f_hf_cholesky_sparse(ipoint) *= 2.D0 f_hf_cholesky_sparse(ipoint) *= 2.D0
enddo enddo
@ -240,39 +240,50 @@ BEGIN_PROVIDER [ double precision, f_hf_cholesky_sparse, (n_points_final_grid)]
print*,'Time to provide f_hf_cholesky_sparse = ',wall1-wall0 print*,'Time to provide f_hf_cholesky_sparse = ',wall1-wall0
else else
call wall_time(wall0) call wall_time(wall0)
!$OMP PARALLEL DO & !$OMP PARALLEL DEFAULT(NONE) &
!$OMP DEFAULT (NONE) & !$OMP PRIVATE (accu_vec,delta_vec,ipoint,p,ii,i,mm,m,mo_i_r1,mo_b_r1) &
!$OMP PRIVATE (accu_2,accu_1,ipoint,p,ii,i,mm,m,mo_i_r1,mo_b_r1) & !$OMP ShARED (n_occ_val_orb_for_hf,list_valence_orb_for_hf,list_basis,mos_in_r_array_omp,thresh_1,thresh_2) &
!$OMP ShARED (n_occ_val_orb_for_hf,list_valence_orb_for_hf,list_basis,mos_in_r_array_omp) & !$OMP ShARED (cholesky_mo_num,f_hf_cholesky_sparse,n_points_final_grid,cholesky_mo_transp,n_basis_orb)
!$OMP ShARED (cholesky_mo_num,f_hf_cholesky_sparse,n_points_final_grid,cholesky_mo,n_basis_orb) allocate(accu_vec(cholesky_mo_num),delta_vec(cholesky_mo_num))
!$OMP DO
do ipoint = 1, n_points_final_grid do ipoint = 1, n_points_final_grid
f_hf_cholesky_sparse(ipoint) = 0.d0 f_hf_cholesky_sparse(ipoint) = 0.d0
do p = 1, cholesky_mo_num accu_vec = 0.d0
accu_2 = 0.d0
do ii = 1, n_occ_val_orb_for_hf(2) do ii = 1, n_occ_val_orb_for_hf(2)
i = list_valence_orb_for_hf(ii,2) i = list_valence_orb_for_hf(ii,2)
mo_i_r1 = mos_in_r_array_omp(i,ipoint) mo_i_r1 = mos_in_r_array_omp(i,ipoint)
if(dabs(mo_i_r1).lt.thresh_1)cycle
do mm = 1, n_basis_orb ! electron 1 do mm = 1, n_basis_orb ! electron 1
m = list_basis(mm) m = list_basis(mm)
mo_b_r1 = mos_in_r_array_omp(m,ipoint) mo_b_r1 = mos_in_r_array_omp(m,ipoint)
accu_2 += mo_i_r1 * mo_b_r1 * cholesky_mo(m,i,p) if(dabs(mo_i_r1*mo_b_r1).lt.thresh_2)cycle
do p = 1, cholesky_mo_num
accu_vec(p) = accu_vec(p) + mo_i_r1 * mo_b_r1 * cholesky_mo_transp(p,m,i)
enddo enddo
enddo enddo
accu_1 = accu_2 enddo
delta_vec = 0.d0
do ii = n_occ_val_orb_for_hf(2)+1,n_occ_val_orb_for_hf(1) do ii = n_occ_val_orb_for_hf(2)+1,n_occ_val_orb_for_hf(1)
i = list_valence_orb_for_hf(ii,1) i = list_valence_orb_for_hf(ii,1)
mo_i_r1 = mos_in_r_array_omp(i,ipoint) mo_i_r1 = mos_in_r_array_omp(i,ipoint)
if(dabs(mo_i_r1).lt.thresh_1)cycle
do mm = 1, n_basis_orb ! electron 1 do mm = 1, n_basis_orb ! electron 1
m = list_basis(mm) m = list_basis(mm)
mo_b_r1 = mos_in_r_array_omp(m,ipoint) mo_b_r1 = mos_in_r_array_omp(m,ipoint)
accu_1 += mo_i_r1 * mo_b_r1 * cholesky_mo(m,i,p) if(dabs(mo_i_r1*mo_b_r1).lt.thresh_2)cycle
do p = 1, cholesky_mo_num
delta_vec(p) = delta_vec(p) + mo_i_r1 * mo_b_r1 * cholesky_mo_transp(p,m,i)
enddo enddo
enddo enddo
f_hf_cholesky_sparse(ipoint) += accu_1 * accu_2 enddo
do p = 1, cholesky_mo_num
f_hf_cholesky_sparse(ipoint) = f_hf_cholesky_sparse(ipoint) + accu_vec(p) * accu_vec(p) + accu_vec(p) * delta_vec(p)
enddo enddo
f_hf_cholesky_sparse(ipoint) *= 2.D0 f_hf_cholesky_sparse(ipoint) *= 2.D0
enddo enddo
!$OMP END PARALLEL DO !$OMP END DO
deallocate(accu_vec)
!$OMP END PARALLEL
call wall_time(wall1) call wall_time(wall1)
print*,'Time to provide f_hf_cholesky_sparse = ',wall1-wall0 print*,'Time to provide f_hf_cholesky_sparse = ',wall1-wall0
endif endif