9
1
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-21 11:03:29 +01:00

csf remove do while loops

This commit is contained in:
Yann Damour 2022-03-24 16:14:31 +01:00
parent 22b28fc774
commit 8a759e6a94

View File

@ -51,16 +51,24 @@
if(cfg_seniority_index(i+2) > ncfgpersomo) then
ncfgpersomo = cfg_seniority_index(i+2)
else
k = 0
if ((i+2+k) < size(cfg_seniority_index,1)) then
do while(cfg_seniority_index(i+2+k) < ncfgpersomo)
k = k + 2
if ((i+2+k) >= size(cfg_seniority_index,1)) then
exit
! l = i+k+2
! Loop over l with a constraint to ensure that l <= size(cfg_seniority_index,1)-1
! Old version commented just below
do l = min(size(cfg_seniority_index,1)-1, i+2), size(cfg_seniority_index,1)-1, 2
if (cfg_seniority_index(l) >= ncfgpersomo) then
ncfgpersomo = cfg_seniority_index(l)
endif
ncfgpersomo = cfg_seniority_index(i+2+k)
enddo
endif
!k = 0
!if ((i+2+k) < size(cfg_seniority_index,1)) then
! do while(cfg_seniority_index(i+2+k) < ncfgpersomo)
! k = k + 2
! if ((i+2+k) >= size(cfg_seniority_index,1)) then
! exit
! endif
! ncfgpersomo = cfg_seniority_index(i+2+k)
! enddo
!endif
endif
endif
ncfg = ncfgpersomo - ncfgprev
@ -79,16 +87,26 @@
if(cfg_seniority_index(i+2) > ncfgprev) then
ncfgprev = cfg_seniority_index(i+2)
else
k = 0
if ((i+2+k) < size(cfg_seniority_index,1)) then
do while(cfg_seniority_index(i+2+k) < ncfgprev)
k = k + 2
if ((i+2+k) >= size(cfg_seniority_index,1)) then
exit
! l = i+k+2
! Loop over l with a constraint to ensure that l <= size(cfg_seniority_index,1)-1
! Old version commented just below
do l = min(size(cfg_seniority_index,1)-1, i+2), size(cfg_seniority_index,1)-1, 2
print*,'l'
if (cfg_seniority_index(l) >= ncfgprev) then
ncfgprev = cfg_seniority_index(l)
endif
ncfgprev = cfg_seniority_index(i+2+k)
print*,'ncfgprev', ncfgprev
enddo
endif
!k = 0
!if ((i+2+k) < size(cfg_seniority_index,1)) then
! do while(cfg_seniority_index(i+2+k) < ncfgprev)
! k = k + 2
! if ((i+2+k) >= size(cfg_seniority_index,1)) then
! exit
! endif
! ncfgprev = cfg_seniority_index(i+2+k)
! enddo
!endif
endif
enddo
END_PROVIDER