Tidy up

FEniCS · Nov 15, 2024 · ff1dfaa · ff1dfaa
1 parent eec2489
commit ff1dfaa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/cpp/basix/dof-transformations.cpp b/cpp/basix/dof-transformations.cpp
@@ -423,21 +423,9 @@ std::pair<std::vector<T>, std::array<std::size_t, 2>> compute_transformation(
 
   std::vector<T> tabulated_data_b(npts * total_ndofs * vs);
   mdspan_t<T, 3> tabulated_data(tabulated_data_b.data(), npts, total_ndofs, vs);
-  // mdarray_t<T, 3> tabulated_data(npts, total_ndofs, vs);
-
-  // std::vector<T> result_b(polyset_vals.extent(1) * coeffs.extent(0));
-  // mdspan_t<T, 2> result(result_b.data(), polyset_vals.extent(1),
-  //                       coeffs.extent(0));
-
-  std::vector<T> resultT_b(polyset_vals.extent(1) * coeffs.extent(0));
-  mdspan_t<T, 2> resultT(resultT_b.data(), coeffs.extent(0),
-                         polyset_vals.extent(1));
-  // mdarray_t<T, 2> result(polyset_vals.extent(1), coeffs.extent(0));
-
-  // std::cout << "3: transform: " << vs << ", " << coeffs.extent(0) << ", "
-  //           << polyset_vals.extent(1) << ", " << polyset_vals.extent(0)
-  //           << std::endl;
-
+  std::vector<T> result_b(polyset_vals.extent(1) * coeffs.extent(0));
+  mdspan_t<T, 2> result(result_b.data(), coeffs.extent(0),
+                        polyset_vals.extent(1));
   std::vector<T> coeffs_b(coeffs.extent(0) * polyset_vals.extent(0));
   mdspan_t<T, 2> _coeffs(coeffs_b.data(), coeffs.extent(0),
                          polyset_vals.extent(0));
@@ -460,13 +448,13 @@ std::pair<std::vector<T>, std::array<std::size_t, 2>> compute_transformation(
     // c: coeffs.extent(1) x polyset_vals.extent(0)   [k0, k2]
     // p: polyset_vals.extent(0) x polyset_vals.extent(1)  [k2, k1]
 
-    math::dot(_coeffs, polyset_vals, resultT);
+    math::dot(_coeffs, polyset_vals, result);
 
     // std::cout << "4: transform" << std::endl;
 
-    for (std::size_t k0 = 0; k0 < resultT.extent(1); ++k0)
-      for (std::size_t k1 = 0; k1 < resultT.extent(0); ++k1)
-        tabulated_data(k0, k1, j) = resultT(k1, k0);
+    for (std::size_t k0 = 0; k0 < result.extent(1); ++k0)
+      for (std::size_t k1 = 0; k1 < result.extent(0); ++k1)
+        tabulated_data(k0, k1, j) = result(k1, k0);
 
     // for (std::size_t k0 = 0; k0 < result.extent(0); ++k0)
     //   for (std::size_t k1 = 0; k1 < result.extent(1); ++k1)
@@ -502,10 +490,16 @@ std::pair<std::vector<T>, std::array<std::size_t, 2>> compute_transformation(
     for (std::size_t i = 0; i < vs; ++i)
     {
       for (std::size_t k0 = 0; k0 < transform.extent(1); ++k0)
+      {
         for (std::size_t k1 = 0; k1 < transform.extent(0); ++k1)
+        {
           for (std::size_t k2 = 0; k2 < imat.extent(2); ++k2)
+          {
             transform(k1, k0)
                 += imat(k0, i, k2, d) * pushed_data(k2, k1 + dofstart, i);
+          }
+        }
+      }
     }
   }
 

diff --git a/cpp/basix/math.h b/cpp/basix/math.h
@@ -330,6 +330,12 @@ void dot(const U& A, const V& B, W&& C)
   }
   else
   {
+    static_assert(std::is_same_v<typename U::layout_type, std::layout_right>);
+    static_assert(std::is_same_v<typename V::layout_type, std::layout_right>);
+    // static_assert(
+    //     std::is_same_v<typename std::remove_cv<typename W::layout_type>,
+    //                    std::layout_right>);
+
     using T = typename std::decay_t<U>::value_type;
     impl::dot_blas<T>(
         std::span(A.data_handle(), A.size()), {A.extent(0), A.extent(1)},