changes to abandon tparam-dim WIP

cpp/splinepy/explicit/CMakeLists.txt

@@ -1,26 +1,6 @@
 set(SPLINELIB_SOURCES
-        splinelib/b_spline_explicit1.cpp
-        splinelib/b_spline_explicit2.cpp
-        splinelib/b_spline_explicit3.cpp
-        splinelib/nurbs_explicit1.cpp
-        splinelib/nurbs_explicit2.cpp
-        splinelib/nurbs_explicit3.cpp
-)
-set(SPLINELIB_MORE_SOURCES
-        splinelib/b_spline_explicit4.cpp
-        splinelib/b_spline_explicit5.cpp
-        splinelib/b_spline_explicit6.cpp
-        splinelib/b_spline_explicit7.cpp
-        splinelib/b_spline_explicit8.cpp
-        splinelib/b_spline_explicit9.cpp
-        splinelib/b_spline_explicit10.cpp
-        splinelib/nurbs_explicit4.cpp
-        splinelib/nurbs_explicit5.cpp
-        splinelib/nurbs_explicit6.cpp
-        splinelib/nurbs_explicit7.cpp
-        splinelib/nurbs_explicit8.cpp
-        splinelib/nurbs_explicit9.cpp
-        splinelib/nurbs_explicit10.cpp
+        splinelib/b_spline_explicit.cpp
+        splinelib/nurbs_explicit.cpp
 )
 
 set(BEZMAN_SOURCES
@@ -55,12 +35,8 @@ set(SPLINEPY_SOURCES
         splinepy/rational_bezier_explicit1.cpp
         splinepy/rational_bezier_explicit2.cpp
         splinepy/rational_bezier_explicit3.cpp
-        splinepy/bspline_explicit1.cpp
-        splinepy/bspline_explicit2.cpp
-        splinepy/bspline_explicit3.cpp
-        splinepy/nurbs_explicit1.cpp
-        splinepy/nurbs_explicit2.cpp
-        splinepy/nurbs_explicit3.cpp
+        splinepy/bspline_explicit.cpp
+        splinepy/nurbs_explicit.cpp
 )
 set(SPLINEPY_MORE_SOURCES
         splinepy/bezier_explicit4.cpp
@@ -77,20 +53,6 @@ set(SPLINEPY_MORE_SOURCES
         splinepy/rational_bezier_explicit8.cpp
         splinepy/rational_bezier_explicit9.cpp
         splinepy/rational_bezier_explicit10.cpp
-        splinepy/bspline_explicit4.cpp
-        splinepy/bspline_explicit5.cpp
-        splinepy/bspline_explicit6.cpp
-        splinepy/bspline_explicit7.cpp
-        splinepy/bspline_explicit8.cpp
-        splinepy/bspline_explicit9.cpp
-        splinepy/bspline_explicit10.cpp
-        splinepy/nurbs_explicit4.cpp
-        splinepy/nurbs_explicit5.cpp
-        splinepy/nurbs_explicit6.cpp
-        splinepy/nurbs_explicit7.cpp
-        splinepy/nurbs_explicit8.cpp
-        splinepy/nurbs_explicit9.cpp
-        splinepy/nurbs_explicit10.cpp
 )
 
 set(EXPLICIT_SOURCES

cpp/splinepy/explicit/splinelib/b_spline_explicit.cpp

@@ -0,0 +1,13 @@
+#include "BSplineLib/Splines/b_spline.hpp"
+template class bsplinelib::splines::BSpline<1>;
+template class bsplinelib::splines::BSpline<2>;
+template class bsplinelib::splines::BSpline<3>;
+#ifdef SPLINEPY_MORE
+template class bsplinelib::splines::BSpline<4>;
+template class bsplinelib::splines::BSpline<5>;
+template class bsplinelib::splines::BSpline<6>;
+template class bsplinelib::splines::BSpline<7>;
+template class bsplinelib::splines::BSpline<8>;
+template class bsplinelib::splines::BSpline<9>;
+template class bsplinelib::splines::BSpline<10>;
+#endif

cpp/splinepy/explicit/splinelib/b_spline_extern.hpp

@@ -2,120 +2,17 @@
 #include "BSplineLib/Splines/b_spline.hpp"
 
 #ifdef SPLINEPY_BUILD_EXPLICIT
-extern template class bsplinelib::splines::BSpline<1, 1>;
-extern template class bsplinelib::splines::BSpline<1, 2>;
-extern template class bsplinelib::splines::BSpline<1, 3>;
+extern template class bsplinelib::splines::BSpline<1>;
+extern template class bsplinelib::splines::BSpline<2>;
+extern template class bsplinelib::splines::BSpline<3>;
 #ifdef SPLINEPY_MORE
-extern template class bsplinelib::splines::BSpline<1, 4>;
-extern template class bsplinelib::splines::BSpline<1, 5>;
-extern template class bsplinelib::splines::BSpline<1, 6>;
-extern template class bsplinelib::splines::BSpline<1, 7>;
-extern template class bsplinelib::splines::BSpline<1, 8>;
-extern template class bsplinelib::splines::BSpline<1, 9>;
-extern template class bsplinelib::splines::BSpline<1, 10>;
-#endif
-
-extern template class bsplinelib::splines::BSpline<2, 1>;
-extern template class bsplinelib::splines::BSpline<2, 2>;
-extern template class bsplinelib::splines::BSpline<2, 3>;
-#ifdef SPLINEPY_MORE
-extern template class bsplinelib::splines::BSpline<2, 4>;
-extern template class bsplinelib::splines::BSpline<2, 5>;
-extern template class bsplinelib::splines::BSpline<2, 6>;
-extern template class bsplinelib::splines::BSpline<2, 7>;
-extern template class bsplinelib::splines::BSpline<2, 8>;
-extern template class bsplinelib::splines::BSpline<2, 9>;
-extern template class bsplinelib::splines::BSpline<2, 10>;
-#endif
-
-extern template class bsplinelib::splines::BSpline<3, 1>;
-extern template class bsplinelib::splines::BSpline<3, 2>;
-extern template class bsplinelib::splines::BSpline<3, 3>;
-#ifdef SPLINEPY_MORE
-extern template class bsplinelib::splines::BSpline<3, 4>;
-extern template class bsplinelib::splines::BSpline<3, 5>;
-extern template class bsplinelib::splines::BSpline<3, 6>;
-extern template class bsplinelib::splines::BSpline<3, 7>;
-extern template class bsplinelib::splines::BSpline<3, 8>;
-extern template class bsplinelib::splines::BSpline<3, 9>;
-extern template class bsplinelib::splines::BSpline<3, 10>;
-
-extern template class bsplinelib::splines::BSpline<4, 1>;
-extern template class bsplinelib::splines::BSpline<4, 2>;
-extern template class bsplinelib::splines::BSpline<4, 3>;
-extern template class bsplinelib::splines::BSpline<4, 4>;
-extern template class bsplinelib::splines::BSpline<4, 5>;
-extern template class bsplinelib::splines::BSpline<4, 6>;
-extern template class bsplinelib::splines::BSpline<4, 7>;
-extern template class bsplinelib::splines::BSpline<4, 8>;
-extern template class bsplinelib::splines::BSpline<4, 9>;
-extern template class bsplinelib::splines::BSpline<4, 10>;
-
-extern template class bsplinelib::splines::BSpline<5, 1>;
-extern template class bsplinelib::splines::BSpline<5, 2>;
-extern template class bsplinelib::splines::BSpline<5, 3>;
-extern template class bsplinelib::splines::BSpline<5, 4>;
-extern template class bsplinelib::splines::BSpline<5, 5>;
-extern template class bsplinelib::splines::BSpline<5, 6>;
-extern template class bsplinelib::splines::BSpline<5, 7>;
-extern template class bsplinelib::splines::BSpline<5, 8>;
-extern template class bsplinelib::splines::BSpline<5, 9>;
-extern template class bsplinelib::splines::BSpline<5, 10>;
-
-extern template class bsplinelib::splines::BSpline<6, 1>;
-extern template class bsplinelib::splines::BSpline<6, 2>;
-extern template class bsplinelib::splines::BSpline<6, 3>;
-extern template class bsplinelib::splines::BSpline<6, 4>;
-extern template class bsplinelib::splines::BSpline<6, 5>;
-extern template class bsplinelib::splines::BSpline<6, 6>;
-extern template class bsplinelib::splines::BSpline<6, 7>;
-extern template class bsplinelib::splines::BSpline<6, 8>;
-extern template class bsplinelib::splines::BSpline<6, 9>;
-extern template class bsplinelib::splines::BSpline<6, 10>;
-
-extern template class bsplinelib::splines::BSpline<7, 1>;
-extern template class bsplinelib::splines::BSpline<7, 2>;
-extern template class bsplinelib::splines::BSpline<7, 3>;
-extern template class bsplinelib::splines::BSpline<7, 4>;
-extern template class bsplinelib::splines::BSpline<7, 5>;
-extern template class bsplinelib::splines::BSpline<7, 6>;
-extern template class bsplinelib::splines::BSpline<7, 7>;
-extern template class bsplinelib::splines::BSpline<7, 8>;
-extern template class bsplinelib::splines::BSpline<7, 9>;
-extern template class bsplinelib::splines::BSpline<7, 10>;
-
-extern template class bsplinelib::splines::BSpline<8, 1>;
-extern template class bsplinelib::splines::BSpline<8, 2>;
-extern template class bsplinelib::splines::BSpline<8, 3>;
-extern template class bsplinelib::splines::BSpline<8, 4>;
-extern template class bsplinelib::splines::BSpline<8, 5>;
-extern template class bsplinelib::splines::BSpline<8, 6>;
-extern template class bsplinelib::splines::BSpline<8, 7>;
-extern template class bsplinelib::splines::BSpline<8, 8>;
-extern template class bsplinelib::splines::BSpline<8, 9>;
-extern template class bsplinelib::splines::BSpline<8, 10>;
-
-extern template class bsplinelib::splines::BSpline<9, 1>;
-extern template class bsplinelib::splines::BSpline<9, 2>;
-extern template class bsplinelib::splines::BSpline<9, 3>;
-extern template class bsplinelib::splines::BSpline<9, 4>;
-extern template class bsplinelib::splines::BSpline<9, 5>;
-extern template class bsplinelib::splines::BSpline<9, 6>;
-extern template class bsplinelib::splines::BSpline<9, 7>;
-extern template class bsplinelib::splines::BSpline<9, 8>;
-extern template class bsplinelib::splines::BSpline<9, 9>;
-extern template class bsplinelib::splines::BSpline<9, 10>;
-
-extern template class bsplinelib::splines::BSpline<10, 1>;
-extern template class bsplinelib::splines::BSpline<10, 2>;
-extern template class bsplinelib::splines::BSpline<10, 3>;
-extern template class bsplinelib::splines::BSpline<10, 4>;
-extern template class bsplinelib::splines::BSpline<10, 5>;
-extern template class bsplinelib::splines::BSpline<10, 6>;
-extern template class bsplinelib::splines::BSpline<10, 7>;
-extern template class bsplinelib::splines::BSpline<10, 8>;
-extern template class bsplinelib::splines::BSpline<10, 9>;
-extern template class bsplinelib::splines::BSpline<10, 10>;
+extern template class bsplinelib::splines::BSpline<4>;
+extern template class bsplinelib::splines::BSpline<5>;
+extern template class bsplinelib::splines::BSpline<6>;
+extern template class bsplinelib::splines::BSpline<7>;
+extern template class bsplinelib::splines::BSpline<8>;
+extern template class bsplinelib::splines::BSpline<9>;
+extern template class bsplinelib::splines::BSpline<10>;
 #endif
 
 #endif

cpp/splinepy/explicit/splinelib/nurbs_explicit.cpp

@@ -0,0 +1,13 @@
+#include "BSplineLib/Splines/nurbs.hpp"
+template class bsplinelib::splines::Nurbs<1>;
+template class bsplinelib::splines::Nurbs<2>;
+template class bsplinelib::splines::Nurbs<3>;
+#ifdef SPLINEPY_MORE
+template class bsplinelib::splines::Nurbs<4>;
+template class bsplinelib::splines::Nurbs<5>;
+template class bsplinelib::splines::Nurbs<6>;
+template class bsplinelib::splines::Nurbs<7>;
+template class bsplinelib::splines::Nurbs<8>;
+template class bsplinelib::splines::Nurbs<9>;
+template class bsplinelib::splines::Nurbs<10>;
+#endif