diff --git a/bfps/cpp/interpolator.hpp b/bfps/cpp/interpolator.hpp index 299fef4910693b878d3f2734636b43dbf8f98a6d..e083bd56c6c27c1cc048d0ecfdfb7ee416082651 100644 --- a/bfps/cpp/interpolator.hpp +++ b/bfps/cpp/interpolator.hpp @@ -27,23 +27,12 @@ #include "field_descriptor.hpp" #include "fftw_tools.hpp" #include "fluid_solver_base.hpp" -#include "spline_n1.hpp" -#include "spline_n2.hpp" -#include "spline_n3.hpp" -#include "spline_n4.hpp" -#include "spline_n5.hpp" -#include "spline_n6.hpp" -#include "Lagrange_polys.hpp" +#include "interpolator_base.hpp" #ifndef INTERPOLATOR #define INTERPOLATOR -typedef void (*base_polynomial_values)( - const int derivative, - const double fraction, - double *__restrict__ destination); - template <class rnumber, int interp_neighbours> class interpolator { diff --git a/bfps/cpp/rFFTW_interpolator.hpp b/bfps/cpp/rFFTW_interpolator.hpp index 0864bd964b77b5b3527a58898b8c22da63c33c2e..154296018926202bb53367e4313510079343c4b8 100644 --- a/bfps/cpp/rFFTW_interpolator.hpp +++ b/bfps/cpp/rFFTW_interpolator.hpp @@ -27,14 +27,7 @@ #include "field_descriptor.hpp" #include "fftw_tools.hpp" #include "fluid_solver_base.hpp" -#include "spline_n1.hpp" -#include "spline_n2.hpp" -#include "spline_n3.hpp" -#include "spline_n4.hpp" -#include "spline_n5.hpp" -#include "spline_n6.hpp" -#include "Lagrange_polys.hpp" -#include "interpolator.hpp" +#include "interpolator_base.hpp" #ifndef RFFTW_INTERPOLATOR diff --git a/setup.py b/setup.py index 3fdf80d57f41f6620de62d62ce25c00f6603e3b4..b4741ad14e5e7c1ef662a700a7a6cda6c11af698 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,10 @@ src_file_list = ['field_descriptor', 'spline_n6', 'Lagrange_polys'] -header_list = ['cpp/base.hpp'] + ['cpp/' + fname + '.hpp' for fname in src_file_list] +header_list = (['cpp/base.hpp', + 'cpp/interpolator_base.hpp'] + + ['cpp/' + fname + '.hpp' + for fname in src_file_list]) with open('MANIFEST.in', 'w') as manifest_in_file: for fname in ['bfps/cpp/' + fname + '.cpp' for fname in src_file_list] + header_list: