From 3ca51ab1b6151e0ac751c0822117aff35afbf085 Mon Sep 17 00:00:00 2001 From: Cory Date: Wed, 8 Nov 2023 17:33:38 +0100 Subject: [PATCH] Make some changes - Switch to using mpic++ - Add rule for phase_transition_mpi - Add monte_carlo.cpp --- src/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 027f007..dbf94c4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,10 @@ -CC=g++ +#CC=g++ +CC=mpic++ -LIBSRCS=utils.cpp testlib.cpp +LIBSRCS=utils.cpp testlib.cpp data_type.cpp LIBOBJS=$(LIBSRCS:.cpp=.o) -CLASSSRCS=IsingModel.cpp +CLASSSRCS=IsingModel.cpp monte_carlo.cpp CLASSOBJS=$(CLASSSRCS:.cpp=.o) INCLUDE=../include @@ -30,7 +31,7 @@ endif .PHONY: clean -all: test_suite main +all: main phase_transition_mpi test_suite #all: main # Instrumentation using scorep for parallel analysis @@ -43,6 +44,9 @@ instrument: main: main.o $(LIBOBJS) $(CLASSOBJS) $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP) +phase_transition_mpi: phase_transition_mpi.o $(LIBOBJS) $(CLASSOBJS) + $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP) + test_suite: test_suite.o $(LIBOBJS) $(CLASSOBJS) $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP)