mirror of
https://gitlab.com/scemama/qmcchem.git
synced 2024-12-21 11:53:30 +01:00
Merge branch 'master' into develop
Conflicts: src/SAMPLING/pdmc_step.irp.f
This commit is contained in:
commit
cd0ac76bae
@ -248,14 +248,15 @@ END_SHELL
|
||||
if (cpu1 < cpu0) then
|
||||
cpu1 = cpu1+cpu0
|
||||
endif
|
||||
loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
|
||||
if (cpu1-cpu2 > count_rate) then
|
||||
integer :: do_run
|
||||
call get_running(do_run)
|
||||
loop = do_run == t_Running
|
||||
loop = loop.and.(do_run == t_Running)
|
||||
cpu2 = cpu1
|
||||
endif
|
||||
|
||||
|
||||
SOFT_TOUCH elec_coord_full_dmc psi_value psi_grad_psi_inv_x psi_grad_psi_inv_y psi_grad_psi_inv_z elec_coord
|
||||
|
||||
enddo
|
||||
|
@ -319,11 +319,11 @@ END_SHELL
|
||||
if (cpu1 < cpu0) then
|
||||
cpu1 = cpu1+cpu0
|
||||
endif
|
||||
loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
|
||||
if (cpu1-cpu2 > count_rate) then
|
||||
integer :: do_run
|
||||
call get_running(do_run)
|
||||
loop = do_run == t_Running
|
||||
loop = loop.and.(do_run == t_Running)
|
||||
cpu2 = cpu1
|
||||
endif
|
||||
|
||||
|
@ -280,11 +280,11 @@ END_SHELL
|
||||
if (cpu1 < cpu0) then
|
||||
cpu1 = cpu1+cpu0
|
||||
endif
|
||||
loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
|
||||
if (cpu1-cpu2 > count_rate) then
|
||||
integer :: do_run
|
||||
call get_running(do_run)
|
||||
loop = do_run == t_Running
|
||||
loop = loop.and.(do_run == t_Running)
|
||||
cpu2 = cpu1
|
||||
endif
|
||||
|
||||
|
@ -320,11 +320,11 @@ END_SHELL
|
||||
if (cpu1 < cpu0) then
|
||||
cpu1 = cpu1+cpu0
|
||||
endif
|
||||
loop = dble(cpu1-cpu0) < dble(block_time)*dble(count_rate)
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
|
||||
if (cpu1-cpu2 > count_rate) then
|
||||
integer :: do_run
|
||||
call get_running(do_run)
|
||||
loop = do_run == t_Running
|
||||
loop = loop.and.(do_run == t_Running)
|
||||
cpu2 = cpu1
|
||||
endif
|
||||
|
||||
|
@ -132,11 +132,11 @@ END_SHELL
|
||||
if (cpu1 < cpu0) then
|
||||
cpu1 = cpu1+cpu0
|
||||
endif
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num) < dble(block_time)*dble(count_rate)
|
||||
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time
|
||||
if (cpu1-cpu2 > count_rate) then
|
||||
integer :: do_run
|
||||
call get_running(do_run)
|
||||
loop = do_run == t_Running
|
||||
loop = loop.and.(do_run == t_Running)
|
||||
cpu2 = cpu1
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user