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

Merge branch 'master' of github.com:scemama/qmcchem

This commit is contained in:
Anthony Scemama 2018-07-13 11:37:21 +02:00
commit 1e9b94374f
3 changed files with 14 additions and 1 deletions

View File

@ -9,6 +9,16 @@ let to_string = function
| Srun -> "srun" | Srun -> "srun"
| Bash -> "env" | Bash -> "env"
| MPI -> Lazy.force Qmcchem_config.mpirun | MPI -> Lazy.force Qmcchem_config.mpirun
(*
let to_string = function
| MPI
| Srun -> String.concat ~sep:" " [ Lazy.force Qmcchem_config.mpirun ;
match Sys.getenv "QMCCHEM_MPIRUN_FLAGS" with
| None -> ""
| Some p -> p
]
| Bash -> "env"
*)
(** Find the launcher for the current job scheduler *) (** Find the launcher for the current job scheduler *)

View File

@ -49,6 +49,7 @@ let full_run ?(start_dataserver=true) ezfio_filename =
end; end;
(*
(* Check if the Zmq Rep socket is open *) (* Check if the Zmq Rep socket is open *)
let test_open_rep_socket () = let test_open_rep_socket () =
let zmq_context = let zmq_context =
@ -94,6 +95,8 @@ let full_run ?(start_dataserver=true) ezfio_filename =
in in
if (not (count 300)) then if (not (count 300)) then
Watchdog.kill (); Watchdog.kill ();
*)
Time.pause (Time.Span.of_sec 3.);
(* Start the qmc processes *) (* Start the qmc processes *)

View File

@ -351,7 +351,7 @@ subroutine get_running(do_run)
return return
else else
timeout = 5 ! seconds timeout = 600 ! seconds
! Polling items ! Polling items
! ------------- ! -------------