公开PNRP17并接通实时气动机械耦合

app/simulation/systems/generic.py

@@ -8,6 +8,7 @@ from typing import Literal
 from app.simulation.core.base import DynamicComponent
 from app.simulation.core.metadata import ResultVariableMetadata
 from app.simulation.solvers.algebraic import PressureFlowSolver
+from app.simulation.solvers.pneumatic_volume import PneumaticVolumeResolver
 from app.simulation.solvers.solver import ODESolution, SolveIVPConfig, integrate_ode
 from app.simulation.solvers.signal import SignalResolver
 from app.simulation.solvers.stream import StreamResolver
@@ -233,6 +234,7 @@ class GenericFluidSystem:
         self.network = network
         self.dynamic_components = network.dynamic_components()
         self.pressure_flow_solver = PressureFlowSolver(network)
+        self.pneumatic_volume_resolver = PneumaticVolumeResolver(network)
         self.signal_resolver = SignalResolver(network)
         self.stream_resolver = StreamResolver(network)
         self.algebraic_solve_count = 0
@@ -240,6 +242,7 @@ class GenericFluidSystem:
         self.max_algebraic_evaluations = 0
         self.max_stream_iterations = 0
         self.signal_propagation_count = 0
+        self.pneumatic_volume_propagation_count = 0
 
     def initial_state_vector(self) -> list[float]:
         return self.network.initial_state_vector()
@@ -253,8 +256,14 @@ class GenericFluidSystem:
         for component in self.dynamic_components:
             component.refresh_thermodynamic_ports()
         algebraic = self.pressure_flow_solver.solve()
+        pneumatic_volume = self.pneumatic_volume_resolver.solve()
+        self.pneumatic_volume_propagation_count += pneumatic_volume.propagated
+        if pneumatic_volume.propagated:
+            for component in self.dynamic_components:
+                component.refresh_thermodynamic_ports()
+            algebraic = self.pressure_flow_solver.solve()
         stream, connected_h = self.stream_resolver.solve()
-        self.algebraic_solve_count += 1
+        self.algebraic_solve_count += 1 + int(bool(pneumatic_volume.propagated))
         self.max_algebraic_residual = max(
             self.max_algebraic_residual,
             algebraic.max_scaled_residual,
@@ -440,6 +449,14 @@ class GenericFluidSystem:
                     else None
                 ),
             },
+            "pneumaticVolume": {
+                "propagations": self.pneumatic_volume_propagation_count,
+                "last": (
+                    self.pneumatic_volume_resolver.last_diagnostics.as_dict()
+                    if self.pneumatic_volume_resolver.last_diagnostics is not None
+                    else None
+                ),
+            },
             "stateCount": len(initial_state),
             "sampleCount": len(series["time"]),
         }