Merge branch 'issue/add_operators' into 'master'

Correct naming of operator in addOperator() function of LinearForm and BiLinearForm

See merge request !253

amdis/BiLinearForm.hpp

@@ -98,7 +98,7 @@ namespace AMDiS
      * \tparam ContextTag  One of \ref tag::element_operator, \ref tag::intersection_operator
      *                     or \ref tag::boundary_operator indicating where to assemble
      *                     this operator.
-     * \tparam Expr        An pre-operator that can be bound to a gridView, or a valid
+     * \tparam Operator    A (pre-)operator that can be bound to a gridView, or a valid
      *                     GridOperator.
      * \tparam row         A tree-path for the RowBasis
      * \tparam col         A tree-path for the ColBasis
@@ -107,23 +107,23 @@ namespace AMDiS
      * [[expects: col is valid tree-path in ColBasis]]
      * @{
      **/
-    template <class ContextTag, class Expr, class Row, class Col>
-    void addOperator(ContextTag contextTag, Expr const& expr, Row row, Col col);
+    template <class ContextTag, class Operator, class Row, class Col>
+    void addOperator(ContextTag contextTag, Operator const& op, Row row, Col col);
 
     // Add an operator to be assembled on the elements of the grid
-    template <class Expr, class Row = RootTreePath, class Col = RootTreePath>
-    void addOperator(Expr const& expr, Row row = {}, Col col = {})
+    template <class Operator, class Row = RootTreePath, class Col = RootTreePath>
+    void addOperator(Operator const& op, Row row = {}, Col col = {})
     {
       using E = typename RowBasis::LocalView::Element;
-      addOperator(tag::element_operator<E>{}, expr, row, col);
+      addOperator(tag::element_operator<E>{}, op, row, col);
     }
 
     // Add an operator to be assembled on the intersections of the grid
-    template <class Expr, class Row = RootTreePath, class Col = RootTreePath>
-    void addIntersectionOperator(Expr const& expr, Row row = {}, Col col = {})
+    template <class Operator, class Row = RootTreePath, class Col = RootTreePath>
+    void addIntersectionOperator(Operator const& op, Row row = {}, Col col = {})
     {
       using I = typename RowBasis::LocalView::GridView::Intersection;
-      addOperator(tag::intersection_operator<I>{}, expr, row, col);
+      addOperator(tag::intersection_operator<I>{}, op, row, col);
     }
     /// @}
 

amdis/LinearForm.hpp

@@ -68,30 +68,30 @@ namespace AMDiS
      * \tparam ContextTag  One of \ref tag::element_operator, \ref tag::intersection_operator
      *                     or \ref tag::boundary_operator indicating where to assemble
      *                     this operator.
-     * \tparam Expr        An pre-operator that can be bound to a gridView, or a valid
+     * \tparam Operator    An (pre-)operator that can be bound to a gridView, or a valid
      *                     GridOperator.
      * \tparam path        A tree-path for the Basis
      *
      * [[expects: path is valid tree-path in Basis]]
      * @{
      **/
-    template <class ContextTag, class Expr, class TreePath>
-    void addOperator(ContextTag contextTag, Expr const& expr, TreePath path);
+    template <class ContextTag, class Operator, class TreePath>
+    void addOperator(ContextTag contextTag, Operator const& op, TreePath path);
 
     // Add an operator to be assembled on the elements of the grid
-    template <class Expr, class TreePath = RootTreePath>
-    void addOperator(Expr const& expr, TreePath path = {})
+    template <class Operator, class TreePath = RootTreePath>
+    void addOperator(Operator const& op, TreePath path = {})
     {
       using E = typename GlobalBasis::LocalView::Element;
-      addOperator(tag::element_operator<E>{}, expr, path);
+      addOperator(tag::element_operator<E>{}, op, path);
     }
 
     // Add an operator to be assembled on the intersections of the grid
-    template <class Expr, class TreePath = RootTreePath>
-    void addIntersectionOperator(Expr const& expr, TreePath path = {})
+    template <class Operator, class TreePath = RootTreePath>
+    void addIntersectionOperator(Operator const& op, TreePath path = {})
     {
       using I = typename GlobalBasis::LocalView::GridView::Intersection;
-      addOperator(tag::intersection_operator<I>{}, expr, path);
+      addOperator(tag::intersection_operator<I>{}, op, path);
     }
     /// @}