Merge branch 'issue/assemble_condition' into 'master'

Add correct break condition to operator-list assemble method

See merge request !265

amdis/OperatorList.hpp

@@ -83,7 +83,7 @@ namespace AMDiS
                     Container& matVec) const
       {
         // do not assemble in case nothing to do
-        if ((assembled_ && !changing_) || element_.empty())
+        if ((assembled_ && !changing_) || empty())
           return;
 
         // create a context for the element
@@ -94,26 +94,26 @@ namespace AMDiS
         for (auto const& op : element_)
           op.assemble(elementContext, nodes..., matVec);
 
-        if (!intersection_.empty() ||
-           (!boundary_.empty() && context.element().hasBoundaryIntersections()))
+        if (intersection_.empty() && (boundary_.empty() || !context.element().hasBoundaryIntersections()))
+          return;
+
+        // assemble intersection operators
+        for (auto const& is : intersections(context.gridView(), context.element()))
         {
-          for (auto const& is : intersections(context.gridView(), context.element()))
-          {
-            // create a context for the intersection
-            ContextGeometry intersectionContext{is,
-              context.element(), context.geometry()};
-
-            if (is.boundary()) {
-              // assemble boundary operators
-              for (auto& data : boundary_) {
-                if (data.bs(is))
-                  data.op.assemble(intersectionContext, nodes..., matVec);
-              }
-            } else {
-              // assemble intersection operators
-              for (auto& op : intersection_)
-                op.assemble(intersectionContext, nodes..., matVec);
+          // create a context for the intersection
+          ContextGeometry intersectionContext{is,
+            context.element(), context.geometry()};
+
+          if (is.boundary()) {
+            // assemble boundary operators
+            for (auto& data : boundary_) {
+              if (data.bs(is))
+                data.op.assemble(intersectionContext, nodes..., matVec);
             }
+          } else {
+            // assemble intersection operators
+            for (auto& op : intersection_)
+              op.assemble(intersectionContext, nodes..., matVec);
           }
         }
       }