From 44a42d08226dd2dd3d236d202203a26fcfa8b4c7 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Thu, 27 Jun 2019 16:55:41 +0200
Subject: [PATCH] GPU benchmark: more methods
---
apps/benchmarks/UniformGridGPU/CMakeLists.txt | 2 +-
apps/benchmarks/UniformGridGPU/UniformGridGPU.py | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/benchmarks/UniformGridGPU/CMakeLists.txt b/apps/benchmarks/UniformGridGPU/CMakeLists.txt
index 0e6193bd9..c1f1c950a 100644
--- a/apps/benchmarks/UniformGridGPU/CMakeLists.txt
+++ b/apps/benchmarks/UniformGridGPU/CMakeLists.txt
@@ -15,7 +15,7 @@ waLBerla_python_file_generates(UniformGridGPU.py
foreach(config srt trt mrt smagorinsky entropic smagorinsky_noopt entropic_kbc_n4
entropic_kbc_n4_noopt mrt_noopt mrt_full mrt_full_noopt
- srt_d3q27 mrt_full_d3q27 mrt_full_d3q27_noopt)
+ srt_d3q27 mrt_d3q27 mrt_d3q27_noopt smagorinsky_d3q27 smagorinsky_d3q27_noopt mrt_full_d3q27 mrt_full_d3q27_noopt)
waLBerla_add_executable ( NAME UniformGridBenchmarkGPU_${config}
FILES UniformGridGPU.cpp UniformGridGPU.py
DEPENDS blockforest boundary core cuda domain_decomposition field geometry timeloop vtk gui
diff --git a/apps/benchmarks/UniformGridGPU/UniformGridGPU.py b/apps/benchmarks/UniformGridGPU/UniformGridGPU.py
index 22a0491c5..934bb7122 100644
--- a/apps/benchmarks/UniformGridGPU/UniformGridGPU.py
+++ b/apps/benchmarks/UniformGridGPU/UniformGridGPU.py
@@ -39,13 +39,18 @@ options_dict = {
'mrt': {
'method': 'mrt',
'stencil': 'D3Q19',
- 'relaxation_rates': [0, omega, 1.3, 1.4, omega, 1.2, 1.1],
+ 'relaxation_rates': [0, omega, 1.3, 1.4, omega, 1.2, 1.1, 1.15, 1.234, 1.4235, 1.242, 1.2567, 0.9, 0.7],
},
'mrt_full': {
'method': 'mrt',
'stencil': 'D3Q19',
'relaxation_rates': [omega_fill[0], omega, omega_fill[1], omega_fill[2], omega_fill[3], omega_fill[4], omega_fill[5]],
},
+ 'mrt3': {
+ 'method': 'mrt3',
+ 'stencil': 'D3Q19',
+ 'relaxation_rates': [omega, 1.1, 1.2],
+ },
'entropic': {
'method': 'mrt3',
'stencil': 'D3Q19',
--
GitLab