Skip to content

GitLab

Commit 7751b2df authored by Helen Schottenhamml's avatar Helen Schottenhamml
Browse files

Merge branch 'Fix_SP_conversion' into 'master' 

FIX: SP/DP conversion warnings

Closes #144

See merge request walberla/walberla!442
parents 8f1f6b17 05b33755
Show whitespace changes
Inline Side-by-side
apps/benchmarks/FluidParticleCoupling/GeneratedLBM.py
View file @ 7751b2df
......@@ -14,19 +14,21 @@ from collections import OrderedDict
with CodeGeneration() as ctx:
generatedMethod = "TRTlike"
#generatedMethod = "D3Q27TRTlike"
#generatedMethod = "cumulant"
generatedMethod = 'TRTlike'
#generatedMethod = 'D3Q27TRTlike'
#generatedMethod = 'cumulant'
clear_cache()
dtype_string = 'float64' if ctx.double_accuracy else 'float32'
cpu_vectorize_info = {'instruction_set': get_vectorize_instruction_set(ctx)}
if generatedMethod == "TRTlike":
omegaVisc = sp.Symbol("omega_visc")
omegaBulk = ps.fields("omega_bulk: [3D]", layout='fzyx')
omegaMagic = sp.Symbol("omega_magic")
stencil = get_stencil("D3Q19", 'walberla')
if generatedMethod == 'TRTlike':
omegaVisc = sp.Symbol('omega_visc')
omegaBulk = ps.fields(f'omega_bulk: {dtype_string}[3D]', layout='fzyx')
omegaMagic = sp.Symbol('omega_magic')
stencil = get_stencil('D3Q19', 'walberla')
x, y, z = MOMENT_SYMBOLS
one = sp.Rational(1, 1)
......@@ -53,49 +55,50 @@ with CodeGeneration() as ctx:
generate_lattice_model(ctx, 'GeneratedLBM', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
if generatedMethod == "D3Q27TRTlike":
if generatedMethod == 'D3Q27TRTlike':
omegaVisc = sp.Symbol("omega_visc")
omegaBulk = ps.fields("omega_bulk: [3D]", layout='fzyx')
omegaMagic = sp.Symbol("omega_magic")
stencil = get_stencil("D3Q27", 'walberla')
omegaVisc = sp.Symbol('omega_visc')
omegaBulk = ps.fields(f'omega_bulk: {dtype_string}[3D]', layout='fzyx')
omegaMagic = sp.Symbol('omega_magic')
stencil = get_stencil('D3Q27', 'walberla')
relaxation_rates=[omegaVisc, omegaBulk.center_vector, omegaMagic, omegaVisc, omegaMagic, omegaVisc]
relaxation_rates = [omegaVisc, omegaBulk.center_vector, omegaMagic, omegaVisc, omegaMagic, omegaVisc]
methodWithForce = create_lb_method(stencil=stencil, method='mrt', maxwellian_moments=False,weighted=True, compressible=False,
relaxation_rates=relaxation_rates)
methodWithForce = create_lb_method(stencil=stencil, method='mrt', maxwellian_moments=False, weighted=True,
compressible=False, relaxation_rates=relaxation_rates)
collision_rule = create_lb_collision_rule(lb_method=methodWithForce, optimization={'cse_global': True})
generate_lattice_model(ctx, 'GeneratedLBM', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
generate_lattice_model(ctx, 'GeneratedLBM', collision_rule, field_layout='fzyx',
cpu_vectorize_info=cpu_vectorize_info)
if generatedMethod == "cumulant":
if generatedMethod == 'cumulant':
x,y,z = MOMENT_SYMBOLS
x, y, z = MOMENT_SYMBOLS
cumulants = [0] * 27
cumulants[0] = sp.sympify(1) #000
cumulants[0] = sp.sympify(1) # 000
cumulants[1] = x #100
cumulants[2] = y #010
cumulants[3] = z #001
cumulants[1] = x # 100
cumulants[2] = y # 010
cumulants[3] = z # 001
cumulants[4] = x*y #110
cumulants[5] = x*z #101
cumulants[6] = y*z #011
cumulants[4] = x*y # 110
cumulants[5] = x*z # 101
cumulants[6] = y*z # 011
cumulants[7] = x**2 - y**2 #200 - 020
cumulants[8] = x**2 - z**2 #200 - 002
cumulants[9] = x**2 + y**2 + z**2 #200 + 020 + 002
cumulants[7] = x**2 - y**2 # 200 - 020
cumulants[8] = x**2 - z**2 # 200 - 002
cumulants[9] = x**2 + y**2 + z**2 # 200 + 020 + 002
cumulants[10] = x*y**2 + x*z**2 #120 + 102
cumulants[11] = x**2*y + y*z**2 #210 + 012
cumulants[12] = x**2*z + y**2*z #201 + 021
cumulants[13] = x*y**2 - x*z**2 #120 - 102
cumulants[14] = x**2*y - y*z**2 #210 - 012
cumulants[15] = x**2*z - y**2*z #201 - 021
cumulants[10] = x*y**2 + x*z**2 # 120 + 102
cumulants[11] = x**2*y + y*z**2 # 210 + 012
cumulants[12] = x**2*z + y**2*z # 201 + 021
cumulants[13] = x*y**2 - x*z**2 # 120 - 102
cumulants[14] = x**2*y - y*z**2 # 210 - 012
cumulants[15] = x**2*z - y**2*z # 201 - 021
cumulants[16] = x*y*z #111
cumulants[16] = x*y*z # 111
cumulants[17] = x**2*y**2 - 2*x**2*z**2 + y**2*z**2 # 220- 2*202 +022
cumulants[18] = x**2*y**2 + x**2*z**2 - 2*y**2*z**2 # 220 + 202 - 2*002
......@@ -119,9 +122,9 @@ with CodeGeneration() as ctx:
else:
return 1
stencil = get_stencil("D3Q27", 'walberla')
stencil = get_stencil('D3Q27', 'walberla')
omega = sp.Symbol("omega")
omega = sp.Symbol('omega')
rr_dict = OrderedDict((c, get_relaxation_rate(c, omega))
for c in cumulants)
......@@ -129,12 +132,13 @@ with CodeGeneration() as ctx:
my_method = create_with_continuous_maxwellian_eq_moments(stencil, rr_dict, cumulant=True, compressible=True,)
collision_rule = create_lb_collision_rule(lb_method=my_method,
optimization={"cse_global": True,
"cse_pdfs": False})
optimization={'cse_global': True,
'cse_pdfs': False})
print(my_method.relaxation_rates)
generate_lattice_model(ctx, 'GeneratedLBM', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
generate_lattice_model(ctx, 'GeneratedLBM', collision_rule, field_layout='fzyx',
cpu_vectorize_info=cpu_vectorize_info)
apps/benchmarks/FluidParticleCoupling/GeneratedLBMWithForce.py
View file @ 7751b2df
......@@ -15,25 +15,27 @@ from collections import OrderedDict
with CodeGeneration() as ctx:
forcing=(sp.symbols("fx"),0,0)
forcemodel=Luo(forcing)
forcing = (sp.symbols('fx'), 0, 0)
forcemodel = Luo(forcing)
generatedMethod = "TRTlike"
#generatedMethod = "D3Q27TRTlike"
#generatedMethod = "cumulant"
#generatedMethod = "cumulantTRT"
generatedMethod = 'TRTlike'
# generatedMethod = 'D3Q27TRTlike'
# generatedMethod = 'cumulant'
# generatedMethod = 'cumulantTRT'
print("Generating " + generatedMethod + " LBM method")
print('Generating ' + generatedMethod + ' LBM method')
clear_cache()
dtype_string = 'float64' if ctx.double_accuracy else 'float32'
cpu_vectorize_info = {'instruction_set': get_vectorize_instruction_set(ctx)}
if generatedMethod == "TRTlike":
omegaVisc = sp.Symbol("omega_visc")
omegaBulk = ps.fields("omega_bulk: [3D]", layout='fzyx')
omegaMagic = sp.Symbol("omega_magic")
stencil = get_stencil("D3Q19", 'walberla')
if generatedMethod == 'TRTlike':
omegaVisc = sp.Symbol('omega_visc')
omegaBulk = ps.fields(f'omega_bulk: {dtype_string}[3D]', layout='fzyx')
omegaMagic = sp.Symbol('omega_magic')
stencil = get_stencil('D3Q19', 'walberla')
x, y, z = MOMENT_SYMBOLS
one = sp.Rational(1, 1)
......@@ -59,49 +61,50 @@ with CodeGeneration() as ctx:
collision_rule = create_lb_collision_rule(lb_method=methodWithForce, optimization={'cse_global': True})
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
if generatedMethod == "D3Q27TRTlike":
if generatedMethod == 'D3Q27TRTlike':
omegaVisc = sp.Symbol("omega_visc")
omegaBulk = ps.fields("omega_bulk: [3D]", layout='fzyx')
omegaMagic = sp.Symbol("omega_magic")
stencil = get_stencil("D3Q27", 'walberla')
omegaVisc = sp.Symbol('omega_visc')
omegaBulk = ps.fields(f'omega_bulk: {dtype_string}[3D]', layout='fzyx')
omegaMagic = sp.Symbol('omega_magic')
stencil = get_stencil('D3Q27', 'walberla')
relaxation_rates=[omegaVisc, omegaBulk.center_vector, omegaMagic, omegaVisc, omegaMagic, omegaVisc]
relaxation_rates = [omegaVisc, omegaBulk.center_vector, omegaMagic, omegaVisc, omegaMagic, omegaVisc]
methodWithForce = create_lb_method(stencil=stencil, method='mrt', maxwellian_moments=False,weighted=True, compressible=False,
force_model=forcemodel, relaxation_rates=relaxation_rates)
methodWithForce = create_lb_method(stencil=stencil, method='mrt', maxwellian_moments=False, weighted=True,
compressible=False, force_model=forcemodel, relaxation_rates=relaxation_rates)
collision_rule = create_lb_collision_rule(lb_method=methodWithForce, optimization={'cse_global': True})
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx',
cpu_vectorize_info=cpu_vectorize_info)
if generatedMethod == "cumulant":
if generatedMethod == 'cumulant':
x,y,z = MOMENT_SYMBOLS
x, y, z = MOMENT_SYMBOLS
cumulants = [0] * 27
cumulants[0] = sp.sympify(1) #000
cumulants[0] = sp.sympify(1) # 000
cumulants[1] = x #100
cumulants[2] = y #010
cumulants[3] = z #001
cumulants[1] = x # 100
cumulants[2] = y # 010
cumulants[3] = z # 001
cumulants[4] = x*y #110
cumulants[5] = x*z #101
cumulants[6] = y*z #011
cumulants[4] = x*y # 110
cumulants[5] = x*z # 101
cumulants[6] = y*z # 011
cumulants[7] = x**2 - y**2 #200 - 020
cumulants[8] = x**2 - z**2 #200 - 002
cumulants[9] = x**2 + y**2 + z**2 #200 + 020 + 002
cumulants[7] = x**2 - y**2 # 200 - 020
cumulants[8] = x**2 - z**2 # 200 - 002
cumulants[9] = x**2 + y**2 + z**2 # 200 + 020 + 002
cumulants[10] = x*y**2 + x*z**2 #120 + 102
cumulants[11] = x**2*y + y*z**2 #210 + 012
cumulants[12] = x**2*z + y**2*z #201 + 021
cumulants[13] = x*y**2 - x*z**2 #120 - 102
cumulants[14] = x**2*y - y*z**2 #210 - 012
cumulants[15] = x**2*z - y**2*z #201 - 021
cumulants[10] = x*y**2 + x*z**2 # 120 + 102
cumulants[11] = x**2*y + y*z**2 # 210 + 012
cumulants[12] = x**2*z + y**2*z # 201 + 021
cumulants[13] = x*y**2 - x*z**2 # 120 - 102
cumulants[14] = x**2*y - y*z**2 # 210 - 012
cumulants[15] = x**2*z - y**2*z # 201 - 021
cumulants[16] = x*y*z #111
cumulants[16] = x*y*z # 111
cumulants[17] = x**2*y**2 - 2*x**2*z**2 + y**2*z**2 # 220- 2*202 +022
cumulants[18] = x**2*y**2 + x**2*z**2 - 2*y**2*z**2 # 220 + 202 - 2*002
......@@ -125,52 +128,54 @@ with CodeGeneration() as ctx:
else:
return 1
stencil = get_stencil("D3Q27", 'walberla')
stencil = get_stencil('D3Q27', 'walberla')
omega = sp.Symbol("omega")
omega = sp.Symbol('omega')
rr_dict = OrderedDict((c, get_relaxation_rate(c, omega))
for c in cumulants)
from lbmpy.methods import create_with_continuous_maxwellian_eq_moments
my_method = create_with_continuous_maxwellian_eq_moments(stencil, rr_dict, cumulant=True, compressible=True, force_model=forcemodel)
my_method = create_with_continuous_maxwellian_eq_moments(stencil, rr_dict, cumulant=True, compressible=True,
force_model=forcemodel)
collision_rule = create_lb_collision_rule(lb_method=my_method,
optimization={"cse_global": True,
"cse_pdfs": False})
optimization={'cse_global': True,
'cse_pdfs': False})
print(my_method.relaxation_rates)
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx',
cpu_vectorize_info=cpu_vectorize_info)
if generatedMethod == "cumulantTRT":
if generatedMethod == 'cumulantTRT':
x,y,z = MOMENT_SYMBOLS
x, y, z = MOMENT_SYMBOLS
cumulants = [0] * 27
cumulants[0] = sp.sympify(1) #000
cumulants[0] = sp.sympify(1) # 000
cumulants[1] = x #100
cumulants[2] = y #010
cumulants[3] = z #001
cumulants[1] = x # 100
cumulants[2] = y # 010
cumulants[3] = z # 001
cumulants[4] = x*y #110
cumulants[5] = x*z #101
cumulants[6] = y*z #011
cumulants[4] = x*y # 110
cumulants[5] = x*z # 101
cumulants[6] = y*z # 011
cumulants[7] = x**2 - y**2 #200 - 020
cumulants[8] = x**2 - z**2 #200 - 002
cumulants[9] = x**2 + y**2 + z**2 #200 + 020 + 002
cumulants[7] = x**2 - y**2 # 200 - 020
cumulants[8] = x**2 - z**2 # 200 - 002
cumulants[9] = x**2 + y**2 + z**2 # 200 + 020 + 002
cumulants[10] = x*y**2 + x*z**2 #120 + 102
cumulants[11] = x**2*y + y*z**2 #210 + 012
cumulants[12] = x**2*z + y**2*z #201 + 021
cumulants[13] = x*y**2 - x*z**2 #120 - 102
cumulants[14] = x**2*y - y*z**2 #210 - 012
cumulants[15] = x**2*z - y**2*z #201 - 021
cumulants[10] = x*y**2 + x*z**2 # 120 + 102
cumulants[11] = x**2*y + y*z**2 # 210 + 012
cumulants[12] = x**2*z + y**2*z # 201 + 021
cumulants[13] = x*y**2 - x*z**2 # 120 - 102
cumulants[14] = x**2*y - y*z**2 # 210 - 012
cumulants[15] = x**2*z - y**2*z # 201 - 021
cumulants[16] = x*y*z #111
cumulants[16] = x*y*z # 111
cumulants[17] = x**2*y**2 - 2*x**2*z**2 + y**2*z**2 # 220- 2*202 +022
cumulants[18] = x**2*y**2 + x**2*z**2 - 2*y**2*z**2 # 220 + 202 - 2*002
......@@ -194,22 +199,24 @@ with CodeGeneration() as ctx:
else:
return omegaMagic
stencil = get_stencil("D3Q27", 'walberla')
stencil = get_stencil('D3Q27', 'walberla')
omegaVisc = sp.Symbol("omega_visc")
omegaMagic = sp.Symbol("omega_magic")
omegaVisc = sp.Symbol('omega_visc')
omegaMagic = sp.Symbol('omega_magic')
rr_dict = OrderedDict((c, get_relaxation_rate(c, omegaVisc, omegaMagic))
for c in cumulants)
from lbmpy.methods import create_with_continuous_maxwellian_eq_moments
my_method = create_with_continuous_maxwellian_eq_moments(stencil, rr_dict, cumulant=True, compressible=True, force_model=forcemodel)
my_method = create_with_continuous_maxwellian_eq_moments(stencil, rr_dict, cumulant=True, compressible=True,
force_model=forcemodel)
collision_rule = create_lb_collision_rule(lb_method=my_method,
optimization={"cse_global": True,
"cse_pdfs": False})
optimization={'cse_global': True,
'cse_pdfs': False})
print(my_method.relaxation_rates)
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx', cpu_vectorize_info=cpu_vectorize_info)
generate_lattice_model(ctx, 'GeneratedLBMWithForce', collision_rule, field_layout='fzyx',
cpu_vectorize_info=cpu_vectorize_info)
apps/benchmarks/PhaseFieldAllenCahn/InitializerFunctions.cpp
View file @ 7751b2df
......@@ -40,10 +40,10 @@ void initPhaseField_bubble(const shared_ptr< StructuredBlockStorage >& blocks, B
// clang-format off
WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_XYZ(phaseField, Cell globalCell;
blocks->transformBlockLocalToGlobalCell(globalCell, block, Cell(x, y, z));
real_t Ri = sqrt((globalCell[0] - bubbleMidPoint[0]) * (globalCell[0] - bubbleMidPoint[0]) +
(globalCell[1] - bubbleMidPoint[1]) * (globalCell[1] - bubbleMidPoint[1]) +
(globalCell[2] - bubbleMidPoint[2]) * (globalCell[2] - bubbleMidPoint[2]));
phaseField->get(x, y, z) = 0.5 + 0.5 * tanh(2.0 * (Ri - R) / W);
real_t Ri = std::sqrt((real_c(globalCell[0]) - bubbleMidPoint[0]) * (real_c(globalCell[0]) - bubbleMidPoint[0]) +
(real_c(globalCell[1]) - bubbleMidPoint[1]) * (real_c(globalCell[1]) - bubbleMidPoint[1]) +
(real_c(globalCell[2]) - bubbleMidPoint[2]) * (real_c(globalCell[2]) - bubbleMidPoint[2]));
phaseField->get(x, y, z) = real_t(0.5) + real_t(0.5) * std::tanh(real_t(2.0) * (Ri - R) / W);
)
// clang-format on
}
......@@ -52,9 +52,9 @@ void initPhaseField_bubble(const shared_ptr< StructuredBlockStorage >& blocks, B
void initPhaseField_RTI(const shared_ptr< StructuredBlockStorage >& blocks, BlockDataID phaseFieldID,
const real_t W = 5)
{
auto X = blocks->getDomainCellBB().xMax();
auto halfY = (blocks->getDomainCellBB().yMax()) / 2.0;
double perturbation = 0.05;
const real_t X = real_c(blocks->getDomainCellBB().xMax());
const real_t halfY = real_c(blocks->getDomainCellBB().yMax()) / real_t(2.0);
const real_t perturbation = real_t(0.05);
for (auto& block : *blocks)
{
......@@ -62,8 +62,9 @@ void initPhaseField_RTI(const shared_ptr< StructuredBlockStorage >& blocks, Bloc
// clang-format off
WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_XYZ(phaseField, Cell globalCell;
blocks->transformBlockLocalToGlobalCell(globalCell, block, Cell(x, y, z));
real_t tmp = perturbation * X * (cos((2.0 * math::pi * globalCell[0]) / X) + cos((2.0 * math::pi * globalCell[2]) / X));
phaseField->get(x, y, z) = 0.5 + 0.5 * tanh(((globalCell[1] - halfY) - tmp) / (W / 2.0));
real_t tmp = perturbation * X * (std::cos((real_t(2.0) * math::pi * real_c(globalCell[0])) / X)
+ std::cos((real_t(2.0) * math::pi * real_c(globalCell[2])) / X));
phaseField->get(x, y, z) = real_t(0.5) + real_t(0.5) * std::tanh(((real_t(globalCell[1]) - halfY) - tmp) / (W / real_t(2.0)));
)
// clang-format on
}
......
apps/benchmarks/PhaseFieldAllenCahn/benchmark_multiphase.cpp
View file @ 7751b2df
......@@ -84,7 +84,7 @@ using flag_t = walberla::uint8_t;
using FlagField_T = FlagField< flag_t >;
#if defined(WALBERLA_BUILD_WITH_CUDA)
typedef cuda::GPUField< double > GPUField;
typedef cuda::GPUField< real_t > GPUField;
#endif
// using CommScheme_T = cuda::communication::UniformGPUScheme<stencil::D2Q9>;
......
apps/benchmarks/UniformGridGPU/InitShearVelocity.h
View file @ 7751b2df
......@@ -6,7 +6,7 @@ namespace walberla {
inline void initShearVelocity(const shared_ptr<StructuredBlockStorage> & blocks, BlockDataID velFieldID,
const real_t xMagnitude=0.005, const real_t fluctuationMagnitude=0.05 )
const real_t xMagnitude=real_t(0.005), const real_t fluctuationMagnitude=real_t(0.05) )
{
math::seedRandomGenerator(0);
auto halfZ = blocks->getDomainCellBB().zMax() / 2;
......
apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp
View file @ 7751b2df
......@@ -55,7 +55,7 @@ using FlagField_T = FlagField<flag_t>;
void initShearVelocity(const shared_ptr<StructuredBlockStorage> & blocks, BlockDataID velFieldID,
const real_t xMagnitude=0.1, const real_t fluctuationMagnitude=0.05 )
const real_t xMagnitude=real_t(0.1), const real_t fluctuationMagnitude=real_t(0.05) )
{
math::seedRandomGenerator(0);
auto halfZ = blocks->getDomainCellBB().zMax() / 2;
......
apps/benchmarks/UniformGridGenerated/InitShearVelocity.h
View file @ 7751b2df
......@@ -6,7 +6,7 @@ namespace walberla {
inline void initShearVelocity(const shared_ptr<StructuredBlockStorage> & blocks, BlockDataID velFieldID,
const real_t xMagnitude=0.005, const real_t fluctuationMagnitude=0.05 )
const real_t xMagnitude=real_t(0.005), const real_t fluctuationMagnitude=real_t(0.05) )
{
math::seedRandomGenerator(0);
auto halfZ = blocks->getDomainCellBB().zMax() / 2;
......
apps/benchmarks/UniformGridGenerated/ManualKernels.h
View file @ 7751b2df
......@@ -30,20 +30,20 @@ public:
for( auto d = LM::Stencil::begin(); d != LM::Stencil::end(); ++d )
{
const real_t pdf = src->get(x - d.cx(), y - d.cy(), z - d.cz(), d.toIdx());
u[0] += pdf * d.cx();
u[1] += pdf * d.cy();
u[2] += pdf * d.cz();
u[0] += pdf * real_c(d.cx());
u[1] += pdf * real_c(d.cy());
u[2] += pdf * real_c(d.cz());
rho += pdf;
}
// collide
const real_t vel_sqr = u.sqrLength() * 1.5;
const real_t vel_sqr = u.sqrLength() * real_t(1.5);
for( auto d = LM::Stencil::begin(); d != LM::Stencil::end(); ++d )
{
const real_t pdf = src->get(x - d.cx(), y - d.cy(), z - d.cz(), d.toIdx());
const real_t vel = d.cx()*u[0] + d.cy()*u[1] + d.cz()*u[2];
dst->get(x, y, z, d.toIdx()) = ( 1.0 - omega_ ) * pdf +
omega_ * LM::w[ d.toIdx() ] * ( rho - vel_sqr + 3.0*vel + 4.5*vel*vel );
const real_t vel = real_c(d.cx())*u[0] + real_c(d.cy())*u[1] + real_c(d.cz())*u[2];
dst->get(x, y, z, d.toIdx()) = ( real_t(1.0) - omega_ ) * pdf +
omega_ * LM::w[ d.toIdx() ] * ( rho - vel_sqr + real_t(3.0)*vel + real_t(4.5)*vel*vel );
}
});
src->swapDataPointers(*dst);
......@@ -166,7 +166,7 @@ public:
dst->get(x,y,z,Stencil::idx[TN]) = omega_trm_ * dd_tmp_TN + omega_w2_ * ( vel_trm_TN_BS + velYpZ );
dst->get(x,y,z,Stencil::idx[BS]) = omega_trm_ * dd_tmp_BS + omega_w2_ * ( vel_trm_TN_BS - velYpZ );
});
})
src->swapDataPointers(*dst);
}
......
apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
View file @ 7751b2df
......@@ -49,7 +49,7 @@ int main( int argc, char **argv )
for( auto cfg = python_coupling::configBegin( argc, argv ); cfg != python_coupling::configEnd(); ++cfg )
{
WALBERLA_MPI_WORLD_BARRIER();
WALBERLA_MPI_WORLD_BARRIER()
auto config = *cfg;
logging::configureLogging( config );
......@@ -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", real_t(0.08));
const bool directComm = parameters.getParameter<bool>("directComm", false);
auto pdfFieldAdder = [](IBlock* const block, StructuredBlockStorage * const storage) {
......@@ -120,7 +120,7 @@ int main( int argc, char **argv )
twoFieldKernel = StreamPullCollideD3Q19<MyLM>(pdfFieldId, tmpPdfFieldId, omega);
} else {
WALBERLA_ABORT_NO_DEBUG_INFO("Invalid option for \"twoFieldKernelType\", "
"valid options are \"generated\", \"manualGeneric\", \"manualD3Q19\"");
"valid options are \"generated\", \"manualGeneric\", \"manualD3Q19\"")
}
using F = std::function<void()>;
......@@ -144,7 +144,7 @@ int main( int argc, char **argv )
timeLoop.add() << Sweep( pystencils::GenLbKernelAAEven(pdfFieldId, omega), "AA Even" );
timeLoop.add() << Sweep( pystencils::GenLbKernelAAOdd(pdfFieldId, omega), "AA Odd");
} else {
WALBERLA_ABORT("Invalid value for timeStepMode");
WALBERLA_ABORT("Invalid value for timeStepMode")
}
......@@ -205,7 +205,7 @@ int main( int argc, char **argv )
" time steps: " << timesteps <<
setw(15) << " block size: " << cellsPerBlock <<
" mlups/core: " << int(mlupsPerProcess/ threads) <<
" mlups: " << int(mlupsPerProcess) * MPIManager::instance()->numProcesses());
" mlups: " << int(mlupsPerProcess) * MPIManager::instance()->numProcesses())
WALBERLA_ROOT_SECTION()
{
......
apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
View file @ 7751b2df
......@@ -6,9 +6,9 @@ from pystencils_walberla import CodeGeneration, generate_pack_info_from_kernel,
from lbmpy.macroscopic_value_kernels import macroscopic_values_getter, macroscopic_values_setter
from lbmpy.fieldaccess import AAEvenTimeStepAccessor, AAOddTimeStepAccessor
omega = sp.symbols("omega")
omega_free = sp.Symbol("omega_free")
omega_fill = sp.symbols("omega_:10")
omega = sp.symbols('omega')
omega_free = sp.Symbol('omega_free')
omega_fill = sp.symbols('omega_:10')
options_dict = {
'srt': {
......@@ -95,9 +95,9 @@ with CodeGeneration() as ctx: