Skip to content
Snippets Groups Projects
Commit b4a1f61e authored by Helen Schottenhamml's avatar Helen Schottenhamml
Browse files

Fix flake8.

parent e8ee9f27
1 merge request!165Rework SGS models
Pipeline #61057 failed with stages
in 28 minutes and 7 seconds
This commit is part of merge request !165. Comments created here will be created in the context of that merge request.
......@@ -38,6 +38,7 @@ __all__ = [
"Method",
"ForceModel",
"CollisionSpace",
"SubgridScaleModel",
"LatticeBoltzmannStep",
"pdf_initialization_assignments",
"macroscopic_values_getter",
......
......@@ -735,7 +735,7 @@ def create_lb_collision_rule(lb_method=None, lbm_config=None, lbm_optimisation=N
eddy_viscosity_field=lbm_config.eddy_viscosity_field)
if 'split_groups' in collision_rule.simplification_hints:
collision_rule.simplification_hints['split_groups'][0].append(sp.Symbol("sgs_omega"))
collision_rule.simplification_hints['split_groups'][0].append(sp.Symbol("sgs_omega"))
elif lbm_config.cassons:
collision_rule = add_cassons_model(collision_rule, parameter=lbm_config.cassons,
......
......@@ -222,6 +222,7 @@ class ForceModel(Enum):
See :class:`lbmpy.forcemodels.CentralMoment`
"""
class SubgridScaleModel(Enum):
"""
The SubgridScaleModel enumeration defines which subgrid-scale model (SGS) is used to perform
......
......@@ -123,7 +123,7 @@ def add_qr_model(collision_rule, qr_constant, omega_output_field=None, eddy_visc
base_viscosity = sp.Symbol("qr_base_viscosity")
nu_e_assignments = [
Assignment(base_viscosity, sp.Float(6) * nu_0 + sp.Float(1)),
Assignment(nu_e, (-base_viscosity + sp.sqrt(base_viscosity ** 2 + sp.Float(72) * c_pi_s / rho)) \
Assignment(nu_e, (-base_viscosity + sp.sqrt(base_viscosity ** 2 + sp.Float(72) * c_pi_s / rho))
/ sp.Float(12))
]
else:
......@@ -133,8 +133,8 @@ def add_qr_model(collision_rule, qr_constant, omega_output_field=None, eddy_visc
eqs = [Assignment(nu_0, lattice_viscosity_from_relaxation_rate(omega_s)),
*[Assignment(matrix_entries[i], pi[i]) for i in range(stencil.D ** 2)],
Assignment(r_prime, sp.Float(-1)**(stencil.D+1) * matrix_entries.det()),
Assignment(q_prime, sp.Rational(1, 2) * (matrix_entries*matrix_entries).trace()),
Assignment(r_prime, sp.Float(-1) ** (stencil.D + 1) * matrix_entries.det()),
Assignment(q_prime, sp.Rational(1, 2) * (matrix_entries * matrix_entries).trace()),
Assignment(c_pi_s, c_pi),
*nu_e_assignments,
Assignment(adapted_omega, relaxation_rate_from_lattice_viscosity(nu_0 + nu_e))]
......
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