Commit 3411dd0f authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Fix merge issues and FFTW include files

parent bbb5dfb8
......@@ -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
}
......@@ -24,7 +24,7 @@
#include <pthread.h>
#ifdef HAVE_FFTW
#include <fftw.h>
#include <fftw3.h>
#endif
/* This object's header. */
......
......@@ -34,7 +34,7 @@
#endif
#ifdef HAVE_FFTW
#include <fftw.h>
#include <fftw3.h>
#endif
/* Some standard headers. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment