refactor: merge single speed and variable speed common shaft compressor trains (#1136)

chore: update and move some tests

Author: olelod

src/libecalc/common/energy_model_type.py

@@ -8,6 +8,7 @@ class EnergyModelType(str, Enum):
     PUMP_MODEL = "PUMP_MODEL"
     COMPRESSOR_TRAIN_SIMPLIFIED_WITH_KNOWN_STAGES = "COMPRESSOR_TRAIN_SIMPLIFIED_WITH_KNOWN_NUMBER_OF_COMPRESSORS"
     COMPRESSOR_TRAIN_SIMPLIFIED_WITH_UNKNOWN_STAGES = "COMPRESSOR_TRAIN_SIMPLIFIED_WITH_UNKNOWN_NUMBER_OF_COMPRESSORS"
+    COMPRESSOR_TRAIN_COMMON_SHAFT = "COMPRESSOR_TRAIN_COMMON_SHAFT"
     VARIABLE_SPEED_COMPRESSOR_TRAIN_COMMON_SHAFT = "VARIABLE_SPEED_COMPRESSOR_TRAIN_COMMON_SHAFT"
     SINGLE_SPEED_COMPRESSOR_TRAIN_COMMON_SHAFT = "SINGLE_SPEED_COMPRESSOR_TRAIN_COMMON_SHAFT"
     VARIABLE_SPEED_COMPRESSOR_TRAIN_MULTIPLE_STREAMS_AND_PRESSURES = (

src/libecalc/common/serializable_chart.py

@@ -5,6 +5,7 @@
 
 from libecalc.common.logger import logger
 from libecalc.common.string.string_utils import to_camel_case
+from libecalc.domain.component_validation_error import ProcessChartTypeValidationException
 
 
 class EcalcBaseModel(BaseModel):
@@ -85,6 +86,13 @@ def sort_chart_curves_by_speed(cls, curves: list[ChartCurveDTO]) -> list[ChartCu
         """Note: It is essential that the sort the curves by speed in order to set up the interpolations correctly."""
         return sorted(curves, key=lambda x: x.speed)
 
+    @model_validator(mode="after")
+    def check_that_there_is_at_least_one_chart_curve(self) -> Self:
+        if len(self.curves) == 0:
+            msg = "At least one chart curve must be given to define a compressor performance chart."
+            raise ProcessChartTypeValidationException(message=msg)
+        return self
+
     @property
     def min_speed(self) -> float:
         return min([curve.speed for curve in self.curves])

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/consumer_function/compressor_consumer_function.py

@@ -5,8 +5,8 @@
     ConsumerFunctionResult,
 )
 from libecalc.domain.process.compressor.core.base import CompressorModel, CompressorWithTurbineModel
-from libecalc.domain.process.compressor.core.train.variable_speed_compressor_train_common_shaft_multiple_streams_and_pressures import (
-    VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures,
+from libecalc.domain.process.compressor.core.train.compressor_train_common_shaft_multiple_streams_and_pressures import (
+    CompressorTrainCommonShaftMultipleStreamsAndPressures,
 )
 from libecalc.domain.time_series_flow_rate import TimeSeriesFlowRate
 from libecalc.domain.time_series_power_loss_factor import TimeSeriesPowerLossFactor
@@ -42,7 +42,7 @@ def __init__(
 
         rate_expression = rate_expression if isinstance(rate_expression, list) else [rate_expression]
 
-        if not isinstance(self._compressor_model, VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures):
+        if not isinstance(self._compressor_model, CompressorTrainCommonShaftMultipleStreamsAndPressures):
             assert len(rate_expression) == 1
             stream_day_rate = np.asarray(rate_expression[0].get_stream_day_values(), dtype=np.float64)
         else:

src/libecalc/domain/process/compressor/core/train/base.py

@@ -11,7 +11,7 @@
 from libecalc.common.serializable_chart import ChartDTO
 from libecalc.domain.component_validation_error import ProcessChartTypeValidationException
 from libecalc.domain.process.compressor.core.results import CompressorTrainResultSingleTimeStep
-from libecalc.domain.process.compressor.core.train.base import CompressorTrainModel
+from libecalc.domain.process.compressor.core.train.compressor_train_common_shaft import CompressorTrainCommonShaft
 from libecalc.domain.process.compressor.core.train.stage import CompressorTrainStage
 from libecalc.domain.process.compressor.core.train.train_evaluation_input import CompressorTrainEvaluationInput
 from libecalc.domain.process.compressor.core.train.types import FluidStreamObjectForMultipleStreams
@@ -26,7 +26,7 @@
 from libecalc.domain.process.value_objects.fluid_stream.fluid_model import FluidModel
 
 
-class VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures(CompressorTrainModel):
+class CompressorTrainCommonShaftMultipleStreamsAndPressures(CompressorTrainCommonShaft):
     """An advanced model of a compressor train with variable speed, with the possibility of modelling additional
     streams going into or leaving the compressor train between the compressor train stages.
 
@@ -768,7 +768,7 @@ def find_and_calculate_for_compressor_train_with_two_pressure_requirements(
 
 
 def split_rates_on_stage_number(
-    compressor_train: VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures,
+    compressor_train: CompressorTrainCommonShaftMultipleStreamsAndPressures,
     rates_per_stream: list[float],
     stage_number: int,
 ) -> tuple[list[float], list[float]]:
@@ -806,13 +806,13 @@ def split_rates_on_stage_number(
 
 
 def split_train_on_stage_number(
-    compressor_train: VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures,
+    compressor_train: CompressorTrainCommonShaftMultipleStreamsAndPressures,
     stage_number: int,
     pressure_control_first_part: FixedSpeedPressureControl | None = None,
     pressure_control_last_part: FixedSpeedPressureControl | None = None,
 ) -> tuple[
-    VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures,
-    VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures,
+    CompressorTrainCommonShaftMultipleStreamsAndPressures,
+    CompressorTrainCommonShaftMultipleStreamsAndPressures,
 ]:
     """
     Splits a variable speed compressor train into two sub-trains at the specified stage number.
@@ -838,7 +838,7 @@ def split_train_on_stage_number(
     # First part uses the main fluid factory (already made from first stream)
     fluid_factory_first_part = compressor_train.fluid_factory
 
-    compressor_train_first_part = VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures(
+    compressor_train_first_part = CompressorTrainCommonShaftMultipleStreamsAndPressures(
         streams=streams_first_part,
         fluid_factory=fluid_factory_first_part,
         energy_usage_adjustment_constant=compressor_train.energy_usage_adjustment_constant,
@@ -872,7 +872,7 @@ def split_train_on_stage_number(
     # This will be updated at runtime after the fluid model (composition) is changed
     fluid_factory_last_part = compressor_train.fluid_factory
 
-    compressor_train_last_part = VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures(
+    compressor_train_last_part = CompressorTrainCommonShaftMultipleStreamsAndPressures(
         streams=streams_last_part,
         fluid_factory=fluid_factory_last_part,
         energy_usage_adjustment_constant=compressor_train.energy_usage_adjustment_constant,