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
3411dd0f
Commit
3411dd0f
authored
Aug 01, 2016
by
Peter W. Draper
Browse files
Fix merge issues and FFTW include files
parent
bbb5dfb8
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cell.c
View file @
3411dd0f
...
...
@@ -792,7 +792,9 @@ void cell_check_multipole(struct cell *c, void *data) {
error
(
"Multipole I_yz are different (%12.15e vs. %12.15e)"
,
ma
.
I_yz
,
mb
.
I_yz
);
}
=======
}
/*
* @brief Frees up the memory allocated for this #cell
*/
void
cell_clean
(
struct
cell
*
c
)
{
...
...
@@ -802,5 +804,4 @@ void cell_clean(struct cell *c) {
/* Recurse */
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
])
cell_clean
(
c
->
progeny
[
k
]);
>>>>>>>
master
}
src/runner_doiact_fft.c
View file @
3411dd0f
...
...
@@ -24,7 +24,7 @@
#include
<pthread.h>
#ifdef HAVE_FFTW
#include
<fftw.h>
#include
<fftw
3
.h>
#endif
/* This object's header. */
...
...
src/version.c
View file @
3411dd0f
...
...
@@ -34,7 +34,7 @@
#endif
#ifdef HAVE_FFTW
#include
<fftw.h>
#include
<fftw
3
.h>
#endif
/* Some standard headers. */
...
...
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