接入test_mql PNVO孔口边界

PythonModels/systems/test_mql.py

@@ -3940,14 +3940,18 @@ class TestMqlSystem:
     def typed_node3_count(self) -> int:
         return len(self.node3_assembly)
 
-    def _pnl0003_line_for_node_port(self, node_alias: str, port_name: str):
+    def _pnl0003_spec_for_node_port(self, node_alias: str, port_name: str):
         for spec in self.pnl0003_assembly.specs:
             if spec.source_component == node_alias and spec.source_port == port_name:
-                return self.pnl0003_assembly.lines[spec.alias]
+                return spec
             if spec.target_component == node_alias and spec.target_port == port_name:
-                return self.pnl0003_assembly.lines[spec.alias]
+                return spec
         raise KeyError(f"No PNL0003 line attached to {node_alias}.{port_name}")
 
+    def _pnl0003_line_for_node_port(self, node_alias: str, port_name: str):
+        spec = self._pnl0003_spec_for_node_port(node_alias, port_name)
+        return self.pnl0003_assembly.lines[spec.alias]
+
     def _pnl00r_line_for_node_port(self, node_alias: str, port_name: str):
         for spec in self.pnl00r_assembly.specs:
             if spec.source_component == node_alias and spec.source_port == port_name:
@@ -4300,14 +4304,14 @@ class TestMqlSystem:
         resistance_boundary_pressure_pa: float,
         inlet_node_temperature_k: float = 293.15,
         resistance_boundary_temperature_k: float = 293.15,
-        pnl0003_port_2_mass_flow_kg_s: float = 0.0,
-        pnl0003_port_2_temperature_k: float = 293.15,
+        p4_boundary_pressure_pa: float = 15.3e6,
+        p4_boundary_temperature_k: float = 293.15,
     ):
         """Close a PNL0001 chamber segment with the real outlet PN3 node.
 
         The PN3 primary pressure/temperature is taken from the attached PNL0003
-        port-1 compliance. The PNL0003 port-2 side and the far side of PNL00R
-        remain prescribed boundaries until PNVO/P4 semantics are inserted.
+        port-1 compliance. The PNL0003 port-2 side is connected through the
+        real PNVO001 orifice to a prescribed P4 pressure boundary.
         """
         from PythonModels.components.amesim_pneumatic import (
             AmesimPneumaticOrifice,
@@ -4315,14 +4319,20 @@ class TestMqlSystem:
         )
         from PythonModels.systems.test_mql_closure import (
             TestMqlPneumaticBoundaryCondition,
-            TestMqlPneumaticFlowBoundaryCondition,
             TestMqlPn3NodeChamberSegmentClosure,
             TestMqlPn3NodeChamberSegmentComponents,
         )
 
         inlet_line = self.pnl0001_assembly.lines[spec.inlet_line_alias]
         outlet_line = self.pnl0001_assembly.lines[spec.outlet_line_alias]
-        node_line = self._pnl0003_line_for_node_port(spec.outlet_node_alias, "port_2")
+        node_line_spec = self._pnl0003_spec_for_node_port(spec.outlet_node_alias, "port_2")
+        node_line = self.pnl0003_assembly.lines[node_line_spec.alias]
+        node_orifice_alias = (
+            node_line_spec.target_component
+            if node_line_spec.source_component == spec.outlet_node_alias
+            else node_line_spec.source_component
+        )
+        node_orifice = self.pneumatic_assembly.variable_orifices[node_orifice_alias]
         node_resistance = self._pnl00r_line_for_node_port(
             spec.outlet_node_alias, "port_1"
         )
@@ -4346,6 +4356,7 @@ class TestMqlSystem:
                 outlet_line=outlet_line,
                 node_line=node_line,
                 node_resistance=node_resistance,
+                node_orifice=node_orifice,
                 node=node,
                 volume=volume,
                 inlet_orifice=inlet_orifice,
@@ -4360,9 +4371,9 @@ class TestMqlSystem:
                 pressure_pa=resistance_boundary_pressure_pa,
                 temperature_k=resistance_boundary_temperature_k,
             ),
-            pnl0003_port_2_flow=TestMqlPneumaticFlowBoundaryCondition(
-                mass_flow_kg_s=pnl0003_port_2_mass_flow_kg_s,
-                temperature_k=pnl0003_port_2_temperature_k,
+            p4_boundary=TestMqlPneumaticBoundaryCondition(
+                pressure_pa=p4_boundary_pressure_pa,
+                temperature_k=p4_boundary_temperature_k,
             ),
         )
 
@@ -4374,8 +4385,8 @@ class TestMqlSystem:
         resistance_boundary_pressure_pa: float,
         inlet_node_temperature_k: float = 293.15,
         resistance_boundary_temperature_k: float = 293.15,
-        pnl0003_port_2_mass_flow_kg_s: float = 0.0,
-        pnl0003_port_2_temperature_k: float = 293.15,
+        p4_boundary_pressure_pa: float = 15.3e6,
+        p4_boundary_temperature_k: float = 293.15,
         config: SolveIVPConfig | None = None,
         t_eval: list[float] | None = None,
     ):
@@ -4385,8 +4396,8 @@ class TestMqlSystem:
             resistance_boundary_pressure_pa=resistance_boundary_pressure_pa,
             inlet_node_temperature_k=inlet_node_temperature_k,
             resistance_boundary_temperature_k=resistance_boundary_temperature_k,
-            pnl0003_port_2_mass_flow_kg_s=pnl0003_port_2_mass_flow_kg_s,
-            pnl0003_port_2_temperature_k=pnl0003_port_2_temperature_k,
+            p4_boundary_pressure_pa=p4_boundary_pressure_pa,
+            p4_boundary_temperature_k=p4_boundary_temperature_k,
         )
         run_config = config or SolveIVPConfig(t_stop=1.0e-4, max_step=1.0e-5)
         return integrate_ode(