From f7aae0028007ad2d984209edfd252b6aea170100 Mon Sep 17 00:00:00 2001
From: Cristian C Lalescu <Cristian.Lalescu@ds.mpg.de>
Date: Fri, 6 Nov 2015 08:08:00 +0100
Subject: [PATCH] rename buffered_vec_field to interpolator
---
bfps/NavierStokes.py | 6 +++---
bfps/cpp/interpolations.cpp | 11 ++++++-----
bfps/cpp/interpolations.hpp | 12 ++++++------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/bfps/NavierStokes.py b/bfps/NavierStokes.py
index 90c84588..643a3d2f 100644
--- a/bfps/NavierStokes.py
+++ b/bfps/NavierStokes.py
@@ -237,10 +237,10 @@ class NavierStokes(bfps.fluid_base.fluid_particle_base):
kcut = None,
neighbours = 1,
name = 'particle_field'):
- self.particle_variables += ('buffered_vec_field<{0}> *vel_{1}, *acc_{1};\n' +
+ self.particle_variables += ('interpolator<{0}> *vel_{1}, *acc_{1};\n' +
'{0} *{1}_tmp;\n').format(self.C_dtype, name)
- self.particle_start += ('vel_{0} = new buffered_vec_field<{1}>(fs, {2});\n' +
- 'acc_{0} = new buffered_vec_field<{1}>(fs, {2});\n' +
+ self.particle_start += ('vel_{0} = new interpolator<{1}>(fs, {2});\n' +
+ 'acc_{0} = new interpolator<{1}>(fs, {2});\n' +
'{0}_tmp = new {1}[acc_{0}->src_descriptor->local_size];\n').format(name, self.C_dtype, neighbours+1)
self.particle_end += ('delete vel_{0};\n' +
'delete acc_{0};\n' +
diff --git a/bfps/cpp/interpolations.cpp b/bfps/cpp/interpolations.cpp
index 350e633a..04f5dd3a 100644
--- a/bfps/cpp/interpolations.cpp
+++ b/bfps/cpp/interpolations.cpp
@@ -27,7 +27,7 @@
#include "interpolations.hpp"
template <class rnumber>
-buffered_vec_field<rnumber>::buffered_vec_field(
+interpolator<rnumber>::interpolator(
fluid_solver_base<rnumber> *fs,
const int bw)
{
@@ -51,14 +51,14 @@ buffered_vec_field<rnumber>::buffered_vec_field(
}
template <class rnumber>
-buffered_vec_field<rnumber>::~buffered_vec_field()
+interpolator<rnumber>::~interpolator()
{
delete[] this->f;
delete this->descriptor;
}
template <class rnumber>
-int buffered_vec_field<rnumber>::read_rFFTW(void *void_src)
+int interpolator<rnumber>::read_rFFTW(void *void_src)
{
rnumber *src = (rnumber*)void_src;
rnumber *dst = this->f;
@@ -118,5 +118,6 @@ int buffered_vec_field<rnumber>::read_rFFTW(void *void_src)
return EXIT_SUCCESS;
}
-template class buffered_vec_field<float>;
-template class buffered_vec_field<double>;
+template class interpolator<float>;
+template class interpolator<double>;
+
diff --git a/bfps/cpp/interpolations.hpp b/bfps/cpp/interpolations.hpp
index 426ac20b..65c017d0 100644
--- a/bfps/cpp/interpolations.hpp
+++ b/bfps/cpp/interpolations.hpp
@@ -34,9 +34,9 @@
#include "spline_n6.hpp"
#include "Lagrange_polys.hpp"
-#ifndef INTERPOLATIONS
+#ifndef INTERPOLATOR
-#define INTERPOLATIONS
+#define INTERPOLATOR
typedef void (*base_polynomial_values)(
int derivative,
@@ -44,7 +44,7 @@ typedef void (*base_polynomial_values)(
double *destination);
template <class rnumber>
-class buffered_vec_field
+class interpolator
{
public:
int buffer_width;
@@ -53,14 +53,14 @@ class buffered_vec_field
field_descriptor<rnumber> *src_descriptor;
rnumber *f;
- buffered_vec_field(
+ interpolator(
fluid_solver_base<rnumber> *FSOLVER,
const int BUFFER_WIDTH);
- ~buffered_vec_field();
+ ~interpolator();
/* destroys input */
int read_rFFTW(void *src);
};
-#endif//INTERPOLATIONS
+#endif//INTERPOLATOR
--
GitLab