FYS3150/Project-4
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make some changes

Browse Source 
- Switch to using mpic++
- Add rule for phase_transition_mpi
- Add monte_carlo.cpp
This commit is contained in:
Cory Balaton 2023-11-08 17:33:38 +01:00
parent 197c0a0257
commit 3ca51ab1b6
No known key found for this signature in database
GPG Key ID: 3E5FCEBFD80F432B
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile
View File

@ -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) LIBOBJS=$(LIBSRCS:.cpp=.o)
CLASSSRCS=IsingModel.cpp CLASSSRCS=IsingModel.cpp monte_carlo.cpp
CLASSOBJS=$(CLASSSRCS:.cpp=.o) CLASSOBJS=$(CLASSSRCS:.cpp=.o)
INCLUDE=../include INCLUDE=../include
@ -30,7 +31,7 @@ endif
.PHONY: clean .PHONY: clean
all: test_suite main all: main phase_transition_mpi test_suite
#all: main #all: main
# Instrumentation using scorep for parallel analysis # Instrumentation using scorep for parallel analysis
@ -43,6 +44,9 @@ instrument:
main: main.o $(LIBOBJS) $(CLASSOBJS) main: main.o $(LIBOBJS) $(CLASSOBJS)
$(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP) $(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) test_suite: test_suite.o $(LIBOBJS) $(CLASSOBJS)
$(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP) $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) $(PROFFLAG) -I$(INCLUDE) $(OPENMP)