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

Merge branch 'OutFlowBC' into 'master'

Sanity checks for normal directions

See merge request !137
parents ed6cae82 f927a48f
1 merge request!137Sanity checks for normal directions
Pipeline #48731 failed with stages
in 1 hour, 42 minutes, and 52 seconds
...@@ -140,7 +140,10 @@ class FreeSlip(LbBoundary): ...@@ -140,7 +140,10 @@ class FreeSlip(LbBoundary):
"the normal direction is not defined for this class") "the normal direction is not defined for this class")
if normal_direction: if normal_direction:
self.mirror_axis = normal_direction.index(*[dir for dir in normal_direction if dir != 0]) normal_direction = tuple([int(n) for n in normal_direction])
assert all([n in [-1, 0, 1] for n in normal_direction]), \
"Only -1, 0 and 1 allowed for defining the normal direction"
self.mirror_axis = normal_direction.index(*[d for d in normal_direction if d != 0])
self.normal_direction = normal_direction self.normal_direction = normal_direction
self.dim = len(stencil[0]) self.dim = len(stencil[0])
...@@ -369,7 +372,9 @@ class SimpleExtrapolationOutflow(LbBoundary): ...@@ -369,7 +372,9 @@ class SimpleExtrapolationOutflow(LbBoundary):
if name is None: if name is None:
name = f"Simple Outflow: {offset_to_direction_string(normal_direction)}" name = f"Simple Outflow: {offset_to_direction_string(normal_direction)}"
self.normal_direction = normal_direction self.normal_direction = tuple([int(n) for n in normal_direction])
assert all([n in [-1, 0, 1] for n in self.normal_direction]), \
"Only -1, 0 and 1 allowed for defining the normal direction"
super(SimpleExtrapolationOutflow, self).__init__(name) super(SimpleExtrapolationOutflow, self).__init__(name)
def get_additional_code_nodes(self, lb_method): def get_additional_code_nodes(self, lb_method):
...@@ -436,7 +441,9 @@ class ExtrapolationOutflow(LbBoundary): ...@@ -436,7 +441,9 @@ class ExtrapolationOutflow(LbBoundary):
if name is None: if name is None:
name = f"Outflow: {offset_to_direction_string(normal_direction)}" name = f"Outflow: {offset_to_direction_string(normal_direction)}"
self.normal_direction = normal_direction self.normal_direction = tuple([int(n) for n in normal_direction])
assert all([n in [-1, 0, 1] for n in self.normal_direction]), \
"Only -1, 0 and 1 allowed for defining the normal direction"
self.streaming_pattern = streaming_pattern self.streaming_pattern = streaming_pattern
self.zeroth_timestep = zeroth_timestep self.zeroth_timestep = zeroth_timestep
self.dx = sp.Number(dx) self.dx = sp.Number(dx)
......
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