diff --git a/src/lbmpy/__init__.py b/src/lbmpy/__init__.py index 95298c692a144d1f2128b05fdd719ef3869287e3..2c41a0dfa569c5d08a2b8edad816f3cff57c3ab8 100644 --- a/src/lbmpy/__init__.py +++ b/src/lbmpy/__init__.py @@ -38,6 +38,7 @@ __all__ = [ "Method", "ForceModel", "CollisionSpace", + "SubgridScaleModel", "LatticeBoltzmannStep", "pdf_initialization_assignments", "macroscopic_values_getter", diff --git a/src/lbmpy/creationfunctions.py b/src/lbmpy/creationfunctions.py index 10735ccfaee02dfb8d26dbadf80c1b1401521134..85cef3886dd4f32825ebb8810e6dc8c699be8e8b 100644 --- a/src/lbmpy/creationfunctions.py +++ b/src/lbmpy/creationfunctions.py @@ -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, diff --git a/src/lbmpy/enums.py b/src/lbmpy/enums.py index 2f155931e5cb0b1b4789a7907dbb29b33e85ae48..0ab1276313ba94eab9a5c5c92e66404ce2c12580 100644 --- a/src/lbmpy/enums.py +++ b/src/lbmpy/enums.py @@ -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 diff --git a/src/lbmpy/turbulence_models.py b/src/lbmpy/turbulence_models.py index e4f21b12f9464b8eff63aaef11ab6a1b2cee07cb..84cd6befd1e766425b816059f26f13d4d6403281 100644 --- a/src/lbmpy/turbulence_models.py +++ b/src/lbmpy/turbulence_models.py @@ -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))]