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

Fix some small bugs and add executables

Browse Source
This commit is contained in:
Cory Balaton 2023-12-04 12:39:01 +01:00
parent 1762fc87ad
commit 4f6f16636b
No known key found for this signature in database
GPG Key ID: 3E5FCEBFD80F432B
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,9 +1,9 @@
# The compiler # The compiler
CC=mpic++ CC=mpicxx
# Flags # Flags
CFLAGS=-Wall -larmadillo -std=c++11 -O3 -fopenmp CFLAGS=-Wall -larmadillo -std=c++11 -O3 -fopenmp
PROFFLAGS=-pg -fno-inline-functions PROFFLAGS=-fno-inline-functions
DBGFLAGS=-DDBG -g DBGFLAGS=-DDBG -g
MKDIR=mkdir -p MKDIR=mkdir -p
@ -36,7 +36,7 @@ PROFOBJS=$(addprefix $(PROFOBJDIR)/, $(SRCFILES:.cpp=.o))
DEBUGOBJS=$(addprefix $(DEBUGOBJDIR)/, $(SRCFILES:.cpp=.o)) DEBUGOBJS=$(addprefix $(DEBUGOBJDIR)/, $(SRCFILES:.cpp=.o))
# Location for Binaries # Location for Binaries
EXEC=main phase_transition_mpi test_suite time EXEC=main test_suite phase_transition phase_transition_mpi time pd_estimate mcmc_progression
BINS=$(addprefix $(BINDIR)/, $(EXEC)) BINS=$(addprefix $(BINDIR)/, $(EXEC))
PROFBINS=$(PROFDIR)/phase_transition_mpi PROFBINS=$(PROFDIR)/phase_transition_mpi
DEBUGBINS=$(addprefix $(DEBUGDIR)/, $(EXEC)) DEBUGBINS=$(addprefix $(DEBUGDIR)/, $(EXEC))
@ -68,7 +68,7 @@ $(PROFDIR)/%: $(PROFOBJDIR)/%.o $(PROFOBJS)
# Rule for debug binaries # Rule for debug binaries
$(DEBUGDIR)/%: $(DEBUGOBJDIR)/%.o $(DEBUGOBJS) $(DEBUGDIR)/%: $(DEBUGOBJDIR)/%.o $(DEBUGOBJS)
$(MKDIR) $(DEBUGDIR) $(MKDIR) $(DEBUGDIR)
$(CC) $^ -o $@ $(CFLAGS) $(DEBUGFLAGS) -I$(INCLUDE) $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAGS) -I$(INCLUDE)
# Rule for object files # Rule for object files
$(BINOBJDIR)/%.o: $(SRC)/%.cpp $(BINOBJDIR)/%.o: $(SRC)/%.cpp
@ -83,7 +83,7 @@ $(PROFOBJDIR)/%.o: $(SRC)/%.cpp
# Rule for debug object files # Rule for debug object files
$(DEBUGOBJDIR)/%.o: $(SRC)/%.cpp $(DEBUGOBJDIR)/%.o: $(SRC)/%.cpp
$(MKDIR) $(DEBUGOBJDIR) $(MKDIR) $(DEBUGOBJDIR)
$(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAG) $(DEBUGFLAGS) -I$(INCLUDE) $(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAGS) -I$(INCLUDE)
# Cleaning # Cleaning
clean: objclean binclean latexclean clean: objclean binclean latexclean