From c6b5a3c254982420f2da30e7479842f3e0216781 Mon Sep 17 00:00:00 2001 From: Lukas Abelt Date: Tue, 23 Apr 2024 13:23:28 +0200 Subject: [PATCH] Update maxLevel in HyTeg configuration partches --- HyTeg/p1_cg_sor.patch | 11 ++++++++++- HyTeg/p1_cg_symmetric.patch | 11 ++++++++++- HyTeg/p1_gmres_sor.patch | 11 ++++++++++- HyTeg/p1_gmres_symmetric.patch | 11 ++++++++++- HyTeg/p1_minres_sor.patch | 11 ++++++++++- HyTeg/p1_minres_symmetric.patch | 21 ++++++++++----------- 6 files changed, 60 insertions(+), 16 deletions(-) diff --git a/HyTeg/p1_cg_sor.patch b/HyTeg/p1_cg_sor.patch index ed1dc4d..3db9b05 100644 --- a/HyTeg/p1_cg_sor.patch +++ b/HyTeg/p1_cg_sor.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..6997b4d4a 100644 +index 540f9d6da..9fec101e0 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration diff --git a/HyTeg/p1_cg_symmetric.patch b/HyTeg/p1_cg_symmetric.patch index 0fac840..445a4d6 100644 --- a/HyTeg/p1_cg_symmetric.patch +++ b/HyTeg/p1_cg_symmetric.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..bfaf76de9 100644 +index 540f9d6da..a09934699 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration diff --git a/HyTeg/p1_gmres_sor.patch b/HyTeg/p1_gmres_sor.patch index d84c819..af502d2 100644 --- a/HyTeg/p1_gmres_sor.patch +++ b/HyTeg/p1_gmres_sor.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..edede6447 100644 +index 540f9d6da..5e1bb0121 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration diff --git a/HyTeg/p1_gmres_symmetric.patch b/HyTeg/p1_gmres_symmetric.patch index 5221ff0..eba67bc 100644 --- a/HyTeg/p1_gmres_symmetric.patch +++ b/HyTeg/p1_gmres_symmetric.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..fc3b1fdc3 100644 +index 540f9d6da..66988e25b 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration diff --git a/HyTeg/p1_minres_sor.patch b/HyTeg/p1_minres_sor.patch index b7eb6c3..6c6ce75 100644 --- a/HyTeg/p1_minres_sor.patch +++ b/HyTeg/p1_minres_sor.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..8263da85a 100644 +index 540f9d6da..48d99620e 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration diff --git a/HyTeg/p1_minres_symmetric.patch b/HyTeg/p1_minres_symmetric.patch index 5d59075..6190fca 100644 --- a/HyTeg/p1_minres_symmetric.patch +++ b/HyTeg/p1_minres_symmetric.patch @@ -1,7 +1,16 @@ diff --git a/apps/profiling/ProfilingApp.cpp b/apps/profiling/ProfilingApp.cpp -index 540f9d6da..11edf6c49 100644 +index 540f9d6da..dc65f5be2 100644 --- a/apps/profiling/ProfilingApp.cpp +++ b/apps/profiling/ProfilingApp.cpp +@@ -137,7 +137,7 @@ int main( int argc, char* argv[] ) + walberla::logging::Logging::instance()->setLogLevel( walberla::logging::Logging::PROGRESS ); + walberla::MPIManager::instance()->useWorldComm(); + const uint_t minLevel = 2; +- const uint_t maxLevel = 4; ++ const uint_t maxLevel = 7; + using P1op = hyteg::P1ConstantLaplaceOperator; + using P2op = hyteg::P2ConstantLaplaceOperator; + @@ -148,11 +148,8 @@ int main( int argc, char* argv[] ) // SORSmoother or SymmetricSORSmoother // the symmetric variant alternates the direction of the smoothing for each iteration @@ -15,13 +24,3 @@ index 540f9d6da..11edf6c49 100644 return 0; } \ No newline at end of file -diff --git a/src/hyteg/p1functionspace/P1Function.hpp b/src/hyteg/p1functionspace/P1Function.hpp -index 51935b981..397a44aa5 100644 ---- a/src/hyteg/p1functionspace/P1Function.hpp -+++ b/src/hyteg/p1functionspace/P1Function.hpp -@@ -1,4 +1,4 @@ --/* -+/*t's hard to recommend brands now bc it seems like they'll vary by store or randomly go to shit as the brand cheaps out. - * Copyright (c) 2017-2019 Boerge Struempfel, Daniel Drzisga, Dominik Thoennes, Nils Kohl. - * - * This file is part of HyTeG