修复test_mql事件后积分步长控制

PythonModels/components/amesim_pneumatic.py

@@ -82,12 +82,24 @@ class AmesimPneumaticVolume(DynamicComponent):
         gas: AmesimPneumaticGas = HELIUM_PNEUMATIC_GAS,
         p0: float = 101_325.0,
         T0: float = 293.15,
+        heat_transfer_coefficient: float = 0.0,
+        heat_transfer_area: float = 0.0,
+        external_temperature_k: float = 293.15,
     ) -> None:
         if volume <= 0.0:
             raise ValueError("volume must be positive.")
+        if heat_transfer_coefficient < 0.0:
+            raise ValueError("heat_transfer_coefficient must be non-negative.")
+        if heat_transfer_area < 0.0:
+            raise ValueError("heat_transfer_area must be non-negative.")
+        if external_temperature_k <= 0.0:
+            raise ValueError("external_temperature_k must be positive.")
         super().__init__(name=name)
         self.volume = volume
         self.gas = gas
+        self.heat_transfer_coefficient = heat_transfer_coefficient
+        self.heat_transfer_area = heat_transfer_area
+        self.external_temperature = external_temperature_k
         rho0 = gas.density(p0, T0)
         m0 = rho0 * volume
         U0 = m0 * gas.specific_internal_energy(T0)
@@ -103,8 +115,20 @@ class AmesimPneumaticVolume(DynamicComponent):
         gas: AmesimPneumaticGas = HELIUM_PNEUMATIC_GAS,
         p0: float = 101_325.0,
         T0: float = 293.15,
+        heat_transfer_coefficient: float = 0.0,
+        heat_transfer_area: float = 0.0,
+        external_temperature_k: float = 293.15,
     ) -> "AmesimPneumaticVolume":
-        return cls(name=name, volume=liters_to_m3(volume_liters), gas=gas, p0=p0, T0=T0)
+        return cls(
+            name=name,
+            volume=liters_to_m3(volume_liters),
+            gas=gas,
+            p0=p0,
+            T0=T0,
+            heat_transfer_coefficient=heat_transfer_coefficient,
+            heat_transfer_area=heat_transfer_area,
+            external_temperature_k=external_temperature_k,
+        )
 
     def get_state_vector(self) -> list[float]:
         return self.state.as_vector()
@@ -118,6 +142,14 @@ class AmesimPneumaticVolume(DynamicComponent):
     def volume_rate_m3_s(self) -> float:
         return 0.0
 
+    def thermal_energy_flow_w(self, temperature_k: float | None = None) -> float:
+        temperature = self.properties().T if temperature_k is None else temperature_k
+        return (
+            self.heat_transfer_coefficient
+            * self.heat_transfer_area
+            * (self.external_temperature - temperature)
+        )
+
     def gas_mass_g(self) -> float:
         return kg_to_g(self.state.m)
 
@@ -139,7 +171,10 @@ class AmesimPneumaticVolume(DynamicComponent):
         return ThermodynamicProperties(p=p, T=T, rho=rho, u=u, h=h)
 
     def derivatives(self, inlet_h: float, m_flow: float) -> VolumeState:
-        return VolumeState(m=m_flow, U=m_flow * inlet_h)
+        return VolumeState(
+            m=m_flow,
+            U=m_flow * inlet_h + self.thermal_energy_flow_w(),
+        )
 
     def derivatives_from_two_connections(
         self,
@@ -151,6 +186,7 @@ class AmesimPneumaticVolume(DynamicComponent):
         internal_h: float,
         volume_rate_m3_s: float | None = None,
     ) -> VolumeState:
+        properties = self.properties()
         inlet_h_a = self.connection_inlet_enthalpy(
             port_m_flow=port_a_m_flow,
             connected_h=connected_h_a,
@@ -166,7 +202,8 @@ class AmesimPneumaticVolume(DynamicComponent):
             U=(
                 port_a_m_flow * inlet_h_a
                 + port_b_m_flow * inlet_h_b
-                - self.properties().p * (
+                + self.thermal_energy_flow_w(properties.T)
+                - properties.p * (
                     self.volume_rate_m3_s()
                     if volume_rate_m3_s is None
                     else volume_rate_m3_s
@@ -186,6 +223,9 @@ class AmesimVariablePneumaticVolume(AmesimPneumaticVolume):
         p0: float = 101_325.0,
         T0: float = 293.15,
         external_volume: float = 0.0,
+        heat_transfer_coefficient: float = 0.0,
+        heat_transfer_area: float = 0.0,
+        external_temperature_k: float = 293.15,
     ) -> None:
         if dead_volume <= 0.0:
             raise ValueError("dead_volume must be positive.")
@@ -200,6 +240,9 @@ class AmesimVariablePneumaticVolume(AmesimPneumaticVolume):
             gas=gas,
             p0=p0,
             T0=T0,
+            heat_transfer_coefficient=heat_transfer_coefficient,
+            heat_transfer_area=heat_transfer_area,
+            external_temperature_k=external_temperature_k,
         )
 
     @classmethod
@@ -211,6 +254,9 @@ class AmesimVariablePneumaticVolume(AmesimPneumaticVolume):
         p0: float = 101_325.0,
         T0: float = 293.15,
         external_volume_liters: float = 0.0,
+        heat_transfer_coefficient: float = 0.0,
+        heat_transfer_area: float = 0.0,
+        external_temperature_k: float = 293.15,
     ) -> "AmesimVariablePneumaticVolume":
         return cls(
             name=name,
@@ -219,6 +265,9 @@ class AmesimVariablePneumaticVolume(AmesimPneumaticVolume):
             p0=p0,
             T0=T0,
             external_volume=liters_to_m3(external_volume_liters),
+            heat_transfer_coefficient=heat_transfer_coefficient,
+            heat_transfer_area=heat_transfer_area,
+            external_temperature_k=external_temperature_k,
         )
 
     def volume_rate_m3_s(self) -> float:

PythonModels/components/amesim_pneumatic_line.py

@@ -48,7 +48,7 @@ class _DarcyPipeResistanceMixin:
             if upper > 1.0e3:
                 raise ValueError("unable to bracket pneumatic pipe resistance flow")
         lower = 0.0
-        for _ in range(80):
+        for _ in range(48):
             middle = 0.5 * (lower + upper)
             if self._darcy_pressure_drop(
                 middle,
@@ -255,15 +255,19 @@ class AmesimPnl0001Pipe(_DarcyPipeResistanceMixin, DynamicComponent):
         connected_h_2: float,
     ) -> VolumeState:
         internal = self.properties()
-        inlet_h_1 = self.connection_inlet_enthalpy(
-            port_m_flow=port_1_m_flow,
-            connected_h=connected_h_1,
-            internal_h=internal.h,
+        # PNL0001 is a fixed-volume distributed line store. Its transported
+        # energy variable therefore follows specific internal energy, not the
+        # chamber-style stagnation enthalpy contract. For this ideal gas,
+        # h = gamma * u. Outflow always carries the local u.
+        inlet_u_1 = (
+            connected_h_1 / self.gas.gamma
+            if port_1_m_flow > 0.0
+            else internal.u
         )
-        inlet_h_2 = self.connection_inlet_enthalpy(
-            port_m_flow=port_2_m_flow,
-            connected_h=connected_h_2,
-            internal_h=internal.h,
+        inlet_u_2 = (
+            connected_h_2 / self.gas.gamma
+            if port_2_m_flow > 0.0
+            else internal.u
         )
         heat_flow = (
             self.heat_transfer_coefficient
@@ -272,7 +276,7 @@ class AmesimPnl0001Pipe(_DarcyPipeResistanceMixin, DynamicComponent):
         )
         return VolumeState(
             m=port_1_m_flow + port_2_m_flow,
-            U=port_1_m_flow * inlet_h_1 + port_2_m_flow * inlet_h_2 + heat_flow,
+            U=port_1_m_flow * inlet_u_1 + port_2_m_flow * inlet_u_2 + heat_flow,
         )