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

Coryab/implement penningtrap #3

Merged
coryab merged 20 commits from coryab/implement-Penningtrap into develop 2023-10-02 19:53:15 +00:00
Conversation 0 Commits 20 Files Changed 36 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b5c5020506 - Show all commits

6
src/Makefile
View File

@ -8,7 +8,7 @@ CLASSOBJS=$(CLASSSRCS:.cpp=.o)
INCLUDE=../include INCLUDE=../include
CFLAGS=-larmadillo -llapack -std=c++11 CFLAGS=-larmadillo -llapack -std=c++11 -O2
OPENMP=-fopenmp OPENMP=-fopenmp
# Add a debug flag when compiling (For the DEBUG macro in utils.hpp) # Add a debug flag when compiling (For the DEBUG macro in utils.hpp)
@ -24,7 +24,7 @@ endif
all: test_suite main all: test_suite main
# Rules for executables # Rules for executables
main: main.o $(LIBOBJS) main: main.o $(LIBOBJS) $(CLASSOBJS)
$(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) -I$(INCLUDE) $(OPENMP) $(CC) $^ -o $@ $(CFLAGS) $(DBGFLAG) -I$(INCLUDE) $(OPENMP)
test_suite: test_suite.o $(LIBOBJS) test_suite: test_suite.o $(LIBOBJS)
@ -32,7 +32,7 @@ test_suite: test_suite.o $(LIBOBJS)
# Rule for object files # Rule for object files
%.o: %.cpp %.o: %.cpp
$(CC) -c $^ -o $@ $(DBGFLAG) -I$(INCLUDE) $(OPENMP) $(CC) -c $^ -o $@ $(CFLAGS) $(DBGFLAG) -I$(INCLUDE) $(OPENMP)
clean: clean:
rm *.o rm *.o