10
0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-23 04:43:45 +01:00

Merge branch 'master' into dev

This commit is contained in:
Anthony Scemama 2019-11-19 17:57:21 +01:00
commit 68e2173a68
2 changed files with 9 additions and 7 deletions

View File

@ -77,6 +77,7 @@ logical function testTeethBuilding(minF, N)
tilde_cW(i) = tilde_cW(i-1) + tilde_w(i)
enddo
tilde_cW(:) = tilde_cW(:) + 1.d0
deallocate(tilde_w)
n0 = 0
testTeethBuilding = .false.
@ -89,19 +90,19 @@ logical function testTeethBuilding(minF, N)
r = tilde_cW(n0 + minF)
Wt = (1d0 - u0) * f
if (dabs(Wt) <= 1.d-3) then
return
exit
endif
if(Wt >= r - u0) then
testTeethBuilding = .true.
return
exit
end if
n0 += 1
! if(N_det_generators - n0 < minF * N) then
if(n0 > minFN) then
return
exit
end if
end do
stop "exited testTeethBuilding"
deallocate(tilde_cW)
end function

View File

@ -346,6 +346,7 @@ subroutine select_singles_and_doubles(i_generator,hole_mask,particle_mask,fock_d
call isort(indices,iorder,nmax)
deallocate(iorder)
! Start with 32 elements. Size will double along with the filtering.
allocate(preinteresting(0:32), prefullinteresting(0:32), &
interesting(0:32), fullinteresting(0:32))
preinteresting(:) = 0