Skip to content
Snippets Groups Projects
Commit b2fe5529 authored by Martin Bauer's avatar Martin Bauer
Browse files

ValueError raised now when smagorinsky and entropic is requested at the same time

parent 299f4fb4
No related merge requests found
...@@ -323,6 +323,8 @@ def create_lb_collision_rule(lb_method=None, optimization={}, **kwargs): ...@@ -323,6 +323,8 @@ def create_lb_collision_rule(lb_method=None, optimization={}, **kwargs):
collision_rule = simplification(collision_rule) collision_rule = simplification(collision_rule)
if params['entropic']: if params['entropic']:
if params['smagorinsky']:
raise ValueError("Choose either entropic or smagorinsky")
if params['entropic_newton_iterations']: if params['entropic_newton_iterations']:
if isinstance(params['entropic_newton_iterations'], bool): if isinstance(params['entropic_newton_iterations'], bool):
iterations = 3 iterations = 3
...@@ -400,8 +402,11 @@ def create_lb_method(**params): ...@@ -400,8 +402,11 @@ def create_lb_method(**params):
next_relaxation_rate = [0] next_relaxation_rate = [0]
def relaxation_rate_getter(_): def relaxation_rate_getter(_):
res = relaxation_rates[next_relaxation_rate[0]] try:
next_relaxation_rate[0] += 1 res = relaxation_rates[next_relaxation_rate[0]]
next_relaxation_rate[0] += 1
except IndexError:
raise ValueError("Too few relaxation rates specified")
return res return res
method = create_mrt_orthogonal(stencil_entries, relaxation_rate_getter, **common_params) method = create_mrt_orthogonal(stencil_entries, relaxation_rate_getter, **common_params)
elif method_name.lower() == 'mrt_raw': elif method_name.lower() == 'mrt_raw':
......
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