Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HyTeg adaptions to maxLevel #23

Merged
merged 7 commits into from
Apr 23, 2024
Merged

HyTeg adaptions to maxLevel #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
daf1804
Updated maxLevel for P1 configurations
Feb 23, 2024
ca92903
Merge remote-tracking branch 'origin/main' into f-HyTeg-p1-maxlevel
Mar 4, 2024
ad1446e
Incresed maxLevel for p1 to 12 for more impact of regression
Mar 4, 2024
54ce304
Adjusted maxLevel for p1
Mar 5, 2024
240d92d
Merge branch 'main' into f-HyTeg-p1-maxlevel
Mar 6, 2024
0125a8c
Adapted maxlevel
Mar 20, 2024
82c22d1
Merge branch 'main' into f-HyTeg-p1-maxlevel
LuAbelt Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion HyTeg/p1_cg_sor.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 10 additions & 1 deletion HyTeg/p1_cg_symmetric.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 10 additions & 1 deletion HyTeg/p1_gmres_sor.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 10 additions & 1 deletion HyTeg/p1_gmres_symmetric.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 10 additions & 1 deletion HyTeg/p1_minres_sor.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 10 additions & 11 deletions HyTeg/p1_minres_symmetric.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Loading