From 09c7bde23eaba7f464573e317ecf7095f9980ea0 Mon Sep 17 00:00:00 2001 From: podlesny <podlesny@zedat.fu-berlin.de> Date: Mon, 15 Mar 2021 18:32:47 +0100 Subject: [PATCH] fix Aii --- dune/tectonic/spatial-solving/tnnmg/functional.hh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dune/tectonic/spatial-solving/tnnmg/functional.hh b/dune/tectonic/spatial-solving/tnnmg/functional.hh index 4613c3aa..9d08eca2 100755 --- a/dune/tectonic/spatial-solving/tnnmg/functional.hh +++ b/dune/tectonic/spatial-solving/tnnmg/functional.hh @@ -248,9 +248,11 @@ auto coordinateRestriction(const GlobalShiftedFunctional& f, const Index& i) Dune::MatrixVector::addProduct(ri, maxEig, origini); Aii = 0; + //print(Aii, "Aii: "); for (size_t j=0; j<Aii.N(); j++) { - Aii[j] = maxEig; + Aii[j][j] = maxEig; } + //print(Aii, "Aii: "); //print(*Aii_p, "Aii_p:"); //print(ri, "ri:"); @@ -266,6 +268,8 @@ auto coordinateRestriction(const GlobalShiftedFunctional& f, const Index& i) dui -= origini; return Functional<decltype(Aii), LocalVector, decltype(phii), LocalLowerObstacle, LocalUpperObstacle, Range>(Aii, std::move(ri), phii, std::move(dli), std::move(dui)); + + //return ShiftedFunctional<decltype(Aii), LocalVector, decltype(phii), LocalLowerObstacle, LocalUpperObstacle, LocalVector, Range>(Aii, std::move(ri), phii, std::move(dli), std::move(dui), origini); } -- GitLab