♻️ Create shield class

process/blanket_library.py

@@ -55,27 +55,17 @@ def component_volumes(self):
         # Calculate half-height
         # Blanket
         blanket_library.dz_blkt_half = self.component_half_height(icomponent=0)
-        # Shield
-        blanket_library.dz_shld_half = self.component_half_height(icomponent=1)
-        # Vacuum Vessel
-        blanket_library.dz_vv_half = self.component_half_height(icomponent=2)
 
         # D-shaped blanket and shield
         if physics_variables.itart == 1 or fwbs_variables.i_fw_blkt_vv_shape == 1:
-            for icomponent in range(3):
+            for icomponent in range(1):
                 self.dshaped_component(icomponent)
 
         # Elliptical blanket and shield
         else:
-            for icomponent in range(3):
+            for icomponent in range(1):
                 self.elliptical_component(icomponent)
 
-            # This will fail the hts_REBCO and 2D_scan regression tests,
-            # the number of VMCON iterations (nviter) is different.
-            # Seems to be because in the blanket calculations (icomponent=0):
-            # r2 = 1.3836567143743970 rather than old value of r2 = 1.3836567143743972,
-            # r3 = 3.7009701431231936 rather than r3 = 3.7009701431231923.
-
         # Apply coverage factors to volumes and surface areas
         self.apply_coverage_factors()
 
@@ -94,22 +84,10 @@ def component_half_height(self, icomponent: int):
                 + divertor_variables.dz_divertor
                 - build_variables.dz_blkt_upper
             )
-        # Sheild
-        elif icomponent == 1:
-            hbot = (
-                build_variables.z_plasma_xpoint_lower
-                + build_variables.dz_xpoint_divertor
-                + divertor_variables.dz_divertor
-            )
-        # Vacuum vessel
-        elif icomponent == 2:
-            hbot = (
-                build_variables.z_tf_inside_half
-                - build_variables.dz_shld_vv_gap
-                - build_variables.dz_vv_lower
-            )
         else:
-            raise ProcessValueError(f"{icomponent=} is invalid, it must be either 0,1,2")
+            raise ProcessValueError(
+                f"{icomponent=} is invalid, it must be 0 for blanket."
+            )
 
         # Calculate component internal upper half-height (m)
         # If a double null machine then symmetric
@@ -123,14 +101,6 @@ def component_half_height(self, icomponent: int):
                 + build_variables.dr_fw_inboard
                 + build_variables.dr_fw_outboard
             )
-            # Shield
-            if icomponent == 1:
-                htop = htop + build_variables.dz_blkt_upper
-            # Vacuum Vessel
-            if icomponent == 2:
-                htop = (
-                    htop + build_variables.dz_blkt_upper + build_variables.dz_shld_upper
-                )
 
         # Average of top and bottom (m)
         return 0.5 * (htop + hbot)
@@ -144,12 +114,10 @@ def dshaped_component(self, icomponent: int):
         # Calculate major radius to outer edge of inboard ...
         # ... section (m)
         r1 = build_variables.rsldi
-        # ... shield (m)
-        if icomponent == 1:
-            r1 = r1 + build_variables.dr_shld_inboard
+
         # ... blanket (m)
-        elif icomponent == 0:
-            r1 = r1 + build_variables.dr_shld_inboard + build_variables.dr_blkt_inboard
+
+        r1 = r1 + build_variables.dr_shld_inboard + build_variables.dr_blkt_inboard
 
         # Horizontal distance between inside edges (m)
         # i.e. outer radius of inboard part to inner radius of outboard part
@@ -161,12 +129,6 @@ def dshaped_component(self, icomponent: int):
             + build_variables.dr_fw_plasma_gap_outboard
             + build_variables.dr_fw_outboard
         )
-        # Sheild
-        if icomponent == 1:
-            r2 = build_variables.dr_blkt_inboard + r2 + build_variables.dr_blkt_outboard
-        # Vaccum Vessel
-        if icomponent == 2:
-            r2 = build_variables.rsldo - r1
 
         # Calculate surface area, assuming 100% coverage
         if icomponent == 0:
@@ -175,12 +137,6 @@ def dshaped_component(self, icomponent: int):
                 build_variables.a_blkt_outboard_surface,
                 build_variables.a_blkt_total_surface,
             ) = dshellarea(r1, r2, blanket_library.dz_blkt_half)
-        if icomponent == 1:
-            (
-                build_variables.a_shld_inboard_surface,
-                build_variables.a_shld_outboard_surface,
-                build_variables.a_shld_total_surface,
-            ) = dshellarea(r1, r2, blanket_library.dz_shld_half)
 
         # Calculate volumes, assuming 100% coverage
         if icomponent == 0:
@@ -196,32 +152,6 @@ def dshaped_component(self, icomponent: int):
                 build_variables.dr_blkt_outboard,
                 build_variables.dz_blkt_upper,
             )
