From 0e4a6610d982405f5a1c7c437b88b7b6085eb05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@dune-project.org> Date: Wed, 20 Nov 2024 14:50:21 +0100 Subject: [PATCH] [bugfix] Fix row type of MultiTypeBlockMatrix This was using a matrices as rows which should never have worked. Surprisingly it only failed with the recent modifications on how `field_type` is computed in dune-istl. --- dune/solvers/test/energynormtest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dune/solvers/test/energynormtest.cc b/dune/solvers/test/energynormtest.cc index 7af179ae..725d7748 100644 --- a/dune/solvers/test/energynormtest.cc +++ b/dune/solvers/test/energynormtest.cc @@ -234,8 +234,8 @@ int main() try /// test with multi blocked vectors // types using MVector = CustomMultiTypeBlockVector<BVector, BVector>; - using MMatrix0 = CustomMultiTypeBlockMatrix<BMatrix, BMatrix>; - using MMatrix1 = CustomMultiTypeBlockMatrix<BMatrix, BMatrix>; + using MMatrix0 = CustomMultiTypeBlockVector<BMatrix, BMatrix>; + using MMatrix1 = CustomMultiTypeBlockVector<BMatrix, BMatrix>; using MMatrix = CustomMultiTypeBlockMatrix<MMatrix0, MMatrix1>; // instance setup using namespace Dune::Hybrid; @@ -249,8 +249,8 @@ int main() try /// test with blocked multitype vectors // types using NVector = CustomMultiTypeBlockVector<FVector, FVector>; - using NMatrix0 = CustomMultiTypeBlockMatrix<FMatrix, FMatrix>; - using NMatrix1 = CustomMultiTypeBlockMatrix<FMatrix, FMatrix>; + using NMatrix0 = CustomMultiTypeBlockVector<FMatrix, FMatrix>; + using NMatrix1 = CustomMultiTypeBlockVector<FMatrix, FMatrix>; using NMatrix = CustomMultiTypeBlockMatrix<NMatrix0, NMatrix1>; constexpr size_t bnSize = 4; using BNVector = BlockVector<NVector>; -- GitLab