Skip to content
Snippets Groups Projects
Commit b4fbaa44 authored by Chichi Lalescu's avatar Chichi Lalescu
Browse files

Merge branch 'temp' into develop

Conflicts:
	makefile
	src/RMHD_converter.cpp
parents a0f7e7bf 00f09c5b
Branches
Tags
No related merge requests found
......@@ -4,15 +4,23 @@ DEFINES =
CFLAGS = -Wall \
-O2
# advice from
# https://software.intel.com/en-us/forums/topic/298872
# always link against both libimf and libm
LIBS = -lfftw3_mpi \
-lfftw3 \
-lfftw3f_mpi \
-lfftw3f \
# -limf \
-lm
-lfftw3f
COMPILER_VERSION := $(shell ${MPICXX} --version)
ifneq (,$(findstring ICC,$(COMPILER_VERSION)))
# using intel compiler
# advice from
# https://software.intel.com/en-us/forums/topic/298872
# always link against both libimf and libm
LIBS += -limf \
-lm
else
# not using intel compiler
endif
vpath %.cpp ./src/
......
......@@ -139,7 +139,6 @@ int RMHD_converter::convert(
this->s->shuffle(rtmp, ofile);
fftwf_free(rtmp);
return EXIT_SUCCESS;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment