-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #239 from fusion-energy/develop
develop to main merge
- Loading branch information
Showing
40 changed files
with
1,472 additions
and
438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: black | ||
| name: auto_lint | ||
|
|
||
| on: | ||
| push: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
210 changes: 210 additions & 0 deletions
210
paramak/parametric_components/constant_thickness_dome.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,210 @@ | ||
| import math | ||
| from paramak import RotateMixedShape, RotateStraightShape, Shape, CuttingWedge | ||
| import cadquery as cq | ||
|
|
||
|
|
||
| class ConstantThicknessDome(RotateMixedShape): | ||
| """A cylindrical vessel volume with constant thickness with a simple dished | ||
| head. This style of tank head has no knuckle radius or straight flange. The | ||
| dished shape is made from a chord of a circle. | ||
| Arguments: | ||
| thickness: the radial thickness of the dome. | ||
| chord_center_height: the vertical position of the chord center | ||
| chord_width: the width of the chord base | ||
| chord_height: the height of the chord which is also distance between | ||
| the chord_center_height and the inner surface of the dome | ||
| upper_or_lower: Curves the dish with a positive or negative direction | ||
| to allow the upper section or lower section of vacuum vessel | ||
| domes to be made. | ||
| name: the name of the shape, used in the graph legend and as a | ||
| filename prefix when exporting. | ||
| """ | ||
|
|
||
| def __init__( | ||
| self, | ||
| thickness: float = 10, | ||
| chord_center_height: float = 0, | ||
| chord_width: float = 100, | ||
| chord_height: float = 20, | ||
| upper_or_lower: str = "upper", | ||
| name: str = "constant_thickness_dome", | ||
| **kwargs, | ||
| ): | ||
|
|
||
| self.thickness = thickness | ||
| self.chord_center_height = chord_center_height | ||
| self.chord_width = chord_width | ||
| self.chord_height = chord_height | ||
| self.upper_or_lower = upper_or_lower | ||
| self.name = name | ||
|
|
||
| super().__init__(name=name, **kwargs) | ||
|
|
||
| @property | ||
| def chord_width(self): | ||
| return self._chord_width | ||
|
|
||
| @chord_width.setter | ||
| def chord_width(self, value): | ||
| if not isinstance(value, (float, int)): | ||
| raise ValueError("ConstantThicknessDome.chord_width must be a number. Not", value) | ||
| if value <= 0: | ||
| msg = f"ConstantThicknessDome.chord_width must be a positive number above 0. Not {value}" | ||
| raise ValueError(msg) | ||
| self._chord_width = value | ||
|
|
||
| @property | ||
| def chord_height(self): | ||
| return self._chord_height | ||
|
|
||
| @chord_height.setter | ||
| def chord_height(self, value): | ||
| if not isinstance(value, (float, int)): | ||
| raise ValueError("ConstantThicknessDome.chord_height must be a number. Not", value) | ||
| if value <= 0: | ||
| msg = f"ConstantThicknessDome.chord_height must be a positive number above 0. Not {value}" | ||
| raise ValueError(msg) | ||
| self._chord_height = value | ||
|
|
||
| @property | ||
| def thickness(self): | ||
| return self._thickness | ||
|
|
||
| @thickness.setter | ||
| def thickness(self, value): | ||
| if not isinstance(value, (float, int)): | ||
| msg = f"VacuumVessel.thickness must be a number. Not {value}" | ||
| raise ValueError(msg) | ||
| if value <= 0: | ||
| msg = f"VacuumVessel.thickness must be a positive number above 0. Not {value}" | ||
| raise ValueError(msg) | ||
| self._thickness = value | ||
|
|
||
| def find_points(self): | ||
| """ | ||
| Finds the XZ points joined by straight and circle connections that | ||
| describe the 2D profile of the vessel shape. | ||
| """ | ||
|
|
||
| # Note these points are not used in the normal way when constructing | ||
| # the solid | ||
| # | ||
| # 6 - | ||
| # | - | ||
| # 7 - - | ||
| # - - | ||
| # - 3 | ||
| # - | | ||
| # cc 1 -- 2 | ||
| # chord center | ||
| # | ||
| # | ||
| # cp | ||
| # center point | ||
| # | ||
| # | ||
| # | ||
| # | ||
| # cc 1 -- 2 | ||
| # - | | ||
| # - 3 | ||
| # - - | ||
| # 7 - - | ||
| # | - | ||
| # 6 - | ||
| # far side | ||
|
|
||
| if self.chord_height * 2 >= self.chord_width: | ||
| msg = "ConstantThicknessDome requires that the self.chord_width is at least 2 times as large as the chord height" | ||
| raise ValueError(msg) | ||
|
|
||
| radius_of_sphere = ((math.pow(self.chord_width, 2)) + (4.0 * math.pow(self.chord_height, 2))) / ( | ||
| 8 * self.chord_height | ||
| ) | ||
|
|
||
| # TODO set to 0 for now, add ability to shift the center of the chord left and right | ||
| chord_center = (0, self.chord_center_height) | ||
|
|
||
| point_1 = (chord_center[0] + (self.chord_width / 2), chord_center[1], "straight") | ||
|
|
||
| if self.upper_or_lower == "upper": | ||
| center_point = (chord_center[0], chord_center[1] + self.chord_height - radius_of_sphere) | ||
| inner_tri_angle = math.atan((center_point[1] - chord_center[1]) / (self.chord_width / 2)) | ||
| outer_tri_adj = math.cos(inner_tri_angle) * self.thickness | ||
| point_2 = (point_1[0] + self.thickness, point_1[1], "straight") | ||
| outer_tri_opp = math.sqrt(math.pow(self.thickness, 2) - math.pow(outer_tri_adj, 2)) | ||
| point_7 = (chord_center[0], chord_center[1] + radius_of_sphere, "straight") | ||
| point_6 = (chord_center[0], chord_center[1] + radius_of_sphere + self.thickness, "straight") | ||
| self.far_side = (center_point[0], center_point[1] - (radius_of_sphere + self.thickness)) | ||
| point_3 = (point_2[0], point_2[1] + outer_tri_opp, "straight") | ||
| elif self.upper_or_lower == "lower": | ||
| center_point = (chord_center[0], chord_center[1] - self.chord_height + radius_of_sphere) | ||
| inner_tri_angle = math.atan((center_point[1] - chord_center[1]) / (self.chord_width / 2)) | ||
| outer_tri_adj = math.cos(inner_tri_angle) * self.thickness | ||
| point_2 = (point_1[0] + self.thickness, point_1[1], "straight") | ||
| outer_tri_opp = math.sqrt(math.pow(self.thickness, 2) - math.pow(outer_tri_adj, 2)) | ||
| point_7 = (chord_center[0], chord_center[1] - radius_of_sphere, "straight") | ||
| point_6 = (chord_center[0], chord_center[1] - (radius_of_sphere + self.thickness), "straight") | ||
| self.far_side = (center_point[0], center_point[1] + radius_of_sphere + self.thickness) | ||
| point_3 = (point_2[0], point_2[1] - outer_tri_opp, "straight") | ||
| else: | ||
| msg = f'upper_or_lower should be either "upper" or "lower". Not {self.upper_or_lower}' | ||
| raise ValueError(msg) | ||
|
|
||
| self.points = [point_1, point_2, point_3, point_6, point_7] | ||
|
|
||
| def create_solid(self): | ||
| """Creates a rotated 3d solid using points with circular edges. | ||
| Returns: | ||
| A CadQuery solid: A 3D solid volume | ||
| """ | ||
|
|
||
| radius_of_sphere = ((math.pow(self.chord_width, 2)) + (4.0 * math.pow(self.chord_height, 2))) / ( | ||
| 8 * self.chord_height | ||
| ) | ||
|
|
||
| # TODO set to 0 for now, add ability to shift the center of the chord left and right | ||
| chord_center = (0, self.chord_center_height) | ||
|
|
||
| if self.upper_or_lower == "upper": | ||
| center_point = (chord_center[0], chord_center[1] + self.chord_height - radius_of_sphere) | ||
| far_side = (center_point[0], center_point[1] - (radius_of_sphere + self.thickness)) | ||
| elif self.upper_or_lower == "lower": | ||
| center_point = (chord_center[0], chord_center[1] - self.chord_height + radius_of_sphere) | ||
| far_side = (center_point[0], center_point[1] + radius_of_sphere + self.thickness) | ||
| else: | ||
| raise ValueError("self.upper_or_lower") | ||
|
|
||
| big_sphere = ( | ||
| cq.Workplane(self.workplane) | ||
| .moveTo(center_point[0], center_point[1]) | ||
| .sphere(radius_of_sphere + self.thickness) | ||
| ) | ||
| small_sphere = cq.Workplane(self.workplane).moveTo(center_point[0], center_point[1]).sphere(radius_of_sphere) | ||
|
|
||
| outer_cylinder_cutter = RotateStraightShape( | ||
| workplane=self.workplane, | ||
| points=( | ||
| (chord_center[0], chord_center[1]), # cc | ||
| (self.points[1][0], self.points[1][1]), # point 2 | ||
| (self.points[2][0], self.points[2][1]), # point 3 | ||
| (self.points[2][0] + radius_of_sphere, self.points[2][1]), # point 3 wider | ||
| (self.points[2][0] + radius_of_sphere, far_side[1]), | ||
| far_side, | ||
| ), | ||
| rotation_angle=360, | ||
| ) | ||
|
|
||
| cap = Shape() | ||
| cap.solid = big_sphere.cut(small_sphere) | ||
|
|
||
| height = 2 * (radius_of_sphere + abs(center_point[1]) + self.thickness) | ||
| radius = 2 * (radius_of_sphere + abs(center_point[0]) + self.thickness) | ||
| cutter = CuttingWedge(height=height, radius=radius, rotation_angle=self.rotation_angle) | ||
|
|
||
| cap.solid = cap.solid.intersect(cutter.solid) | ||
| cap.solid = cap.solid.cut(outer_cylinder_cutter.solid) | ||
|
|
||
| self.solid = cap.solid |
Oops, something went wrong.