From 99ba8af48013bdab8c06c79e726ec1b45b37e0aa Mon Sep 17 00:00:00 2001
From: Chichi Lalescu <Cristian.Lalescu@ds.mpg.de>
Date: Sun, 3 Jan 2016 18:05:57 +0100
Subject: [PATCH] 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.
---
bfps/cpp/interpolator.hpp | 13 +------------
bfps/cpp/rFFTW_interpolator.hpp | 9 +--------
setup.py | 5 ++++-
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/bfps/cpp/interpolator.hpp b/bfps/cpp/interpolator.hpp
index 299fef49..e083bd56 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 0864bd96..15429601 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 3fdf80d5..b4741ad1 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:
--
GitLab