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
19caca1c
Commit
19caca1c
authored
Nov 01, 2017
by
lhausamm
Browse files
Manual merging of cooling_grackle (work done by
@yvesrevaz
and
@mculpo
)
parent
52223171
Changes
3
Hide whitespace changes
Inline
Side-by-side
examples/Makefile.am
View file @
19caca1c
...
...
@@ -27,8 +27,8 @@ AM_LDFLAGS = $(HDF5_LDFLAGS)
EXTRA_LIBS
=
$(HDF5_LIBS)
$(FFTW_LIBS)
$(PROFILER_LIBS)
$(TCMALLOC_LIBS)
$(JEMALLOC_LIBS)
$(GRACKLE_LIBS)
# MPI libraries.
MPI_LIBS
=
$(METIS_LIBS)
$(MPI_THREAD_LIBS)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
MPI_LIBS
=
$(METIS_LIBS)
$(GRACKLE_LIBS)
$(MPI_THREAD_LIBS)
MPI_FLAGS
=
-DWITH_MPI
$(METIS_INCS)
$(GRACKLE_INCS)
# Programs.
bin_PROGRAMS
=
swift
...
...
src/cooling/grackle/grackle_wrapper.h
View file @
19caca1c
...
...
@@ -13,12 +13,12 @@
#ifndef SWIFT_COOLING_GRACKLE_WRAPPER_H
#define SWIFT_COOLING_GRACKLE_WRAPPER_H
#include
"../../../config.h"
#include
<grackle.h>
#include
<math.h>
#include
<stdio.h>
#include
<stdlib.h>
#include
<string.h>
#include
"config.h"
#include
"error.h"
...
...
src/hydro/Gadget2/hydro_part.h
View file @
19caca1c
...
...
@@ -45,6 +45,9 @@ struct xpart {
/* Velocity at the last full step. */
float
v_full
[
3
];
/* Radiated energy */
float
e_radcool
;
/* Entropy at the last full step. */
float
entropy_full
;
...
...
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