Fix experiments

.github/workflows/master.yml

@@ -93,3 +93,4 @@ jobs:
           prerelease: false
           files: |
             classes.pdf
+            packages.pdf

src/nse/model/experiments/block.py

@@ -21,6 +21,7 @@ def __init__(
         obstruction = Figure(Rectangle((4.7, .7), (5.3, 1.3)))
 
         foam = Foam(
+            'block',
             xs,
             ys,
             step,

src/nse/model/experiments/empty.py

@@ -14,13 +14,15 @@ def __init__(
         flow: float = 1,
         _: bool = False,
     ) -> None:
+        name = Empty.__name__
         step = .1
         xs = Axis('x', 0, 10)
         ys = Axis('y', 0, 2)
         boundary = Figure(Line((0, 0), (10, 0)), Line((0, 2), (10, 2)))
         obstruction = Figure()
 
         foam = Foam(
+            name,
             xs,
             ys,
             step,
@@ -32,7 +34,7 @@ def __init__(
         )
 
         super().__init__(
-            Empty.__name__,
+            name,
             xs,
             ys,
             boundary,

src/nse/model/experiments/foam.py

@@ -18,6 +18,7 @@ class Foam(Experiment):
 
     def __init__(
         self,
+        name: str,
         x: Axis,
         y: Axis,
         step: float,
@@ -27,7 +28,7 @@ def __init__(
         rho: float,
         flow: float,
     ) -> None:
-        name = f'step-{step:.3f}-{nu:.3f}-{flow:02.0f}'.replace('.', '_')
+        name = f'{name.lower()}-{step:.3f}-{nu:.3f}-{flow:02.0f}'.replace('.', '_')
         self.__grid = Grid(
             x.arrange(step, True),
             y.arrange(step, True),

src/nse/model/experiments/slalom.py

@@ -14,13 +14,15 @@ def __init__(
         flow: float = 1,
         supervised: bool = False,
     ) -> None:
+        name = Slalom.__name__
         step = .1
         xs = Axis('x', 0, 10)
         ys = Axis('y', 0, 2)
         boundary = Figure(Line((0, 0), (10, 0)), Line((0, 2), (10, 2)))
         obstruction = Figure(Rectangle((0, 0), (1, 1)), Rectangle((4.5, 1), (5.5, 2)))
 
         foam = Foam(
+            name,
             xs,
             ys,
             step,
@@ -32,7 +34,7 @@ def __init__(
         )
 
         super().__init__(
-            Slalom.__name__,
+            name,
             xs,
             ys,
             boundary,

src/nse/model/experiments/slit.py

@@ -14,13 +14,15 @@ def __init__(
         flow: float = 1,
         _: bool = False,
     ) -> None:
+        name = Slit.__name__
         step = .1
         xs = Axis('x', 0, 10)
         ys = Axis('y', 0, 2)
         boundary = Figure(Line((0, 0), (10, 0)), Line((0, 2), (10, 2)))
         obstruction = Figure(Rectangle((4.7, 0), (5.3, .7)), Rectangle((4.7, 1.3), (5.3, 2)))
 
         foam = Foam(
+            name,
             xs,
             ys,
             step,
@@ -32,7 +34,7 @@ def __init__(
         )
 
         super().__init__(
-            Slit.__name__,
+            name,
             xs,
             ys,
             boundary,

src/nse/model/experiments/step.py

@@ -14,13 +14,15 @@ def __init__(
         flow: float = 1,
         supervised: bool = False,
     ) -> None:
+        name = Step.__name__
         step = .1
         xs = Axis('x', 0, 10)
         ys = Axis('y', 0, 2)
         boundary = Figure(Line((0, 0), (10, 0)), Line((0, 2), (10, 2)))
         obstruction = Figure(Rectangle((0, 0), (1, 1)))
 
         foam = Foam(
+            name,
             xs,
             ys,
             step,
@@ -32,7 +34,7 @@ def __init__(
         )
 
         super().__init__(
-            Step.__name__,
+            name,
             xs,
             ys,
             boundary,