From 754b8602e608de42fa99714af60773d903478122 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 2 Nov 2020 22:50:11 +0100 Subject: [PATCH] Installation OK now --- Makefile | 2 +- configure.sh | 1 + install/Makefile | 2 ++ install/scripts/install_ocaml_zmq.sh | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77d1681..f988cee 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ always: /dev/null src/tags src/irpf90_entities src/irpf90.make: make.config always ./scripts/compile_irpf90.sh -src/MAIN/qmc src/MAIN/qmc_create_walkers src/MAIN/qmcchem_info: lib/libezfio.a lib/libezfio_irp.a src/tags src/irpf90_entities src/irpf90.make src/irpf90.make +src/MAIN/qmc src/MAIN/vmc_test src/MAIN/qmc_create_walkers src/MAIN/qmcchem_info: lib/libezfio.a lib/libezfio_irp.a src/tags src/irpf90_entities src/irpf90.make src/irpf90.make ./scripts/compile_src.sh # OCaml diff --git a/configure.sh b/configure.sh index 996da33..535eea0 100755 --- a/configure.sh +++ b/configure.sh @@ -44,5 +44,6 @@ export C_INCLUDE_PATH="\${QMCCHEM_PATH}/include:\${C_INCLUDE_PATH}" #export QMCCHEM_NIC=ib0 source \${QMCCHEM_PATH}/irpf90/bin/irpman #source \${QMCCHEM_PATH}/EZFIO/Bash/ezfio.sh +eval $(opam env) EOF diff --git a/install/Makefile b/install/Makefile index 2c599ec..afbf831 100644 --- a/install/Makefile +++ b/install/Makefile @@ -66,4 +66,6 @@ _build/ocaml_zmq.ok: ../bin/opam ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils. all: _build/ocaml_zmq.ok _build/ocaml.ok ../bin/opam _build/qmcchemrc.ok ../qmcchemrc _build/f77_zmq.ok ../src/ZMQ/f77_zmq.h ../lib/libf77zmq.a ../lib/libf77zmq.so _build/ezfio.ok _build/zmq.ok ../lib/libzmq.a ../lib/libzmq.so.5 ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h _build/irpf90.ok ../bin/irpman ../bin/irpf90 + @echo "Now, source again the qmcchemrc file" + @echo "source $$QMCCHEM_PATH/qmcchemrc" diff --git a/install/scripts/install_ocaml_zmq.sh b/install/scripts/install_ocaml_zmq.sh index a6f73d7..81204ef 100755 --- a/install/scripts/install_ocaml_zmq.sh +++ b/install/scripts/install_ocaml_zmq.sh @@ -32,7 +32,7 @@ export C_INCLUDE_PATH="${QMCCHEM_PATH}/lib":$C_INCLUDE_PATH export LIBRARY_PATH="${QMCCHEM_PATH}/lib":$LIBRARY_PATH export LD_LIBRARY_PATH="${QMCCHEM_PATH}/lib":$LD_LIBRARY_PATH set -u -opam install zmq conf-zmq +opam install -y zmq conf-zmq rm -f _build/ocaml_zmq.log exit 0