10
0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-11-19 04:22:32 +01:00

Merge branch 'dev' into csf

This commit is contained in:
Anthony Scemama 2020-12-08 22:34:01 +01:00
commit 2bcd83fb07
4 changed files with 7 additions and 3 deletions

View File

@ -54,7 +54,7 @@ FCFLAGS : -msse4.2 -O2 -ip -ftz
# #
[DEBUG] [DEBUG]
FC : -g -traceback FC : -g -traceback
FCFLAGS : -msse4.2 -C -fpe0 -implicitnone FCFLAGS : -msse4.2 -check all -debug all -fpe-all=0 -implicitnone
# OpenMP flags # OpenMP flags

View File

@ -22,10 +22,11 @@ subroutine write_time(iunit)
write(6,*) write(6,*)
call print_memory_usage() call print_memory_usage()
call cpu_time(ct) call cpu_time(ct)
ct = ct - output_cpu_time_0
call wall_time(wt) call wall_time(wt)
wt = wt - output_wall_time_0
write(6,'(A,F14.6,A,F14.6,A)') & write(6,'(A,F14.6,A,F14.6,A)') &
'.. >>>>> [ WALL TIME: ', wt-output_wall_time_0, & '.. >>>>> [ WALL TIME: ', wt, ' s ] [ CPU TIME: ', ct, ' s ] <<<<< ..'
' s ] [ CPU TIME: ', ct-output_cpu_time_0, ' s ] <<<<< ..'
write(6,*) write(6,*)
end end

View File

@ -14,7 +14,9 @@ subroutine huckel_guess
allocate (A(ao_num, ao_num)) allocate (A(ao_num, ao_num))
A = 0.d0 A = 0.d0
do j=1,ao_num do j=1,ao_num
if (ao_overlap(j,j) == 0.d0) cycle
do i=1,ao_num do i=1,ao_num
if (ao_overlap(i,i) == 0.d0) cycle
A(i,j) = c * ao_overlap(i,j)/(ao_overlap(i,i)*ao_overlap(j,j)) * & A(i,j) = c * ao_overlap(i,j)/(ao_overlap(i,i)*ao_overlap(j,j)) * &
(ao_one_e_integrals_diag(i) + ao_one_e_integrals_diag(j)) (ao_one_e_integrals_diag(i) + ao_one_e_integrals_diag(j))
enddo enddo

View File

@ -1550,6 +1550,7 @@ subroutine nullify_small_elements(m,n,A,LDA,thresh)
amax = max(dabs(A(i,j)), amax) amax = max(dabs(A(i,j)), amax)
enddo enddo
enddo enddo
if (amax == 0.d0) return
amax = 1.d0/amax amax = 1.d0/amax
! Remove tiny elements ! Remove tiny elements