Commit 480b712f authored by Martin Bauer's avatar Martin Bauer
Browse files

UniformGridGenerated: Cleaned up parameter file & adapted to lbmpy mrt changes

parent 566e8146
Pipeline #20335 failed with stages
in 191 minutes and 15 seconds
DomainSetup
{
blocks < 1, 1, 1 >;
blocks < 1, 1, 1 >;
cellsPerBlock < 64, 64, 64 >;
periodic < 1, 1, 1 >;
periodic < 1, 1, 1 >;
}
Parameters
{
timeStepMode twoField;
// twoField: normal src-dst update with two fields [default]
// twoFieldKernelOnly: same as above but without communication and periodicity
// aa: AA single-field udate pattern
// aaKernelOnly: same as above but only compute kernel without communication and periodicity
timesteps 200; // time steps of one performance measurement
warmupSteps 1; // number of steps to run before measurement starts
outerIterations 4; // how many measurements to conduct
directComm false;
// if true use ghost layer exchange based on MPI datatypes instead of manual packing/unpacking
vtkWriteFrequency 0; // write a VTK file every n'th step, if zero VTK output is disabled
timeStepMode twoField;
//twoFieldKernelType manualD3Q19;
twoFieldKernelType generated;
// generated [default]
// manualGeneric: manual implementation, stencil generic
// manualD3Q19: manual D3Q19
timesteps 200; // time steps of one performance measurement default 60
warmupSteps 1; // number of steps to run before measurement starts
outerIterations 4; // how many measurements to conduct
vtkWriteFrequency 0; // write a VTK file every n'th step, if zero VTK output is disabled
remainingTimeLoggerFrequency 6; // interval in seconds to log the estimated remaining time
directComm 0;
omega 1.8;
shearVelocityMagnitude 0.02;
useGui 0;
omega 1.8; // lbm relaxation rate default 1.4
shearVelocityMagnitude 0.02; // max velocity of initialized shear flow
}
......@@ -61,7 +61,7 @@ int main( int argc, char **argv )
const std::string timeStepMode = parameters.getParameter<std::string>( "timeStepMode", "twoField");
const real_t omega = parameters.getParameter<real_t>( "omega", real_c( 1.4 ));
uint_t timesteps = parameters.getParameter<uint_t>( "timesteps", uint_c( 60 ));
const real_t shearVelocityMagnitude = parameters.getParameter<real_t>("shearVelocityMagnitude", 0.08);
const real_t shearVelocityMagnitude = parameters.getParameter<real_t>("shearVelocityMagnitude", 0.02);
const bool directComm = parameters.getParameter<bool>("directComm", false);
auto pdfFieldAdder = [](IBlock* const block, StructuredBlockStorage * const storage) {
......
......@@ -6,7 +6,7 @@ from lbmpy.macroscopic_value_kernels import macroscopic_values_getter, macroscop
from lbmpy.fieldaccess import AAEvenTimeStepAccessor, AAOddTimeStepAccessor
omega = sp.symbols("omega")
omega_fill = sp.symbols("omega_:10")
omega_fill = sp.symbols("omega_:7")
options_dict = {
'srt': {
......@@ -24,12 +24,12 @@ options_dict = {
'mrt': {
'method': 'mrt',
'stencil': 'D3Q19',
'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],
'relaxation_rates': [omega, 1.3, 1.4, 1.2, 1.1, 1.15, 1.234],
},
'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]],
'relaxation_rates': omega_fill,
},
'mrt3': {
'method': 'mrt3',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment