Add tests for DShaped vessel volume calculations in vacuum module

Author: chris-ashe

process/hcpb.py

@@ -474,10 +474,10 @@ 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
+        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:

process/vacuum.py

@@ -779,7 +779,8 @@ def calculate_vessel_half_height(
                 + dr_fw_inboard
                 + dr_fw_outboard
             )
-        z_top = z_top + dz_blkt_upper + dz_shld_upper
+
+            z_top = z_top + dz_blkt_upper + dz_shld_upper
 
         # Average of top and bottom (m)
         return 0.5 * (z_top + z_bottom)

tests/unit/test_blanket_library.py

@@ -647,7 +647,7 @@ class DshapedComponentParam(NamedTuple):
             dz_blkt_half=8.25,
             dz_shld_half=8.75,
             dz_vv_half=9.4349999999999987,
-            icomponent=0,
+            icomponent=1,
             expected_a_blkt_inboard_surface=196.97785938008002,
             expected_a_blkt_outboard_surface=852.24160940262459,
             expected_a_blkt_total_surface=1049.2194687827046,
@@ -664,59 +664,6 @@ class DshapedComponentParam(NamedTuple):
             expected_vol_vv_outboard=0,
             expected_icomponent=1,
         ),
-        DshapedComponentParam(
-            rsldi=1.5,
-            dr_shld_inboard=0.40000000000000002,
-            dr_blkt_inboard=0,
-            dr_fw_inboard=0.018000000000000002,
-            dr_fw_plasma_gap_inboard=0.10000000000000001,
-            dr_fw_plasma_gap_outboard=0.10000000000000001,
-            dr_fw_outboard=0.018000000000000002,
-            a_blkt_inboard_surface=196.97785938008002,
-            a_blkt_outboard_surface=852.24160940262459,
-            a_blkt_total_surface=1049.2194687827046,
-            dr_blkt_outboard=1,
-            dz_blkt_upper=0.5,
-            a_shld_inboard_surface=208.91591146372122,
-            a_shld_outboard_surface=1013.8483589087293,
-            a_shld_total_surface=1222.7642703724505,
-            dr_shld_outboard=0.30000000000000004,
-            dz_shld_upper=0.60000000000000009,
-            rsldo=8.4000000000000004,
-            dr_vv_inboard=0.20000000000000001,
-            dr_vv_outboard=0.30000000000000004,
-            dz_vv_upper=0.30000000000000004,
-            dz_vv_lower=0.30000000000000004,
-            vol_blkt_inboard=0,
-            vol_blkt_outboard=691.06561956756764,
-            vol_blkt_total=691.06561956756764,
-            vol_shld_total=450.46122947809488,
-            vol_vv=0,
-            rminor=2.5,
-            vol_shld_inboard=79.896984366095609,
-            vol_shld_outboard=370.5642451119993,
-            vol_vv_inboard=0,
-            vol_vv_outboard=0,
-            dz_blkt_half=8.25,
-            dz_shld_half=8.75,
-            dz_vv_half=9.4349999999999987,
-            icomponent=1,
-            expected_a_blkt_inboard_surface=196.97785938008002,
-            expected_a_blkt_outboard_surface=852.24160940262459,
-            expected_a_blkt_total_surface=1049.2194687827046,
-            expected_a_shld_inboard_surface=208.91591146372122,
-            expected_a_shld_outboard_surface=1013.8483589087293,
-            expected_a_shld_total_surface=1222.7642703724505,
-            expected_vol_blkt_outboard=691.06561956756764,
-            expected_volblkt=691.06561956756764,
-            expected_vol_shld_total=450.46122947809488,
-            expected_vol_vv=340.45369594344834,
-            expected_vol_shld_inboard=79.896984366095609,
-            expected_vol_shld_outboard=370.5642451119993,
-            expected_vol_vv_inboard=34.253413020620215,
-            expected_vol_vv_outboard=306.20028292282814,
-            expected_icomponent=2,
-        ),
     ),
 )
 def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_fixture):

tests/unit/test_vacuum.py

@@ -187,3 +187,59 @@ def test_elliptical_vessel_volumes(vacuum_vessel, elliptical_vessel_volumes, exp
     assert vol_vv_inboard == expected[0]
     assert vol_vv_outboard == expected[1]
     assert vol_vv == expected[2]
+
+
+class DShapedVesselVolumes(NamedTuple):
+    rsldi: Any = None
+    rsldo: Any = None
+    dz_vv_half: Any = None
+    dr_vv_inboard: Any = None
+    dr_vv_outboard: Any = None
+    dz_vv_upper: Any = None
+    dz_vv_lower: Any = None
+
+
+@pytest.mark.parametrize(
+    "dshaped_vessel_volumes, expected",
+    [
+        (
+            DShapedVesselVolumes(
+                rsldi=1.5,
+                rsldo=8.4000000000000004,
+                dz_vv_half=9.4349999999999987,
+                dr_vv_inboard=0.20000000000000001,
+                dr_vv_outboard=0.30000000000000004,
+                dz_vv_upper=0.30000000000000004,
+                dz_vv_lower=0.30000000000000004,
+            ),
+            (
+                pytest.approx(34.253413020620215),
+                pytest.approx(306.20028292282814),
+                pytest.approx(340.45369594344834),
+            ),
+        )
+    ],
+)
+def test_dshaped_vessel_volumes(vacuum_vessel, dshaped_vessel_volumes, expected):
+    """Tests `dshaped_vessel_volumes` function.
+
+    :param dshaped_vessel_volumes: input parameters for the function
+    :type dshaped_vessel_volumes: DShapedVesselVolumes
+
+    """
+
+    vol_vv_inboard, vol_vv_outboard, vol_vv = (
+        vacuum_vessel.calculate_dshaped_vessel_volumes(
+            rsldi=dshaped_vessel_volumes.rsldi,
+            rsldo=dshaped_vessel_volumes.rsldo,
+            dz_vv_half=dshaped_vessel_volumes.dz_vv_half,
+            dr_vv_inboard=dshaped_vessel_volumes.dr_vv_inboard,
+            dr_vv_outboard=dshaped_vessel_volumes.dr_vv_outboard,
+            dz_vv_upper=dshaped_vessel_volumes.dz_vv_upper,
+            dz_vv_lower=dshaped_vessel_volumes.dz_vv_lower,
+        )
+    )
+
+    assert vol_vv_inboard == expected[0]
+    assert vol_vv_outboard == expected[1]
+    assert vol_vv == expected[2]