From 328672f6be2343dc8b2f8b9d6bc7a1bb291eef7d Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 30 Oct 2019 15:28:46 +0100 Subject: [PATCH] Comments --- src/cipsi/pt2_stoch_routines.irp.f | 13 +++++++------ src/cipsi/selection.irp.f | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/cipsi/pt2_stoch_routines.irp.f b/src/cipsi/pt2_stoch_routines.irp.f index 70e86fca..281b0c5d 100644 --- a/src/cipsi/pt2_stoch_routines.irp.f +++ b/src/cipsi/pt2_stoch_routines.irp.f @@ -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 @@ -768,7 +769,7 @@ END_PROVIDER tilde_cW(i) = tilde_cW(i-1) + tilde_w(i) enddo tilde_cW(:) = tilde_cW(:) + 1.d0 - + pt2_n_0(1) = 0 do pt2_u_0 = tilde_cW(pt2_n_0(1)) diff --git a/src/cipsi/selection.irp.f b/src/cipsi/selection.irp.f index e9ab6c2e..3585940e 100644 --- a/src/cipsi/selection.irp.f +++ b/src/cipsi/selection.irp.f @@ -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 @@ -477,7 +478,7 @@ subroutine select_singles_and_doubles(i_generator,hole_mask,particle_mask,fock_d if (nt > 4) exit endif end do - case default + case default mobMask(1:N_int,1) = iand(negMask(1:N_int,1), psi_det_sorted(1:N_int,1,preinteresting(ii))) mobMask(1:N_int,2) = iand(negMask(1:N_int,2), psi_det_sorted(1:N_int,2,preinteresting(ii))) nt = 0