Skip to content
Snippets Groups Projects
Commit 99ba8af4 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

move base_poly_val typedef to interpolator_base

this way, rFFTW_interpolator no longer needs to include interpolator.
which will help with splitting the library.
parent 0c730787
No related branches found
No related tags found
No related merge requests found
...@@ -27,23 +27,12 @@ ...@@ -27,23 +27,12 @@
#include "field_descriptor.hpp" #include "field_descriptor.hpp"
#include "fftw_tools.hpp" #include "fftw_tools.hpp"
#include "fluid_solver_base.hpp" #include "fluid_solver_base.hpp"
#include "spline_n1.hpp" #include "interpolator_base.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"
#ifndef INTERPOLATOR #ifndef INTERPOLATOR
#define INTERPOLATOR #define INTERPOLATOR
typedef void (*base_polynomial_values)(
const int derivative,
const double fraction,
double *__restrict__ destination);
template <class rnumber, int interp_neighbours> template <class rnumber, int interp_neighbours>
class interpolator class interpolator
{ {
......
...@@ -27,14 +27,7 @@ ...@@ -27,14 +27,7 @@
#include "field_descriptor.hpp" #include "field_descriptor.hpp"
#include "fftw_tools.hpp" #include "fftw_tools.hpp"
#include "fluid_solver_base.hpp" #include "fluid_solver_base.hpp"
#include "spline_n1.hpp" #include "interpolator_base.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"
#ifndef RFFTW_INTERPOLATOR #ifndef RFFTW_INTERPOLATOR
......
...@@ -81,7 +81,10 @@ src_file_list = ['field_descriptor', ...@@ -81,7 +81,10 @@ src_file_list = ['field_descriptor',
'spline_n6', 'spline_n6',
'Lagrange_polys'] '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: with open('MANIFEST.in', 'w') as manifest_in_file:
for fname in ['bfps/cpp/' + fname + '.cpp' for fname in src_file_list] + header_list: for fname in ['bfps/cpp/' + fname + '.cpp' for fname in src_file_list] + header_list:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment