diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh index 5565d7fd1de529575e9251573e65df537a78abd1..f2baf72aaad0d6a6b21300d4c90897bee210de08 100644 --- a/dune/tectonic/myblockproblem.hh +++ b/dune/tectonic/myblockproblem.hh @@ -12,10 +12,10 @@ #include <dune/solvers/computeenergy.hh> #include <dune/tnnmg/problem-classes/bisection.hh> +#include "ellipticenergy.hh" #include "globalnonlinearity.hh" #include "minimisation.hh" #include "mydirectionalconvexfunction.hh" -#include "ellipticenergy.hh" /** \brief Base class for problems where each block can be solved with a * modified gradient method */ @@ -165,8 +165,8 @@ template <class ConvexProblem> class MyBlockProblem { auto const blockEnd = (*col_it)[i].end(); for (auto blockIt = (*col_it)[i].begin(); blockIt != blockEnd; ++blockIt) - if (linearization.truncation[row][i] or linearization - .truncation[col][blockIt.index()]) + if (linearization.truncation[row][i] || + linearization.truncation[col][blockIt.index()]) *blockIt = 0.0; } }