10
1
mirror of https://gitlab.com/scemama/qmcchem.git synced 2024-12-22 12:23:30 +01:00

Fixed duration of a block

This commit is contained in:
Anthony Scemama 2017-10-12 15:51:15 +02:00
parent cf003c3e08
commit 074bfc1705
6 changed files with 15 additions and 25 deletions

View File

@ -248,7 +248,7 @@ END_SHELL
if (cpu1 < cpu0) then if (cpu1 < cpu0) then
cpu1 = cpu1+cpu0 cpu1 = cpu1+cpu0
endif endif
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time loop = dble(cpu1-cpu0)/dble(count_rate) < block_time
if (cpu1-cpu2 > count_rate) then if (cpu1-cpu2 > count_rate) then
integer :: do_run integer :: do_run
call get_running(do_run) call get_running(do_run)

View File

@ -319,7 +319,7 @@ END_SHELL
if (cpu1 < cpu0) then if (cpu1 < cpu0) then
cpu1 = cpu1+cpu0 cpu1 = cpu1+cpu0
endif endif
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time loop = dble(cpu1-cpu0)/dble(count_rate) < block_time
if (cpu1-cpu2 > count_rate) then if (cpu1-cpu2 > count_rate) then
integer :: do_run integer :: do_run
call get_running(do_run) call get_running(do_run)

View File

@ -280,7 +280,7 @@ END_SHELL
if (cpu1 < cpu0) then if (cpu1 < cpu0) then
cpu1 = cpu1+cpu0 cpu1 = cpu1+cpu0
endif endif
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time loop = dble(cpu1-cpu0)/dble(count_rate) < block_time
if (cpu1-cpu2 > count_rate) then if (cpu1-cpu2 > count_rate) then
integer :: do_run integer :: do_run
call get_running(do_run) call get_running(do_run)

View File

@ -320,7 +320,7 @@ END_SHELL
if (cpu1 < cpu0) then if (cpu1 < cpu0) then
cpu1 = cpu1+cpu0 cpu1 = cpu1+cpu0
endif endif
loop = dble(cpu1-cpu0)*dble(walk_num)/dble(count_rate) < block_time loop = dble(cpu1-cpu0)/dble(count_rate) < block_time
if (cpu1-cpu2 > count_rate) then if (cpu1-cpu2 > count_rate) then
integer :: do_run integer :: do_run
call get_running(do_run) call get_running(do_run)

View File

@ -1408,15 +1408,10 @@ END_PROVIDER
endif endif
det_alpha_value(det_i) = det_alpha_value_curr det_alpha_value(det_i) = det_alpha_value_curr
do i=1,elec_alpha_num det_alpha_grad_lapl(:,:,det_i) = det_alpha_grad_lapl_curr(:,:)
!DIR$ VECTOR ALIGNED
do k=1,4
det_alpha_grad_lapl(k,i,det_i) = det_alpha_grad_lapl_curr(k,i)
enddo
if (do_pseudo) then if (do_pseudo) then
det_alpha_pseudo(i,det_i) = det_alpha_pseudo_curr(i) det_alpha_pseudo(:,det_i) = det_alpha_pseudo_curr(:)
endif endif
enddo
enddo enddo
@ -1460,15 +1455,10 @@ END_PROVIDER
endif endif
det_beta_value(det_j) = det_beta_value_curr det_beta_value(det_j) = det_beta_value_curr
!DIR$ LOOP COUNT (200) det_beta_grad_lapl(:,:,det_j) = det_beta_grad_lapl_curr(:,:)
do i=elec_alpha_num+1,elec_num
do k=1,4
det_beta_grad_lapl(k,i,det_j) = det_beta_grad_lapl_curr(k,i)
enddo
if (do_pseudo) then if (do_pseudo) then
det_beta_pseudo(i,det_j) = det_beta_pseudo_curr(i) det_beta_pseudo(:,det_j) = det_beta_pseudo_curr(:)
endif endif
enddo
enddo enddo

View File

@ -264,7 +264,7 @@ END_PROVIDER
nucl_fitcusp_factor = 0. nucl_fitcusp_factor = 0.
call get_simulation_nucl_fitcusp_factor(nucl_fitcusp_factor) call get_simulation_nucl_fitcusp_factor(nucl_fitcusp_factor)
do_nucl_fitcusp = nucl_fitcusp_factor > 0. do_nucl_fitcusp = nucl_fitcusp_factor > 0.
call info(irp_here,'nucl_fitcusp_factor',nucl_fitcusp_factor) call rinfo(irp_here,'nucl_fitcusp_factor',nucl_fitcusp_factor)
END_PROVIDER END_PROVIDER