From 768c16d642c5a6d1a75e0de00c89fc2a0b019547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Fritze?= <rene.fritze@wwu.de>
Date: Thu, 27 Aug 2020 10:59:10 +0200
Subject: [PATCH] adjust python bindings for combined functions
---
python/dune/xt/functions/base/combined-grid-function.hh | 8 ++++----
python/dune/xt/functions/function-interface-1d.cc | 6 +++---
python/dune/xt/functions/function-interface-2d.cc | 6 +++---
python/dune/xt/functions/function-interface-3d.cc | 6 +++---
python/dune/xt/functions/function-interface.hh | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/python/dune/xt/functions/base/combined-grid-function.hh b/python/dune/xt/functions/base/combined-grid-function.hh
index 1905ef748..2dc2b80e0 100644
--- a/python/dune/xt/functions/base/combined-grid-function.hh
+++ b/python/dune/xt/functions/base/combined-grid-function.hh
@@ -113,14 +113,14 @@ template <class G, class E, size_t Lr = 1, size_t LrC = 1, size_t Rr = 1, size_t
class ProductGridFunction
: public GridFunctionInterface<G,
E,
- internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::r,
- internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::rC,
+ internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::r(),
+ internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::rC(),
R>
{
using BaseType = GridFunctionInterface<G,
E,
- internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::r,
- internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::rC,
+ internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::r(),
+ internal::CombinedDim<CombinationType::product, Lr, LrC, Rr, RrC>::rC(),
R>;
using Left = Functions::GridFunctionInterface<E, Lr, LrC, R>;
diff --git a/python/dune/xt/functions/function-interface-1d.cc b/python/dune/xt/functions/function-interface-1d.cc
index 55a48b8fe..a8fc131a5 100644
--- a/python/dune/xt/functions/function-interface-1d.cc
+++ b/python/dune/xt/functions/function-interface-1d.cc
@@ -35,9 +35,9 @@ PYBIND11_MODULE(_functions_function_interface_1d, m)
using namespace Dune::XT::Functions;
- const auto diff = CombinationType::difference;
- const auto sum = CombinationType::sum;
- const auto prod = CombinationType::product;
+ using diff = CombinationType::difference;
+ using sum = CombinationType::sum;
+ using prod = CombinationType::product;
auto i_1_1_1 = bind_FunctionInterface<1, 1, 1>(m);
auto i_1_2_1 = bind_FunctionInterface<1, 2, 1>(m);
diff --git a/python/dune/xt/functions/function-interface-2d.cc b/python/dune/xt/functions/function-interface-2d.cc
index 8342ff43d..d7caf3c8c 100644
--- a/python/dune/xt/functions/function-interface-2d.cc
+++ b/python/dune/xt/functions/function-interface-2d.cc
@@ -35,9 +35,9 @@ PYBIND11_MODULE(_functions_function_interface_2d, m)
using namespace Dune::XT::Functions;
- const auto diff = CombinationType::difference;
- const auto sum = CombinationType::sum;
- const auto prod = CombinationType::product;
+ using diff = CombinationType::difference;
+ using sum = CombinationType::sum;
+ using prod = CombinationType::product;
auto i_2_1_1 = bind_FunctionInterface<2, 1, 1>(m);
auto i_2_2_1 = bind_FunctionInterface<2, 2, 1>(m);
diff --git a/python/dune/xt/functions/function-interface-3d.cc b/python/dune/xt/functions/function-interface-3d.cc
index ff1fe0f65..ee9186738 100644
--- a/python/dune/xt/functions/function-interface-3d.cc
+++ b/python/dune/xt/functions/function-interface-3d.cc
@@ -35,9 +35,9 @@ PYBIND11_MODULE(_functions_function_interface_3d, m)
using namespace Dune::XT::Functions;
- const auto diff = CombinationType::difference;
- const auto sum = CombinationType::sum;
- const auto prod = CombinationType::product;
+ using diff = CombinationType::difference;
+ using sum = CombinationType::sum;
+ using prod = CombinationType::product;
auto i_3_1_1 = bind_FunctionInterface<3, 1, 1>(m);
auto i_3_2_1 = bind_FunctionInterface<3, 2, 1>(m);
diff --git a/python/dune/xt/functions/function-interface.hh b/python/dune/xt/functions/function-interface.hh
index ccfdfde5b..96980eb37 100644
--- a/python/dune/xt/functions/function-interface.hh
+++ b/python/dune/xt/functions/function-interface.hh
@@ -114,7 +114,7 @@ struct get_combined<L, R, CombinationType::product>
template <size_t d,
- CombinationType comb,
+ class comb,
size_t lr,
size_t lrC,
size_t rr,
@@ -147,7 +147,7 @@ bind_combined_Function(pybind11::module& m)
} // ... bind_combined_Function(...)
-template <size_t d, CombinationType comb, size_t r, size_t rC, size_t oR, size_t orC, class C>
+template <size_t d, class comb, size_t r, size_t rC, size_t oR, size_t orC, class C>
void addbind_FunctionInterface_combined_op(C& c)
{
namespace py = pybind11;
--
GitLab