diff --git a/src/Integrals_Monoelec/pseudopot.f90 b/src/Integrals_Monoelec/pseudopot.f90 index 725aa8c7..12f0192e 100644 --- a/src/Integrals_Monoelec/pseudopot.f90 +++ b/src/Integrals_Monoelec/pseudopot.f90 @@ -1860,7 +1860,7 @@ double precision function int_prod_bessel(l,gam,n,m,a,b,arg) double precision :: s_q_0, s_q_k, s_0_0, a_over_b_square double precision :: int_prod_bessel_loc double precision :: inverses(0:300) - double precision :: two_qkmp1, qk + double precision :: two_qkmp1, qk, mk, nk logical done @@ -1908,6 +1908,7 @@ double precision function int_prod_bessel(l,gam,n,m,a,b,arg) s_q_0 = s_0_0 + mk = dble(m) ! Loop over q for the convergence of the sequence do while (.not.done) @@ -1919,10 +1920,10 @@ double precision function int_prod_bessel(l,gam,n,m,a,b,arg) stop 'pseudopot.f90 : q > 300' endif - two_qkmp1 = dble(2*(q+m)+1) qk = dble(q) + two_qkmp1 = 2.d0*(qk+mk)+1.d0 do k=0,q-1 - s_q_k = ( two_qkmp1*qk*inverses(k) ) * s_q_k + s_q_k = two_qkmp1*qk*inverses(k)*s_q_k sum=sum+s_q_k two_qkmp1 = two_qkmp1-2.d0 qk = qk-1.d0 diff --git a/src/ZMQ/utils.irp.f b/src/ZMQ/utils.irp.f index e5a9f8ef..d7dd8002 100644 --- a/src/ZMQ/utils.irp.f +++ b/src/ZMQ/utils.irp.f @@ -473,26 +473,11 @@ subroutine end_zmq_push_socket(zmq_socket_push,thread) integer :: rc character*(8), external :: zmq_port - if (thread == 1) then - rc = f77_zmq_disconnect(zmq_socket_push,zmq_socket_push_inproc_address) -! if (rc /= 0) then -! print *, 'f77_zmq_disconnect(zmq_socket_push,zmq_socket_push_inproc_address)' -! stop 'error' -! endif - else - rc = f77_zmq_disconnect(zmq_socket_push,zmq_socket_push_tcp_address) - if (rc /= 0) then - print *, 'f77_zmq_disconnect(zmq_socket_push,zmq_socket_push_tcp_address)' - stop 'error' - endif + rc = f77_zmq_setsockopt(zmq_socket_push,ZMQ_LINGER,300000,4) + if (rc /= 0) then + stop 'Unable to set ZMQ_LINGER on push socket' endif - -! rc = f77_zmq_setsockopt(zmq_socket_push,ZMQ_LINGER,20000,4) -! if (rc /= 0) then -! stop 'Unable to set ZMQ_LINGER on push socket' -! endif - rc = f77_zmq_close(zmq_socket_push) if (rc /= 0) then print *, 'f77_zmq_close(zmq_socket_push)' @@ -814,12 +799,6 @@ subroutine end_zmq_to_qp_run_socket(zmq_to_qp_run_socket) character*(8), external :: zmq_port integer :: rc - rc = f77_zmq_disconnect(zmq_to_qp_run_socket, trim(qp_run_address)//':'//trim(zmq_port(0))) -! if (rc /= 0) then -! print *, 'f77_zmq_disconnect(zmq_to_qp_run_socket, trim(qp_run_address)//'':''//trim(zmq_port(0)))' -! stop 'error' -! endif - rc = f77_zmq_setsockopt(zmq_to_qp_run_socket,ZMQ_LINGER,1000,4) if (rc /= 0) then stop 'Unable to set ZMQ_LINGER on zmq_to_qp_run_socket'