修正test_mql气室压力约定

PythonModels/systems/test_mql_pneumatic.py

@@ -7,22 +7,37 @@ from PythonModels.components.amesim_pneumatic import (
     AmesimPneumaticGas,
     AmesimPneumaticOrifice,
     AmesimPneumaticVolume,
+    AmesimVariablePneumaticVolume,
 )
 from PythonModels.systems.test_mql_config import TestMqlConfig, TestMqlResolvedComponent
 
 
-ATMOSPHERIC_PRESSURE_BAR = 1.013
+AMESIM_REFERENCE_PRESSURE_PA = 101_300.0
 BAR_TO_PA = 1.0e5
 DEFAULT_TEST_MQL_TEMPERATURE_K = 293.15
+DEFAULT_VARIABLE_CHAMBER_PRESSURE_BAR = 1.0
 
 
 @dataclass(frozen=True)
 class TestMqlPneumaticAssembly:
     fixed_chambers: dict[str, AmesimPneumaticVolume]
-    variable_chambers: dict[str, AmesimPneumaticVolume]
+    variable_chambers: dict[str, AmesimVariablePneumaticVolume]
     fixed_orifices: dict[str, AmesimPneumaticOrifice]
     variable_orifices: dict[str, AmesimPneumaticOrifice]
-    initial_pressure_pa: float
+    fixed_initial_absolute_pressure_pa: float
+    variable_initial_absolute_pressure_pa: float
+
+    @property
+    def initial_pressure_pa(self) -> float:
+        return pressure_to_amesim_gauge_pa(self.fixed_initial_absolute_pressure_pa)
+
+    @property
+    def fixed_initial_gauge_pressure_pa(self) -> float:
+        return pressure_to_amesim_gauge_pa(self.fixed_initial_absolute_pressure_pa)
+
+    @property
+    def variable_initial_gauge_pressure_pa(self) -> float:
+        return pressure_to_amesim_gauge_pa(self.variable_initial_absolute_pressure_pa)
 
     @property
     def chamber_count(self) -> int:
@@ -53,13 +68,18 @@ def build_test_mql_pneumatic_assembly(
     gas: AmesimPneumaticGas = HELIUM_PNEUMATIC_GAS,
 ) -> TestMqlPneumaticAssembly:
     config = config or TestMqlConfig.from_amesim_specs()
-    initial_pressure_pa = pressure_from_amesim_bar_parameter(config.global_parameters["P0"])
+    fixed_initial_absolute_pressure_pa = absolute_pressure_from_amesim_bar_parameter(
+        config.global_parameters["P0"]
+    )
+    variable_initial_absolute_pressure_pa = absolute_pressure_from_amesim_bar_parameter(
+        DEFAULT_VARIABLE_CHAMBER_PRESSURE_BAR
+    )
     fixed_chambers = {
         component.alias: _build_chamber(
             component,
             volume_parameter="cvol",
             gas=gas,
-            initial_pressure_pa=initial_pressure_pa,
+            initial_pressure_pa=fixed_initial_absolute_pressure_pa,
         )
         for component in config.components_by_submodel("PNCH023")
     }
@@ -68,7 +88,7 @@ def build_test_mql_pneumatic_assembly(
             component,
             volume_parameter="cvol0",
             gas=gas,
-            initial_pressure_pa=initial_pressure_pa,
+            initial_pressure_pa=variable_initial_absolute_pressure_pa,
         )
         for component in config.components_by_submodel("PNCH012")
     }
@@ -95,12 +115,21 @@ def build_test_mql_pneumatic_assembly(
         variable_chambers=variable_chambers,
         fixed_orifices=fixed_orifices,
         variable_orifices=variable_orifices,
-        initial_pressure_pa=initial_pressure_pa,
+        fixed_initial_absolute_pressure_pa=fixed_initial_absolute_pressure_pa,
+        variable_initial_absolute_pressure_pa=variable_initial_absolute_pressure_pa,
     )
 
 
+def absolute_pressure_from_amesim_bar_parameter(pressure_bar: float) -> float:
+    return pressure_bar * BAR_TO_PA
+
+
+def pressure_to_amesim_gauge_pa(absolute_pressure_pa: float) -> float:
+    return absolute_pressure_pa - AMESIM_REFERENCE_PRESSURE_PA
+
+
 def pressure_from_amesim_bar_parameter(pressure_bar: float) -> float:
-    return (pressure_bar - ATMOSPHERIC_PRESSURE_BAR) * BAR_TO_PA
+    return pressure_to_amesim_gauge_pa(absolute_pressure_from_amesim_bar_parameter(pressure_bar))
 
 
 def _build_chamber(
@@ -110,6 +139,14 @@ def _build_chamber(
     gas: AmesimPneumaticGas,
     initial_pressure_pa: float,
 ) -> AmesimPneumaticVolume:
+    if volume_parameter == "cvol0":
+        return AmesimVariablePneumaticVolume.from_liters(
+            name=component.alias,
+            dead_volume_liters=component.parameter_value(volume_parameter),
+            gas=gas,
+            p0=initial_pressure_pa,
+            T0=_component_temperature(component),
+        )
     return AmesimPneumaticVolume.from_liters(
         name=component.alias,
         volume_liters=component.parameter_value(volume_parameter),