From 3932cce392ff0f4572e6025b1f0d28951e528bf5 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 20 Nov 2023 12:50:29 +0100 Subject: [PATCH 1/2] fixed: never include config.h in a header --- opm/simulators/linalg/DILU.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opm/simulators/linalg/DILU.hpp b/opm/simulators/linalg/DILU.hpp index 12ca61989..44bb78b85 100644 --- a/opm/simulators/linalg/DILU.hpp +++ b/opm/simulators/linalg/DILU.hpp @@ -17,7 +17,6 @@ #ifndef OPM_DILU_HEADER_INCLUDED #define OPM_DILU_HEADER_INCLUDED -#include #include #include #include @@ -189,4 +188,4 @@ private: } // namespace Dune -#endif \ No newline at end of file +#endif From 842af082762fecb31b417fa2a06160c18ec18750 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 21 Nov 2023 15:19:11 +0100 Subject: [PATCH 2/2] test_graphcoloring: cosmetics --- tests/test_graphcoloring.cpp | 123 ++++++++++++++--------------------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/tests/test_graphcoloring.cpp b/tests/test_graphcoloring.cpp index 432b25d6b..db18c6eb4 100644 --- a/tests/test_graphcoloring.cpp +++ b/tests/test_graphcoloring.cpp @@ -15,14 +15,12 @@ void checkAllIndices(const std::vector& ordering) { std::vector counters(ordering.size(), 0); - for(auto index: ordering) - { + for (auto index : ordering) { ++counters[index]; } - for(auto count: counters) - { - BOOST_CHECK(count==1); + for (auto count : counters) { + BOOST_CHECK(count == 1); } } @@ -32,28 +30,22 @@ BOOST_AUTO_TEST_CASE(TestWelschPowell) using Graph = Dune::Amg::MatrixGraph; int N = 10; Matrix matrix(N*N, N*N, 5, 0.4, Matrix::implicit); - for( int j = 0; j < N; j++) - { - for(int i = 0; i < N; i++) - { - auto index = j*10+i; + for (int j = 0; j < N; j++) { + for (int i = 0; i < N; i++) { + auto index = j * 10 + i; matrix.entry(index,index) = 1; - if ( i > 0 ) - { + if (i > 0) { matrix.entry(index,index-1) = 1; } - if ( i < N - 1) - { + if (i < N - 1) { matrix.entry(index,index+1) = 1; } - if ( j > 0 ) - { + if (j > 0) { matrix.entry(index,index-N) = 1; } - if ( j < N - 1) - { + if (j < N - 1) { matrix.entry(index,index+N) = 1; } @@ -71,13 +63,11 @@ BOOST_AUTO_TEST_CASE(TestWelschPowell) // Check for checkerboard coloring - for( int j = 0, index = 0; j < N; j++) - { + for (int j = 0, index = 0; j < N; j++) { auto expectedColor = firstCornerColor; - for(int i = 0; i < N; i++) - { - BOOST_CHECK(colors[index]==expectedColor); + for (int i = 0; i < N; i++) { + BOOST_CHECK(colors[index] == expectedColor); index++; expectedColor = (expectedColor + 1) % 2; } @@ -90,8 +80,7 @@ BOOST_AUTO_TEST_CASE(TestWelschPowell) verticesPerColor.begin()+verticesPerColor.size()-1, colorIndex.begin()+1); - for (auto vertex : graph) - { + for (auto vertex : graph) { BOOST_CHECK(colorIndex[colors[vertex]]++ == newOrder[vertex]); } checkAllIndices(newOrder); @@ -123,12 +112,10 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms3x3Matrix) for (auto row = testMatrix.createbegin(); row != testMatrix.createend(); ++row) { if (row.index() == 0) { row.insert(row.index()); - } - else if (row.index() == 1) { + } else if (row.index() == 1) { row.insert(row.index()); row.insert(row.index() + 1); - } - else if (row.index() == 2) { + } else if (row.index() == 2) { row.insert(row.index() - 1); row.insert(row.index()); } @@ -144,8 +131,8 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms3x3Matrix) std::vector> correctColor = {{0, 1}, {2}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -153,16 +140,16 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms3x3Matrix) coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::UPPER); correctColor = {{0, 2}, {1}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::LOWER); correctColor = {{0, 1}, {2}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -191,20 +178,16 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Simple) row.insert(row.index()); row.insert(row.index()+1); row.insert(row.index()+2); - } - else if (row.index() == 1) { + } else if (row.index() == 1) { row.insert(row.index()); row.insert(row.index() - 1); - } - else if (row.index() == 2) { + } else if (row.index() == 2) { row.insert(row.index() - 2); row.insert(row.index()); row.insert(row.index() + 1); - } - else if (row.index() == 3) { + } else if (row.index() == 3) { row.insert(row.index()); - } - else if (row.index() == 4) { + } else if (row.index() == 4) { row.insert(row.index() - 1); row.insert(row.index()); } @@ -226,8 +209,8 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Simple) std::vector> correctColor = {{0, 3, 4}, {1, 2}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -235,8 +218,8 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Simple) coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::UPPER); correctColor = {{1, 3, 4}, {2}, {0}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -244,8 +227,8 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Simple) coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::LOWER); correctColor = {{0, 3}, {1, 2, 4}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -274,13 +257,11 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Tridiagonal) if (row.index() == 0) { row.insert(row.index()); row.insert(row.index()+1); - } - else if (row.index() > 0 && row.index() < 4) { + } else if (row.index() > 0 && row.index() < 4) { row.insert(row.index() - 1); row.insert(row.index()); row.insert(row.index() + 1); - } - else if (row.index() == 4) { + } else if (row.index() == 4) { row.insert(row.index() - 1); row.insert(row.index()); } @@ -305,15 +286,15 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Tridiagonal) std::vector> correctColor = {{0}, {1}, {2}, {3}, {4}}; for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::LOWER); - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -322,8 +303,8 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Tridiagonal) coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::UPPER); correctColor = {{4}, {3}, {2}, {1}, {0}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -353,22 +334,18 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Complex) row.insert(row.index()+1); row.insert(row.index()+2); row.insert(row.index()+4); - } - else if (row.index() == 1) { + } else if (row.index() == 1) { row.insert(row.index() - 1); row.insert(row.index()); row.insert(row.index() + 2); - } - else if (row.index() == 2) { + } else if (row.index() == 2) { row.insert(row.index() - 2); row.insert(row.index()); row.insert(row.index() + 2); - } - else if (row.index() == 3) { + } else if (row.index() == 3) { row.insert(row.index() - 2); row.insert(row.index()); - } - else if (row.index() == 4) { + } else if (row.index() == 4) { row.insert(row.index() - 4); row.insert(row.index() - 2); row.insert(row.index()); @@ -395,16 +372,16 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Complex) std::vector> correctColor = {{0}, {1, 2}, {3, 4}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::LOWER); - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } @@ -412,9 +389,9 @@ BOOST_AUTO_TEST_CASE(TestColoredDiluParallelisms5x5Complex) coloring = Opm::getMatrixRowColoring(testMatrix, Opm::ColoringType::UPPER); correctColor = {{3, 4}, {1, 2}, {0}}; - for (std::size_t i = 0; i < correctColor.size(); ++i){ - for (std::size_t j = 0; j < correctColor[i].size(); ++j){ + for (std::size_t i = 0; i < correctColor.size(); ++i) { + for (std::size_t j = 0; j < correctColor[i].size(); ++j) { BOOST_CHECK(coloring[i][j] == correctColor[i][j]); } } -} \ No newline at end of file +}