Tweak Makefile

Makefile

-pre := MPLBACKEND=agg MKL_NUM_THREADS=1 OMP_NUM_THREADS=1
 .PHONY: m87 blobs disk crescent ehtcrescent ehtdisk sim1 sim2
 
-# Compute starting position for movie
-initial.h5 :
+pre := MPLBACKEND=agg MKL_NUM_THREADS=1 OMP_NUM_THREADS=1
+
 ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 movie_start.py
+python = $(pre) mpirun -np $(VLBI_MPI_TASKS) python3
 else
-	$(pre) python3 movie_start.py
+python = $(pre) python3
 endif
 
-# Movie reconstruction
+initial.h5 :
+	$(python) movie_start.py
+
 m87 : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py m87 initial.h5
-else
-	$(pre) python3 reconstruction.py m87 initial.h5
-endif
+	$(python) reconstruction.py m87 initial.h5
+
 blobs : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py blobs initial.h5
-else
-	$(pre) python3 reconstruction.py blobs initial.h5
-endif
+	$(python) reconstruction.py blobs initial.h5
+
 disk : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py disk initial.h5
-else
-	$(pre) python3 reconstruction.py disk initial.h5
-endif
+	$(python) reconstruction.py disk initial.h5
+
 crescent : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py crescent initial.h5
-else
-	$(pre) python3 reconstruction.py crescent initial.h5
-endif
+	$(python) reconstruction.py crescent initial.h5
+
 ehtcrescent : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py ehtcrescent initial.h5
-else
-	$(pre) python3 reconstruction.py ehtcrescent initial.h5
-endif
+	$(python) reconstruction.py ehtcrescent initial.h5
+
 ehtdisk : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py ehtdisk initial.h5
-else
-	$(pre) python3 reconstruction.py ehtdisk initial.h5
-endif
+	$(python) reconstruction.py ehtdisk initial.h5
+
 sim1 : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py sim1 initial.h5
-else
-	$(pre) python3 reconstruction.py sim1 initial.h5
-endif
-sim2 : initial.h5
-ifdef VLBI_MPI_TASKS
-	$(pre) mpirun -np $(VLBI_MPI_TASKS) python3 reconstruction.py sim2 initial.h5
-else
-	$(pre) python3 reconstruction.py sim2 initial.h5
-endif
+	$(python) reconstruction.py sim1 initial.h5
 
+sim2 : initial.h5
+	$(python) reconstruction.py sim2 initial.h5