Update particle spline classes up to 10

bfps/cpp/particles/particles_interp_spline.hpp

@@ -4,7 +4,7 @@
 template <class real_number, int interp_neighbours, int mode>
 class particles_interp_spline;
 
-#include "spline_n1.hpp"
+#include "spline.hpp"
 
 template <>
 class particles_interp_spline<double, 1,0>{
@@ -36,8 +36,6 @@ public:
     }
 };
 
-#include "spline_n2.hpp"
-
 template <>
 class particles_interp_spline<double, 2,0>{
 public:
@@ -68,8 +66,6 @@ public:
     }
 };
 
-#include "spline_n3.hpp"
-
 template <>
 class particles_interp_spline<double, 3,0>{
 public:
@@ -100,8 +96,6 @@ public:
     }
 };
 
-#include "spline_n4.hpp"
-
 template <>
 class particles_interp_spline<double, 4,0>{
 public:
@@ -132,8 +126,6 @@ public:
     }
 };
 
-#include "spline_n5.hpp"
-
 template <>
 class particles_interp_spline<double, 5,0>{
 public:
@@ -164,7 +156,6 @@ public:
     }
 };
 
-#include "spline_n6.hpp"
 
 template <>
 class particles_interp_spline<double, 6,0>{
@@ -197,5 +188,127 @@ public:
 };
 
 
+template <>
+class particles_interp_spline<double, 7,0>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n7_m0(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 7,1>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n7_m1(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 7,2>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n7_m2(in_derivative, in_part_val, poly_val);
+    }
+};
+
+
+template <>
+class particles_interp_spline<double, 8,0>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n8_m0(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 8,1>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n8_m1(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 8,2>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n8_m2(in_derivative, in_part_val, poly_val);
+    }
+};
+
+
+template <>
+class particles_interp_spline<double, 9,0>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n9_m0(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 9,1>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n9_m1(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 9,2>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n9_m2(in_derivative, in_part_val, poly_val);
+    }
+};
+
+
+template <>
+class particles_interp_spline<double, 10,0>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n10_m0(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 10,1>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n10_m1(in_derivative, in_part_val, poly_val);
+    }
+};
+
+template <>
+class particles_interp_spline<double, 10,2>{
+public:
+    using real_number = double;
+
+    void compute_beta(const int in_derivative, const double in_part_val, double poly_val[]) const {
+        beta_n10_m2(in_derivative, in_part_val, poly_val);
+    }
+};
 
 #endif

setup.py

@@ -113,6 +113,10 @@ src_file_list = ['full_code/direct_numerical_simulation',
                  'spline_n4',
                  'spline_n5',
                  'spline_n6',
+                 'spline_n7',
+                 'spline_n8',
+                 'spline_n9',
+                 'spline_n10',
                  'Lagrange_polys',
                  'scope_timer']
 
@@ -141,6 +145,7 @@ header_list = (['cpp/base.hpp'] +
                ['cpp/bfps_timer.hpp'] +
                ['cpp/omputils.hpp'] +
                ['cpp/shared_array.hpp'] +
+               ['cpp/spline.hpp'] +
                ['cpp/' + fname + '.hpp'
                 for fname in src_file_list] +
                particle_headers +

tests/DNS/test_basic.py

 from bfps.DNS import DNS
 import numpy as np
 import h5py
+import sys
 
 
 def main():
@@ -21,7 +22,8 @@ def main():
              '--nparticles', '{0}'.format(nparticles),
              '--particle-rand-seed', '2',
              '--njobs', '{0}'.format(njobs),
-             '--wd', './'])
+             '--wd', './'] + 
+             sys.argv[1:] )
     return None
 
 if __name__ == '__main__':