From 36a6bd01c61a4394450a318539de75e84f367803 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 1 Aug 2016 20:03:46 +0200 Subject: [PATCH] Removed prints --- ocaml/TaskServer.ml | 1 - plugins/Full_CI_ZMQ/selection.irp.f | 18 ++++++++---------- plugins/Full_CI_ZMQ/selection_slave.irp.f | 2 +- src/ZMQ/utils.irp.f | 1 - 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ocaml/TaskServer.ml b/ocaml/TaskServer.ml index cb67ec26..75334adc 100644 --- a/ocaml/TaskServer.ml +++ b/ocaml/TaskServer.ml @@ -589,7 +589,6 @@ let start_pub_thread ~port = else state in -print_endline (string_of_pub_state new_state); ZMQ.Socket.send pub_socket @@ string_of_pub_state new_state; match state with | Stopped -> () diff --git a/plugins/Full_CI_ZMQ/selection.irp.f b/plugins/Full_CI_ZMQ/selection.irp.f index b26b3e1b..ba6c7c73 100644 --- a/plugins/Full_CI_ZMQ/selection.irp.f +++ b/plugins/Full_CI_ZMQ/selection.irp.f @@ -3,13 +3,11 @@ BEGIN_PROVIDER [ double precision, integral8, (mo_tot_num, mo_tot_num, mo_tot_num, mo_tot_num) ] integral8 = 0d0 integer :: h1, h2 - print *, "provide int" do h1=1, mo_tot_num - do h2=1, mo_tot_num - call get_mo_bielec_integrals_ij(h1, h2 ,mo_tot_num,integral8(1,1,h1,h2),mo_integrals_map) + do h2=1, mo_tot_num + call get_mo_bielec_integrals_ij(h1, h2 ,mo_tot_num,integral8(1,1,h1,h2),mo_integrals_map) + end do end do - end do - print *, "end provide int" END_PROVIDER @@ -21,7 +19,7 @@ subroutine selection_slaved(thread,iproc) integer, intent(in) :: thread, iproc integer :: rc, i - integer :: worker_id, task_id(100), ctask, ltask + integer :: worker_id, task_id(1), ctask, ltask character*(512) :: task integer(ZMQ_PTR),external :: new_zmq_to_qp_run_socket @@ -51,7 +49,9 @@ subroutine selection_slaved(thread,iproc) do call get_task_from_taskserver(zmq_to_qp_run_socket,worker_id, task_id(ctask), task) done = task_id(ctask) == 0 - if (.not. done) then + if (done) then + ctask = ctask - 1 + else integer :: i_generator, N read (task,*) i_generator, N if(buf%N == 0) then @@ -62,8 +62,6 @@ subroutine selection_slaved(thread,iproc) !print *, "psi_selectors_coef ", psi_selectors_coef(N_det_selectors-5:N_det_selectors, 1) !call debug_det(psi_selectors(1,1,N_det_selectors), N_int) call select_connected(i_generator,ci_electronic_energy,pt2,buf) - else - ctask = ctask - 1 endif if(done .or. ctask == size(task_id)) then @@ -300,7 +298,7 @@ subroutine selection_collector(b, pt2) end do done += ntask call CPU_TIME(time) - print *, "DONE" , done, time - time0 +! print *, "DONE" , done, time - time0 end do diff --git a/plugins/Full_CI_ZMQ/selection_slave.irp.f b/plugins/Full_CI_ZMQ/selection_slave.irp.f index db18ca59..a09e1bf2 100644 --- a/plugins/Full_CI_ZMQ/selection_slave.irp.f +++ b/plugins/Full_CI_ZMQ/selection_slave.irp.f @@ -52,7 +52,7 @@ subroutine run_wf do k=1,size(ci_electronic_energy) ci_electronic_energy(k) = energy(k) enddo - SOFT_TOUCH ci_electronic_energy CI_eigenvectors_s2 CI_eigenvectors + TOUCH ci_electronic_energy CI_eigenvectors_s2 CI_eigenvectors endif call write_double(6,ci_energy,'Energy') diff --git a/src/ZMQ/utils.irp.f b/src/ZMQ/utils.irp.f index 4a6085e2..30dee670 100644 --- a/src/ZMQ/utils.irp.f +++ b/src/ZMQ/utils.irp.f @@ -881,7 +881,6 @@ subroutine wait_for_state(state_wait,state) print *, 'Timeout reached. Stopping' state = "Stopped" endif -print *, '|'//trim(state(1:rc))//'|'//trim(state_wait)//'|' end do call end_zmq_sub_socket(zmq_socket_sub) end