From 0565697de5ccfd9fd8cfe6707364545d4c2be449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de>
Date: Fri, 11 Nov 2016 15:19:14 +0100
Subject: [PATCH] Fix two more small bugs
---
python/dune/perftool/sumfact/amatrix.py | 5 +++--
python/dune/perftool/sumfact/quadrature.py | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/python/dune/perftool/sumfact/amatrix.py b/python/dune/perftool/sumfact/amatrix.py
index 1f2e81e2..1d3fa814 100644
--- a/python/dune/perftool/sumfact/amatrix.py
+++ b/python/dune/perftool/sumfact/amatrix.py
@@ -204,12 +204,13 @@ def construct_theta(name, transpose, derivative):
polynomials = name_polynomials()
qp = name_oned_quadrature_points()
- access = "j,i" if transpose else "i,j"
+ # access = "j,i" if transpose else "i,j"
basispol = "dp" if derivative else "p"
+ polynomial_access = "i,{}[j]".format(qp) if transpose else "j,{}[i]".format(qp)
return ["for (std::size_t i=0; i<{}; i++){{".format(shape[0]),
" for (std::size_t j=0; j<{}; j++){{".format(shape[1]),
- " {}.colmajoraccess({}) = {}.{}(j,{}[i]);".format(name, access, polynomials, basispol, qp),
+ " {}.colmajoraccess(i,j) = {}.{}({});".format(name, polynomials, basispol, polynomial_access),
" }",
"}"]
diff --git a/python/dune/perftool/sumfact/quadrature.py b/python/dune/perftool/sumfact/quadrature.py
index b59aa21f..dfc6a81d 100644
--- a/python/dune/perftool/sumfact/quadrature.py
+++ b/python/dune/perftool/sumfact/quadrature.py
@@ -7,7 +7,7 @@ from dune.perftool.generation import (backend,
temporary_variable,
)
-from dune.perftool.sumfact.amatrix import (name_number_of_basis_functions_per_direction,
+from dune.perftool.sumfact.amatrix import (name_number_of_quadrature_points_per_direction,
name_oned_quadrature_points,
name_oned_quadrature_weights,
)
@@ -71,7 +71,7 @@ def pymbolic_base_weight():
@iname
def sumfact_quad_iname(d, context):
name = "quad_{}_{}".format(context, d)
- domain(name, name_number_of_basis_functions_per_direction())
+ domain(name, name_number_of_quadrature_points_per_direction())
return name
--
GitLab