From 6361e1bf9c998ab6d8051383f6aed0538979d7c4 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 26 Jan 2016 15:05:46 +0100 Subject: [PATCH] Merge thomas --- install/scripts/install_ocaml.sh | 3 ++- ocaml/qp_create_ezfio_from_xyz.ml | 1 - ocaml/qp_edit.ml | 1 - ocaml/qp_print_basis.ml | 6 +++--- tests/bats/qp.bats | 4 ---- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index 138251d4..86e4e8b7 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -76,4 +76,5 @@ source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) ${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 -rm -f ../_build/ocaml.log \ No newline at end of file +rm -f ../_build/ocaml.log + diff --git a/ocaml/qp_create_ezfio_from_xyz.ml b/ocaml/qp_create_ezfio_from_xyz.ml index bd406a47..842f1457 100644 --- a/ocaml/qp_create_ezfio_from_xyz.ml +++ b/ocaml/qp_create_ezfio_from_xyz.ml @@ -631,4 +631,3 @@ let () = - diff --git a/ocaml/qp_edit.ml b/ocaml/qp_edit.ml index eba26c04..a693aa2f 100644 --- a/ocaml/qp_edit.ml +++ b/ocaml/qp_edit.ml @@ -306,4 +306,3 @@ let () = - diff --git a/ocaml/qp_print_basis.ml b/ocaml/qp_print_basis.ml index 679cd42b..7d95b970 100644 --- a/ocaml/qp_print_basis.ml +++ b/ocaml/qp_print_basis.ml @@ -16,7 +16,7 @@ let basis ()= Input.Ao_basis.to_rst basis |> Rst_string.to_string |> print_endline - ;; + let mo ()= let ezfio_filename = @@ -33,7 +33,7 @@ let mo ()= Input.Mo_basis.to_rst mo_coef |> Rst_string.to_string |> print_endline - ;; + basis ();; -mo ();; \ No newline at end of file +mo ();; diff --git a/tests/bats/qp.bats b/tests/bats/qp.bats index e404978e..7224466e 100644 --- a/tests/bats/qp.bats +++ b/tests/bats/qp.bats @@ -24,10 +24,6 @@ function eq() { } -function debug() { - echo $@ - $@ -} # ___