Changeset 716da7 for src/samples/bspline.cpp

Timestamp:

Apr 24, 2012, 2:26:14 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

b51c3b

Parents:

e3dbbf

Message:

Fix energy calculation.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1729 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/samples/bspline.cpp (modified) (3 diffs)

src/samples/bspline.cpp

@@ -29 +29 @@
 
 BSpline::BSpline(const vmg_float& width) :
-  spline_nom(BSPLINE_DEGREE/2+1),
-  spline_denom(BSPLINE_DEGREE/2+1),
-  potential_nom(BSPLINE_DEGREE/2+2),
-  potential_denom(BSPLINE_DEGREE/2+2),
-  intervals(BSPLINE_DEGREE/2+1),
+  spline_nom((BSPLINE_DEGREE+1)/2),
+  spline_denom((BSPLINE_DEGREE+1)/2),
+  potential_nom((BSPLINE_DEGREE+1)/2+1),
+  potential_denom((BSPLINE_DEGREE+1)/2+1),
+  intervals((BSPLINE_DEGREE+1)/2),
   R(width)
 {
@@ -56 +56 @@
 
   potential_nom[1] = Polynomial(5,
-                                2.0*POW(R,5),
-                                -405.0*POW(R,4),
+                                2.0     * POW(R,5),
+                                -405.0  * POW(R,4),
                                 0.0,
-                                810.0*POW(R,2),
-                                -810.0*R,
+                                810.0   * POW(R,2),
+                                -810.0  * R,
                                 243.0);
 
@@ -69 +69 @@
   potential_denom[2] = Polynomial(0, 1.0);
 
-  antid = 13.0 / 48.0 * R;
+  antid = 39.0 / (16.0 * R);
+
+#elif BSPLINE_DEGREE == 6
+
+  spline_nom[0] = Polynomial(5,
+                             297.0     * POW(R,5),
+                             0.0,
+                             -2430.0   * POW(R,3),
+                             0.0,
+                             10935.0   * R,
+                             -10935.0);
+
+  spline_nom[1] = Polynomial(5,
+                             459.0    * POW(R,5),
+                             2025.0   * POW(R,4),
+                             -17010.0 * POW(R,3),
+                             36450.0  * POW(R,2),
+                             -32805.0 * R,
+                             10935.0);
+
+  spline_nom[2] = Polynomial(5,
+                             2187.0   * POW(R,5),
+                             -10935.0 * POW(R,4),
+                             21870.0  * POW(R,3),
+                             -21870.0 * POW(R,2),
+                             10935.0  * R,
+                             -2187.0);
+
+  spline_denom[0] = Polynomial(0, 20.0 * Math::pi * POW(R,8));
+  spline_denom[1] = Polynomial(0, 40.0 * Math::pi * POW(R,8));
+  spline_denom[2] = Polynomial(0, 40.0 * Math::pi * POW(R,8));
+
+  potential_nom[0] = Polynomial(8,
+                                0.0,
+                                -956.0   * POW(R,7),
+                                0.0,
+                                2772.0   * POW(R,5),
+                                0.0,
+                                -6804.0  * POW(R,3),
+                                0.0,
+                                14580.0  * R,
+                                -10935.0);
+
+  potential_nom[1] = Polynomial(8,
+                                -5.0      * POW(R,8),
+                                -5676.0   * POW(R,7),
+                                0.0,
+                                12852.0   * POW(R,5),
+                                28350.0   * POW(R,4),
+                                -142884.0 * POW(R,3),
+                                204120.0  * POW(R,2),
+                                -131220.0 * R,
+                                32805.0);
+
+  potential_nom[2] = Polynomial(8,
+                                169.0    * POW(R,8),
+                                -2916.0  * POW(R,7),
+                                0.0,
+                                20412.0  * POW(R,5),
+                                -51030.0 * POW(R,4),
+                                61236.0  * POW(R,3),
+                                -40824.0 * POW(R,2),
+                                14580.0  * R,
+                                -2187.0);
+
+  potential_nom[3]  = Polynomial(0, -1.0);
+
+  potential_denom[0] = Polynomial(0, 280.0 * POW(R,8));
+  potential_denom[1] = Polynomial(0, 1680.0 * POW(R,8));
+  potential_denom[2] = Polynomial(0, 560.0 * POW(R,8));
+  potential_denom[3] = Polynomial(0, 0.0);
+
+  antid = 239.0 / (70.0 * R);
 
 #else
-#error B-Spline degree not supported. Choose 3.
+#error B-Spline degree not supported. Choose 3 or 6.
 #endif /* BSPLINE_DEGREE */
 }