LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2024-06-29 16:34:50 +02:00
Code Issues Releases Wiki Activity

Fixed selection slave

Browse Source
This commit is contained in:
Anthony Scemama 2016-11-16 15:18:24 +01:00
parent ba04ee0170
commit 6c452bb63a
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/CAS_SD_ZMQ/selection_cassd_slave.irp.f
View File

@ -22,7 +22,7 @@ subroutine run_wf
integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket
integer(ZMQ_PTR) :: zmq_to_qp_run_socket integer(ZMQ_PTR) :: zmq_to_qp_run_socket
double precision :: energy(N_states_diag) double precision :: energy(N_states)
character*(64) :: states(1) character*(64) :: states(1)
integer :: rc, i integer :: rc, i
@ -47,7 +47,7 @@ subroutine run_wf
! --------- ! ---------
print *, 'Selection' print *, 'Selection'
call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states_diag) call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states)
!$OMP PARALLEL PRIVATE(i) !$OMP PARALLEL PRIVATE(i)
i = omp_get_thread_num() i = omp_get_thread_num()
@ -62,7 +62,7 @@ end
subroutine update_energy(energy) subroutine update_energy(energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
BEGIN_DOC BEGIN_DOC
! Update energy when it is received from ZMQ ! Update energy when it is received from ZMQ
END_DOC END_DOC
@ -85,7 +85,7 @@ end
subroutine selection_slave_tcp(i,energy) subroutine selection_slave_tcp(i,energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
integer, intent(in) :: i integer, intent(in) :: i
call run_selection_slave(0,i,energy) call run_selection_slave(0,i,energy)

8
plugins/Full_CI_ZMQ/selection_davidson_slave.irp.f
View File

@ -22,7 +22,7 @@ subroutine run_wf
integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket
integer(ZMQ_PTR) :: zmq_to_qp_run_socket integer(ZMQ_PTR) :: zmq_to_qp_run_socket
double precision :: energy(N_states_diag) double precision :: energy(N_states)
character*(64) :: states(2) character*(64) :: states(2)
integer :: rc, i integer :: rc, i
@ -48,7 +48,7 @@ subroutine run_wf
! --------- ! ---------
print *, 'Selection' print *, 'Selection'
call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states_diag) call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states)
!$OMP PARALLEL PRIVATE(i) !$OMP PARALLEL PRIVATE(i)
i = omp_get_thread_num() i = omp_get_thread_num()
@ -76,7 +76,7 @@ end
subroutine update_energy(energy) subroutine update_energy(energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
BEGIN_DOC BEGIN_DOC
! Update energy when it is received from ZMQ ! Update energy when it is received from ZMQ
END_DOC END_DOC
@ -99,7 +99,7 @@ end
subroutine selection_slave_tcp(i,energy) subroutine selection_slave_tcp(i,energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
integer, intent(in) :: i integer, intent(in) :: i
call run_selection_slave(0,i,energy) call run_selection_slave(0,i,energy)

8
plugins/Full_CI_ZMQ/selection_slave.irp.f
View File

@ -22,7 +22,7 @@ subroutine run_wf
integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket integer(ZMQ_PTR), external :: new_zmq_to_qp_run_socket
integer(ZMQ_PTR) :: zmq_to_qp_run_socket integer(ZMQ_PTR) :: zmq_to_qp_run_socket
double precision :: energy(N_states_diag) double precision :: energy(N_states)
character*(64) :: states(1) character*(64) :: states(1)
integer :: rc, i integer :: rc, i
@ -47,7 +47,7 @@ subroutine run_wf
! --------- ! ---------
print *, 'Selection' print *, 'Selection'
call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states_diag) call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states)
!$OMP PARALLEL PRIVATE(i) !$OMP PARALLEL PRIVATE(i)
i = omp_get_thread_num() i = omp_get_thread_num()
@ -62,7 +62,7 @@ end
subroutine update_energy(energy) subroutine update_energy(energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
BEGIN_DOC BEGIN_DOC
! Update energy when it is received from ZMQ ! Update energy when it is received from ZMQ
END_DOC END_DOC
@ -85,7 +85,7 @@ end
subroutine selection_slave_tcp(i,energy) subroutine selection_slave_tcp(i,energy)
implicit none implicit none
double precision, intent(in) :: energy(N_states_diag) double precision, intent(in) :: energy(N_states)
integer, intent(in) :: i integer, intent(in) :: i
call run_selection_slave(0,i,energy) call run_selection_slave(0,i,energy)

5
plugins/Selectors_CASSD/zmq.irp.f
View File

@ -88,7 +88,6 @@ subroutine zmq_get_psi(zmq_to_qp_run_socket, worker_id, energy, size_energy)
N_states = N_states_read N_states = N_states_read
N_det = N_det_read N_det = N_det_read
psi_det_size = psi_det_size_read psi_det_size = psi_det_size_read
TOUCH psi_det_size N_det N_states
rc = f77_zmq_recv(zmq_to_qp_run_socket,psi_det,N_int*2*N_det*bit_kind,ZMQ_SNDMORE) rc = f77_zmq_recv(zmq_to_qp_run_socket,psi_det,N_int*2*N_det*bit_kind,ZMQ_SNDMORE)
if (rc /= N_int*2*N_det*bit_kind) then if (rc /= N_int*2*N_det*bit_kind) then
@ -101,11 +100,11 @@ subroutine zmq_get_psi(zmq_to_qp_run_socket, worker_id, energy, size_energy)
print *, '77_zmq_recv(zmq_to_qp_run_socket,psi_coef,psi_det_size*N_states*8,ZMQ_SNDMORE)' print *, '77_zmq_recv(zmq_to_qp_run_socket,psi_coef,psi_det_size*N_states*8,ZMQ_SNDMORE)'
stop 'error' stop 'error'
endif endif
TOUCH psi_det psi_coef TOUCH psi_det_size N_det N_states psi_det psi_coef
rc = f77_zmq_recv(zmq_to_qp_run_socket,energy,size_energy*8,0) rc = f77_zmq_recv(zmq_to_qp_run_socket,energy,size_energy*8,0)
if (rc /= size_energy*8) then if (rc /= size_energy*8) then
print *, '77_zmq_recv(zmq_to_qp_run_socket,energy,size_energy*8,0)' print *, 'f77_zmq_recv(zmq_to_qp_run_socket,energy,size_energy*8,0)'
stop 'error' stop 'error'
endif endif