Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
2c2d1f34
Commit
2c2d1f34
authored
Nov 02, 2017
by
lhausamm
Browse files
Now code compiles
parent
d0236bd7
Changes
4
Hide whitespace changes
Inline
Side-by-side
examples/Makefile.am
View file @
2c2d1f34
...
...
@@ -24,11 +24,11 @@ AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS)
AM_LDFLAGS
=
$(HDF5_LDFLAGS)
# Extra libraries.
EXTRA_LIBS
=
$(HDF5_LIBS)
$(FFTW_LIBS)
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
EXTRA_LIBS
=
$(HDF5_LIBS)
$(FFTW_LIBS)
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
$(GRACKLE_LIBS)
# MPI libraries.
MPI_LIBS
=
$(METIS_LIBS)
$(GRACKLE_LIBS)
$(MPI_THREAD_LIBS)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
$(GRACKLE_INCS)
MPI_LIBS
=
$(METIS_LIBS)
$(MPI_THREAD_LIBS)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
# Programs.
bin_PROGRAMS
=
swift
...
...
src/Makefile.am
View file @
2c2d1f34
...
...
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AUTOMAKE_OPTIONS
=
subdir-objects
# Add the debug flag to the whole thing
AM_CFLAGS
=
$(HDF5_CPPFLAGS)
...
...
@@ -25,11 +26,11 @@ AM_LDFLAGS = $(HDF5_LDFLAGS) $(FFTW_LIBS) -version-info 0:0:0
GIT_CMD
=
@GIT_CMD@
# Additional dependencies for shared libraries.
EXTRA_LIBS
=
$(HDF5_LIBS)
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
EXTRA_LIBS
=
$(HDF5_LIBS)
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
$(GRACKLE_LIB)
# MPI libraries.
MPI_LIBS
=
$(METIS_LIBS)
$(GRACKLE_LIB)
$(MPI_THREAD_LIBS)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
$(GRACKLE_LIB)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
# Build the libswiftsim library
lib_LTLIBRARIES
=
libswiftsim.la
...
...
@@ -57,7 +58,8 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
runner_doiact_fft.c threadpool.c cooling.c sourceterms.c
\
statistics.c runner_doiact_vec.c profiler.c dump.c logger.c
\
part_type.c xmf.c gravity_properties.c gravity.c
\
collectgroup.c hydro_space.c equation_of_state.c
collectgroup.c hydro_space.c equation_of_state.c
\
cooling/grackle/grackle_wrapper.c
# Include files for distribution, not installation.
nobase_noinst_HEADERS
=
align.h approx_math.h atomic.h barrier.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h
\
...
...
src/cooling/grackle/grackle_wrapper.c
View file @
2c2d1f34
...
...
@@ -12,7 +12,7 @@
************************************************************************/
#include
<cooling/grackle/
grackle_wrapper.h
>
#include
"
grackle_wrapper.h
"
#define GRACKLE_DEBUG
...
...
src/cooling/grackle/grackle_wrapper.h
View file @
2c2d1f34
...
...
@@ -13,7 +13,7 @@
#ifndef SWIFT_COOLING_GRACKLE_WRAPPER_H
#define SWIFT_COOLING_GRACKLE_WRAPPER_H
#include
<
config.h
>
#include
"
config.h
"
#include
<grackle.h>
#include
<math.h>
#include
<stdio.h>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment