QUAD: changed type to enum class, containing S and Q so far

Author: pancetta

include/pfasst/encap/imex_sweeper.hpp

@@ -199,9 +199,9 @@ namespace pfasst
           auto is_proper = this->get_is_proper();
           assert(nodes.size() >= 1);
 
-          this->s_mat = compute_quadrature(nodes, nodes, is_proper, 's');
+          this->s_mat = compute_quadrature(nodes, nodes, is_proper, QuadratureMatrix::S);
 
-          auto q_mat = compute_quadrature(nodes, nodes, is_proper, 'q');
+          auto q_mat = compute_quadrature(nodes, nodes, is_proper, QuadratureMatrix::Q);
           this->b_mat = matrix<time>(1, nodes.size());
           for (size_t m = 0; m < nodes.size(); m++) {
             this->b_mat(0, m) = q_mat(nodes.size() - 2, m);

include/pfasst/quadrature.hpp

@@ -227,10 +227,11 @@ namespace pfasst
     return pair<vector<node>, vector<bool>>(nodes, is_proper);
   }
 
-
+//  enum class QuadratureMatrix {S, Q, QQ}; // returning QQ might be cool for 2nd-order stuff
+    enum class QuadratureMatrix {S,Q};
   template<typename node = time_precision>
   matrix<node> compute_quadrature(vector<node> dst, vector<node> src, vector<bool> is_proper,
-                                  char type)
+                                  QuadratureMatrix type)
   {
     const size_t ndst = dst.size();
     const size_t nsrc = src.size();
@@ -247,7 +248,7 @@ namespace pfasst
       p[0] = 1.0;
       for (size_t j = 1; j < nsrc + 1; j++) { p[j] = 0.0; }
       for (size_t m = 0; m < nsrc; m++) {
-        if ((!is_proper[m]) || (m == i)) { continue; }
+      if ((!is_proper[m]) || (m == i)) { continue; }
 
         // p_{m+1}(x) = (x - x_j) * p_m(x)
         p1[0] = 0.0;
@@ -261,12 +262,14 @@ namespace pfasst
       auto P = p.integrate();
       for (size_t j = 1; j < ndst; j++) {
         node q = 0.0;
-        if (type == 's') {
-          q = P.evaluate(dst[j]) - P.evaluate(dst[j - 1]);
+        if (type == QuadratureMatrix::S) {
+            q = P.evaluate(dst[j]) - P.evaluate(dst[j - 1]);
+        } else if (type == QuadratureMatrix::Q) {
+            q = P.evaluate(dst[j]) - P.evaluate(0.0);
         } else {
-          q = P.evaluate(dst[j]) - P.evaluate(0.0);
+            throw ValueError("Further matrix types are not implemented yet");
         }
-
+          
         mat(j - 1, i) = q / den;
       }
     }

tests/test_quadrature.cpp

@@ -223,20 +223,20 @@ TEST(QuadratureTest, GaussLobattoNodes)
 {
   auto l3 = pfasst::compute_nodes<long double>(3, "gauss-lobatto");
   auto a3 = pfasst::augment_nodes(l3);
-  auto s3 = pfasst::compute_quadrature(get<0>(a3), get<0>(a3), get<1>(a3), 's');
+  auto s3 = pfasst::compute_quadrature(get<0>(a3), get<0>(a3), get<1>(a3), pfasst::QuadratureMatrix::S);
   const long double s3e[6] = { 0.20833333333333333,
                                0.33333333333333333,
                                -0.04166666666666666,
                                -0.04166666666666666,
                                0.33333333333333333,
                                0.20833333333333333
                              };
-
+    
   EXPECT_THAT(s3.data(), testing::Pointwise(DoubleNear(), s3e));
 
   auto l5 = pfasst::compute_nodes<long double>(5, "gauss-lobatto");
   auto a5 = pfasst::augment_nodes(l5);
-  auto s5 = pfasst::compute_quadrature(get<0>(a5), get<0>(a5), get<1>(a5), 's');
+  auto s5 = pfasst::compute_quadrature(get<0>(a5), get<0>(a5), get<1>(a5), pfasst::QuadratureMatrix::S);
   const long double s5e[] = { 0.067728432186156897969267419174073482,
                               0.11974476934341168251615379970493965,
                               -0.021735721866558113665511351745074292,
@@ -265,7 +265,7 @@ TEST(QuadratureTest, ClenshawCurtisNodes)
 {
   auto c4 = pfasst::compute_nodes<long double>(4, "clenshaw-curtis");
   auto a4 = pfasst::augment_nodes(c4);
-  auto s4 = pfasst::compute_quadrature(get<0>(a4), get<0>(a4), get<1>(a4), 's');
+  auto s4 = pfasst::compute_quadrature(get<0>(a4), get<0>(a4), get<1>(a4), pfasst::QuadratureMatrix::S);
   const long double s4e[] = { 0.10243055555555555555555555555555556,
                               0.16319444444444444444444444444444444,
                               -0.024305555555555555555555555555555556,