From 96acdf7a91b09f24c7eb44352d0c144fdb6bf9c3 Mon Sep 17 00:00:00 2001 From: Oli Date: Mon, 15 Nov 2021 20:48:20 -0300 Subject: [PATCH] arranging makefile --- Makefile | 4 ++-- env.sh | 5 +++++ run_simulation.sh | 4 ---- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100755 env.sh diff --git a/Makefile b/Makefile index 181ee81..d0250af 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ SHELL:= zsh env: - conda activate py2_7 + source ./env.sh install: - ./script_install.sh $(SHELL) + source ./script_install.sh $(SHELL) run: env ./run_simulation.sh diff --git a/env.sh b/env.sh new file mode 100755 index 0000000..5624947 --- /dev/null +++ b/env.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +source ~/miniconda3/etc/profile.d/conda.sh +conda activate py2_7 +python --version \ No newline at end of file diff --git a/run_simulation.sh b/run_simulation.sh index bf4d1b8..bab59e1 100755 --- a/run_simulation.sh +++ b/run_simulation.sh @@ -1,7 +1,3 @@ #!/bin/bash -source ~/miniconda3/etc/profile.d/conda.sh -conda activate py2_7 -python --version - mpirun python mpirunner.py \ No newline at end of file