@@ -107,6 +107,9 @@ def component_volumes(self):
107107 build_variables .a_blkt_inboard_surface_full_coverage ,
108108 build_variables .a_blkt_outboard_surface_full_coverage ,
109109 build_variables .a_blkt_total_surface_full_coverage ,
110+ fwbs_variables .r_blkt_arc_1 ,
111+ fwbs_variables .r_blkt_arc_2 ,
112+ fwbs_variables .r_blkt_arc_3 ,
110113 ) = self .calculate_elliptical_blkt_areas (
111114 rmajor = physics_variables .rmajor ,
112115 rminor = physics_variables .rminor ,
@@ -394,7 +397,7 @@ def calculate_elliptical_blkt_areas(
394397 dr_shld_outboard : float ,
395398 dr_blkt_outboard : float ,
396399 dz_blkt_half : float ,
397- ) -> tuple [float , float , float ]:
400+ ) -> tuple [float , float , float , float , float , float ]:
398401 """Calculate elliptical blanket surface areas.
399402
400403 :param rmajor: Major radius of the plasma (m)
@@ -418,7 +421,8 @@ def calculate_elliptical_blkt_areas(
418421 :param dz_blkt_half: Half-height of the blanket (m)
419422 :type dz_blkt_half: float
420423
421- :return: Tuple containing inboard blanket surface area (m²), outboard blanket surface area (m²), and total blanket surface area (m²)
424+ :return: Tuple containing inboard blanket surface area (m²), outboard blanket surface area (m²), and total blanket surface area (m²),
425+ and three blanket arc radii (m)
422426
423427 """
424428 # Major radius to centre of inboard and outboard ellipses (m)
@@ -445,7 +449,14 @@ def calculate_elliptical_blkt_areas(
445449 a_blkt_total_surface ,
446450 ) = eshellarea (r1 , r2 , r3 , dz_blkt_half )
447451
448- return a_blkt_inboard_surface , a_blkt_outboard_surface , a_blkt_total_surface
452+ return (
453+ a_blkt_inboard_surface ,
454+ a_blkt_outboard_surface ,
455+ a_blkt_total_surface ,
456+ r1 ,
457+ r2 ,
458+ r3 ,
459+ )
449460
450461 @staticmethod
451462 def calculate_elliptical_blkt_volumes (
@@ -707,6 +718,27 @@ def output_blkt_volumes_and_areas(self):
707718 build_variables .a_blkt_total_surface_full_coverage ,
708719 )
709720
721+ po .oblnkl (self .outfile )
722+
723+ po .ovarst (
724+ self .outfile ,
725+ "First radial blanket arc point (m)" ,
726+ "(r_blkt_arc_1)" ,
727+ fwbs_variables .r_blkt_arc_1 ,
728+ )
729+ po .ovarst (
730+ self .outfile ,
731+ "Second radial blanket arc point (m)" ,
732+ "(r_blkt_arc_2)" ,
733+ fwbs_variables .r_blkt_arc_2 ,
734+ )
735+ po .ovarst (
736+ self .outfile ,
737+ "Third radial blanket arc point (m)" ,
738+ "(r_blkt_arc_3)" ,
739+ fwbs_variables .r_blkt_arc_3 ,
740+ )
741+
710742 def primary_coolant_properties (self , output : bool ):
711743 """Calculates the fluid properties of the Primary Coolant in the FW and BZ.
712744 Uses middle value of input and output temperatures of coolant.
0 commit comments