-        elif icomponent == 1:
-            (
-                blanket_library.vol_shld_inboard,
-                blanket_library.vol_shld_outboard,
-                fwbs_variables.vol_shld_total,
-            ) = dshellvol(
-                r1,
-                r2,
-                blanket_library.dz_shld_half,
-                build_variables.dr_shld_inboard,
-                build_variables.dr_shld_outboard,
-                build_variables.dz_shld_upper,
-            )
-        elif icomponent == 2:
-            (
-                blanket_library.vol_vv_inboard,
-                blanket_library.vol_vv_outboard,
-                fwbs_variables.vol_vv,
-            ) = dshellvol(
-                r1,
-                r2,
-                blanket_library.dz_vv_half,
-                build_variables.dr_vv_inboard,
-                build_variables.dr_vv_outboard,
-                (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2,
-            )
 
     def elliptical_component(self, icomponent: int):
         """Calculate component surface area and volume using elliptical scheme
@@ -239,19 +169,15 @@ def elliptical_component(self, icomponent: int):
         # Calculate distance between r1 and outer edge of inboard ...
         # ... section (m)
         r2 = r1 - build_variables.rsldi
-        # ... shield (m)
-        if icomponent == 1:
-            r2 = r2 - build_variables.dr_shld_inboard
+
         # ... blanket (m)
         if icomponent == 0:
             r2 = r2 - build_variables.dr_shld_inboard - build_variables.dr_blkt_inboard
 
         # Calculate distance between r1 and inner edge of outboard ...
         # ... section (m)
         r3 = build_variables.rsldo - r1
-        # ... shield (m)
-        if icomponent == 1:
-            r3 = r3 - build_variables.dr_shld_outboard
+
         # ... blanket (m)
         if icomponent == 0:
             r3 = r3 - build_variables.dr_shld_outboard - build_variables.dr_blkt_outboard
@@ -263,12 +189,6 @@ def elliptical_component(self, icomponent: int):
                 build_variables.a_blkt_outboard_surface,
                 build_variables.a_blkt_total_surface,
             ) = eshellarea(r1, r2, r3, blanket_library.dz_blkt_half)
-        if icomponent == 1:
-            (
-                build_variables.a_shld_inboard_surface,
-                build_variables.a_shld_outboard_surface,
-                build_variables.a_shld_total_surface,
-            ) = eshellarea(r1, r2, r3, blanket_library.dz_shld_half)
 
         # Calculate volumes, assuming 100% coverage
         if icomponent == 0:
@@ -285,34 +205,6 @@ def elliptical_component(self, icomponent: int):
                 build_variables.dr_blkt_outboard,
                 build_variables.dz_blkt_upper,
             )
-        if icomponent == 1:
-            (
-                blanket_library.vol_shld_inboard,
-                blanket_library.vol_shld_outboard,
-                fwbs_variables.vol_shld_total,
-            ) = eshellvol(
-                r1,
-                r2,
-                r3,
-                blanket_library.dz_shld_half,
-                build_variables.dr_shld_inboard,
-                build_variables.dr_shld_outboard,
-                build_variables.dz_shld_upper,
-            )
-        if icomponent == 2:
-            (
-                blanket_library.vol_vv_inboard,
-                blanket_library.vol_vv_outboard,
-                fwbs_variables.vol_vv,
-            ) = eshellvol(
-                r1,
-                r2,
-                r3,
-                blanket_library.dz_vv_half,
-                build_variables.dr_vv_inboard,
-                build_variables.dr_vv_outboard,
-                (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2,
-            )
 
     def apply_coverage_factors(self):
         """Apply coverage factors to volumes
@@ -383,11 +275,6 @@ def apply_coverage_factors(self):
             blanket_library.vol_shld_inboard + blanket_library.vol_shld_outboard
         )
 
-        # Apply vacuum vessel coverage factor
-        # moved from dshaped_* and elliptical_* to keep coverage factor
-        # changes in the same location.
-        fwbs_variables.vol_vv = fwbs_variables.fvoldw * fwbs_variables.vol_vv
-
     def primary_coolant_properties(self, output: bool):
         """Calculates the fluid properties of the Primary Coolant in the FW and BZ.
         Uses middle value of input and output temperatures of coolant.

process/caller.py

@@ -296,6 +296,9 @@ def _call_models_once(self, xc: np.ndarray) -> None:
             # DCLL model
             self.models.dcll.run(output=False)
 
+        self.models.shield.run()
+        self.models.vacuum_vessel.run()
+
         self.models.divertor.run(output=False)
 
         self.models.cryostat.run()

process/hcpb.py

@@ -474,11 +474,6 @@ def nuclear_heating_magnets(self, output: bool):
         if build_variables.dr_vv_outboard > d_vv_all:
             d_vv_all = build_variables.dr_vv_outboard
 
-        if d_vv_all > 1.0e-6:
-            ccfe_hcpb_module.vv_density = fwbs_variables.m_vv / fwbs_variables.vol_vv
-        else:
-            ccfe_hcpb_module.vv_density = 0.0
-
         # Calculation of average blanket/shield thickness [m]
         if physics_variables.itart == 1:
             # There is no inner blanket for TART design [m]

process/main.py

@@ -102,11 +102,12 @@
 from process.pulse import Pulse
 from process.resistive_tf_coil import AluminiumTFCoil, CopperTFCoil, ResistiveTFCoil
 from process.scan import Scan
+from process.shield import Shield
 from process.stellarator import Neoclassics, Stellarator
 from process.structure import Structure
 from process.superconducting_tf_coil import SuperconductingTFCoil
 from process.tf_coil import TFCoil
-from process.vacuum import Vacuum
+from process.vacuum import Vacuum, VacuumVessel
 from process.water_use import WaterUse
 
 os.environ["PYTHON_PROCESS_ROOT"] = os.path.join(os.path.dirname(__file__))
@@ -667,8 +668,10 @@ def __init__(self):
         self.availability = Availability()
         self.buildings = Buildings()
         self.vacuum = Vacuum()
+        self.vacuum_vessel = VacuumVessel()
         self.water_use = WaterUse()
         self.pulse = Pulse()
+        self.shield = Shield()
         self.ife = IFE(availability=self.availability, costs=self.costs)
         self.plasma_profile = PlasmaProfile()
         self.fw = Fw()