removed vacuum from name

fusion-energy · Apr 20, 2022 · 77d3328 · 77d3328
1 parent 33250ac
commit 77d3328
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/examples/example_parametric_reactors/render_of_random_reactor_render_gif.py b/examples/example_parametric_reactors/render_of_random_reactor_render_gif.py
@@ -48,11 +48,11 @@ def create_reactor_renders(
     # assigns colours to each stl file
     stl_files_with_colors = {
         "blanket.stl": (255, 255, 0),
-        "vacuum_vessel.stl": (128, 128, 128),
+        "vessel.stl": (128, 128, 128),
         "upper_blanket.stl": (255, 255, 0),
         "lower_blanket.stl": (255, 255, 0),
-        "lower_vacuum_vessel.stl": (128, 128, 128),
-        "upper_vacuum_vessel.stl": (128, 128, 128),
+        "lower_vessel.stl": (128, 128, 128),
+        "upper_vessel.stl": (128, 128, 128),
     }
 
     scene = pyrender.Scene()

diff --git a/paramak/parametric_components/dished_vacuum_vessel.py b/paramak/parametric_components/dished_vacuum_vessel.py
@@ -23,7 +23,7 @@ def __init__(
         dish_height: float = 50,
         cylinder_height: float = 400,
         thickness: float = 15,
-        name: str = "dished_vacuum_vessel",
+        name: str = "dished_vessel",
         **kwargs,
     ):
         self.radius = radius

diff --git a/paramak/parametric_reactors/flf_system_code_reactor.py b/paramak/parametric_reactors/flf_system_code_reactor.py
@@ -90,7 +90,7 @@ def create_solids(self):
             ],
             rotation_angle=self.rotation_angle,
             color=(0.5, 0.5, 0.5),
-            name="lower_vacuum_vessel",
+            name="lower_vessel",
         )
 
         lower_blanket = paramak.RotateStraightShape(
@@ -137,7 +137,7 @@ def create_solids(self):
             ],
             rotation_angle=self.rotation_angle,
             color=(0.5, 0.5, 0.5),
-            name="upper_vacuum_vessel",
+            name="upper_vessel",
         )
 
         upper_blanket = paramak.RotateStraightShape(
@@ -201,7 +201,7 @@ def create_solids(self):
             ],
             rotation_angle=self.rotation_angle,
             color=(0.5, 0.5, 0.5),
-            name="vacuum_vessel",
+            name="vessel",
         )
 
         self.shapes_and_components = [

diff --git a/paramak/parametric_reactors/negative_triangularity_reactor.py b/paramak/parametric_reactors/negative_triangularity_reactor.py
@@ -744,7 +744,7 @@ def _make_vacuum_vessel_inner_wall(self):
             inner_radius=self._vacuum_vessel_inwall_start_rad,
             outer_radius=self._vacuum_vessel_inwall_end_rad,
             rotation_angle=self._rotation_angle,
-            name="vacuum_vessel_inner_wall",
+            name="vessel_inner_wall",
             color=(0.5, 0.5, 0.5),
             cut=[self._pf_coils, self._pf_casing],
         )
@@ -896,7 +896,7 @@ def _make_vacuum_vessel(self):
             inner_radius=self._vacuum_vessel_inwall_start_rad,
             outer_radius=self._vacuum_vessel_body_end_rad,
             rotation_angle=self._rotation_angle,
-            name="vacuum_vessel_body",
+            name="vessel_body",
             cut=cutting_list,
             color=(0.5, 0.5, 0.5),
         )

diff --git a/tests/test_parametric_reactors/test_flf_system_code_reactor.py b/tests/test_parametric_reactors/test_flf_system_code_reactor.py
@@ -44,11 +44,11 @@ def test_multiple_stp_file_creation(self):
 
         os.system("rm *.stp")
         self.test_reactor.export_stp()
-        assert Path("lower_vacuum_vessel.stp").is_file()
+        assert Path("lower_vessel.stp").is_file()
         assert Path("lower_blanket.stp").is_file()
         assert Path("blanket.stp").is_file()
         assert Path("upper_blanket.stp").is_file()
-        assert Path("upper_vacuum_vessel.stp").is_file()
+        assert Path("upper_vessel.stp").is_file()
         assert Path("vacuum_vessel.stp").is_file()
 
     def test_graveyard_volume_in_brep_export(self):
@@ -82,8 +82,8 @@ def test_order_of_names_in_reactor(self):
             "vacuum_vessel",
             "upper_blanket",
             "lower_blanket",
-            "lower_vacuum_vessel",
-            "upper_vacuum_vessel",
+            "lower_vessel",
+            "upper_vessel",
         ]
 
     def test_blanket_volume_against_analytical_volume(self):