From 9438719663d77f1e52b9de253f720fb56f21ad2c Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Mon, 21 Oct 2019 09:23:17 +0200
Subject: [PATCH] Config changes in UniformGridGenerated
---
apps/benchmarks/UniformGridGenerated/UniformGrid.prm | 7 ++++---
.../UniformGridGenerated/UniformGridGenerated.cpp | 3 ++-
.../UniformGridGenerated/UniformGridGenerated.py | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/apps/benchmarks/UniformGridGenerated/UniformGrid.prm b/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
index cf2f26ad8..aae6bc2c0 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
+++ b/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
@@ -1,14 +1,14 @@
DomainSetup
{
blocks < 1, 1, 1 >;
- cellsPerBlock < 64, 64, 64 >;
- periodic < 1, 1, 1 >;
+ cellsPerBlock < 128, 128, 128 >;
+ periodic < 0, 0, 0 >;
}
Parameters
{
- timesteps 3000; // time steps of one performance measurement
+ timesteps 1000; // time steps of one performance measurement
warmupSteps 1; // number of steps to run before measurement starts
outerIterations 1; // how many measurements to conduct
@@ -18,5 +18,6 @@ Parameters
directComm 1;
omega 1.8;
+ shearVelocityMagnitude 0;
useGui 0;
}
diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
index f8865e8dc..f3b620a5b 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
+++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
@@ -77,7 +77,8 @@ int main( int argc, char **argv )
pystencils::GenMacroSetter setterKernel(pdfFieldId, velFieldId);
pystencils::GenMacroGetter getterKernel(pdfFieldId, velFieldId);
- initShearVelocity(blocks, velFieldId, shearVelocityMagnitude);
+ if( shearVelocityMagnitude > 0 )
+ initShearVelocity(blocks, velFieldId, shearVelocityMagnitude);
for( auto & b : *blocks)
setterKernel(&b);
diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
index 893ffb763..72f0ce0c1 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
+++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
@@ -92,6 +92,8 @@ with CodeGeneration() as ctx:
'aa_odd_cse_global': False,
'aa_odd_split': True,
'aa_odd_nt_stores': False,
+
+ 'compiled_in_boundaries': True,
}
config_name = ctx.config
noopt = False
@@ -118,9 +120,7 @@ with CodeGeneration() as ctx:
'cse_global': opts['two_field_cse_global'],
'cse_pdfs': opts['two_field_cse_pdfs']}, **options)
- include_boundaries = True
-
- if include_boundaries:
+ if opts['compiled_in_boundaries']:
from lbmpy.boundaries import NoSlip, UBB
from lbmpy.boundaries.boundaries_in_kernel import update_rule_with_push_boundaries
from collections import OrderedDict
--
GitLab