refactor: replace FluidStream with FluidModel in FluidStreamObjectForMultipleStreams

Replace fluid property with fluid_model property to better represent
fluid specifications rather than actual streams with flow rates.

Author: kjbrak

src/libecalc/domain/process/compressor/core/factory.py

@@ -7,7 +7,6 @@
 from libecalc.domain.infrastructure.energy_components.turbine import Turbine
 from libecalc.domain.process.compressor.core.base import CompressorModel, CompressorWithTurbineModel
 from libecalc.domain.process.compressor.core.sampled import CompressorModelSampled
-from libecalc.domain.process.compressor.core.train.fluid import FluidStream
 from libecalc.domain.process.compressor.core.train.simplified_train import (
     CompressorTrainSimplifiedKnownStages,
     CompressorTrainSimplifiedUnknownStages,
@@ -41,7 +40,7 @@ def _create_variable_speed_compressor_train_multiple_streams_and_pressures_strea
     is_inlet_stream = stream_data.typ == FluidStreamType.INGOING
     return FluidStreamObjectForMultipleStreams(
         name=stream_data.name,
-        fluid=FluidStream(fluid_model=stream_data.fluid_model) if stream_data.fluid_model else None,
+        fluid_model=stream_data.fluid_model,
         is_inlet_stream=is_inlet_stream,
         connected_to_stage_no=stream_references[stream_data.name],
     )

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

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from libecalc.common.fluid import FluidModel
 from libecalc.common.logger import logger
 from libecalc.domain.component_validation_error import ModelValidationError, ProcessFluidModelValidationException
-from libecalc.domain.process.compressor.core.train.fluid import FluidStream
 from libecalc.presentation.yaml.validation_errors import Location
 
 
@@ -15,17 +15,17 @@ def __init__(
         self,
         is_inlet_stream: bool,
         name: str | None = None,
-        fluid: FluidStream | None = None,
+        fluid_model: FluidModel | None = None,
         connected_to_stage_no: int = 0,
     ):
         self.name = name
-        self.fluid = fluid
+        self.fluid_model = fluid_model
         self.is_inlet_stream = is_inlet_stream
         self.connected_to_stage_no = connected_to_stage_no
         self.check_valid_input()
 
     def check_valid_input(self):
-        if not self.is_inlet_stream and self.fluid:
+        if not self.is_inlet_stream and self.fluid_model:
             msg = "Outgoing stream should not have a fluid model defined"
             logger.error(msg)
 
@@ -37,7 +37,7 @@ def check_valid_input(self):
                 ],
             )
 
-        if self.is_inlet_stream and not self.fluid:
+        if self.is_inlet_stream and not self.fluid_model:
             msg = "Ingoing stream needs a fluid model to be defined"
             logger.error(msg)
             raise ProcessFluidModelValidationException(

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

@@ -6,7 +6,6 @@
 from libecalc.common.logger import logger
 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.fluid import FluidStream as TrainFluidStream
 from libecalc.domain.process.compressor.core.train.train_evaluation_input import CompressorTrainEvaluationInput
 from libecalc.domain.process.compressor.core.train.types import FluidStreamObjectForMultipleStreams
 from libecalc.domain.process.compressor.core.train.utils.common import EPSILON
@@ -396,8 +395,8 @@ def calculate_compressor_train(
                 fluid_streams.append(
                     FluidStream.from_standard_rate(
                         thermo_system=NeqSimThermoSystem(
-                            composition=self.streams[i].fluid.fluid_model.composition,
-                            eos_model=self.streams[i].fluid.fluid_model.eos_model,
+                            composition=self.streams[i].fluid_model.composition,
+                            eos_model=self.streams[i].fluid_model.eos_model,
                             conditions=ProcessConditions(
                                 pressure_bara=constraints.suction_pressure,
                                 temperature_kelvin=self.stages[0].inlet_temperature_kelvin,
@@ -569,17 +568,13 @@ def find_and_calculate_for_compressor_train_with_two_pressure_requirements(
             max_standard_rate_per_stream = [float("nan")] * len(std_rates_first_part)  # type: ignore[list-item]
 
         # set self.inlet_fluid based on outlet_stream_first_part
-        compressor_train_last_part.streams[
-            0
-        ].fluid = TrainFluidStream(  # filling the placeholder with the correct fluid
-            fluid_model=FluidModel(
-                composition=compressor_train_results_first_part_with_optimal_speed_result.stage_results[
-                    -1
-                ].outlet_stream.thermo_system.composition,
-                eos_model=compressor_train_results_first_part_with_optimal_speed_result.stage_results[
-                    -1
-                ].outlet_stream.thermo_system.eos_model,
-            )
+        compressor_train_last_part.streams[0].fluid_model = FluidModel(
+            composition=compressor_train_results_first_part_with_optimal_speed_result.stage_results[
+                -1
+            ].outlet_stream.thermo_system.composition,
+            eos_model=compressor_train_results_first_part_with_optimal_speed_result.stage_results[
+                -1
+            ].outlet_stream.thermo_system.eos_model,
         )
 
         compressor_train_last_part_optimal_speed = compressor_train_last_part.find_shaft_speed_given_constraints(
@@ -801,7 +796,7 @@ def split_train_on_stage_number(
     streams_last_part.extend(
         [
             FluidStreamObjectForMultipleStreams(
-                fluid=stream.fluid,
+                fluid_model=stream.fluid_model,
                 is_inlet_stream=stream.is_inlet_stream,
                 connected_to_stage_no=stream.connected_to_stage_no - stage_number,
             )

tests/libecalc/core/models/compressor_modelling/conftest.py

@@ -12,7 +12,6 @@
 from libecalc.common.fluid import FluidModel, MultipleStreamsAndPressureStream
 from libecalc.common.units import Unit
 from libecalc.domain.process.compressor import dto
-from libecalc.domain.process.compressor.core.train.fluid import FluidStream
 from libecalc.domain.process.compressor.core.train.single_speed_compressor_train_common_shaft import (
     SingleSpeedCompressorTrainCommonShaft,
 )
@@ -299,7 +298,7 @@ def variable_speed_compressor_train_two_compressors_one_stream(
     """Train with only two compressors, and standard medium fluid, one stream in per stage, no liquid off take."""
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),

tests/libecalc/core/models/compressor_modelling/test_variable_speed_compressor_train_multiple_streams.py

@@ -9,7 +9,6 @@
 from libecalc.common.fluid import MultipleStreamsAndPressureStream
 from libecalc.common.fluid_stream_type import FluidStreamType
 from libecalc.domain.process.compressor import dto
-from libecalc.domain.process.compressor.core.train.fluid import FluidStream
 from libecalc.domain.process.compressor.core.train.types import FluidStreamObjectForMultipleStreams
 from libecalc.domain.process.compressor.core.train.variable_speed_compressor_train_common_shaft import (
     VariableSpeedCompressorTrainCommonShaft,
@@ -117,9 +116,7 @@ def variable_speed_compressor_train_one_compressor_one_stream(
     dto_copy.maximum_power = 7
     return VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures(
         streams=[
-            FluidStreamObjectForMultipleStreams(
-                fluid=FluidStream(medium_fluid), is_inlet_stream=True, connected_to_stage_no=0
-            )
+            FluidStreamObjectForMultipleStreams(fluid_model=medium_fluid, is_inlet_stream=True, connected_to_stage_no=0)
         ],
         data_transfer_object=dto_copy,
     )
@@ -141,9 +138,7 @@ def variable_speed_compressor_train_one_compressor_one_stream_downstream_choke(
 
     return VariableSpeedCompressorTrainCommonShaftMultipleStreamsAndPressures(
         streams=[
-            FluidStreamObjectForMultipleStreams(
-                fluid=FluidStream(medium_fluid), is_inlet_stream=True, connected_to_stage_no=0
-            )
+            FluidStreamObjectForMultipleStreams(fluid_model=medium_fluid, is_inlet_stream=True, connected_to_stage_no=0)
         ],
         data_transfer_object=dto_copy,
     )
@@ -158,7 +153,7 @@ def variable_speed_compressor_train_two_compressors_one_stream_downstream_choke(
     """Train with only two compressors, and standard medium fluid, one stream in per stage, no liquid off take."""
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),
@@ -184,7 +179,7 @@ def variable_speed_compressor_train_two_compressors_one_stream_individual_asv_pr
     """Train with only two compressors, and standard medium fluid, one stream in per stage, no liquid off take."""
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),
@@ -210,12 +205,12 @@ def variable_speed_compressor_train_two_compressors_two_streams(
     """Train with only two compressors, and standard medium fluid, on stream in per stage, no liquid off take."""
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=1,
         ),
@@ -239,7 +234,7 @@ def variable_speed_compressor_train_two_compressors_ingoning_and_outgoing_stream
     """Train with only two compressors, and standard medium fluid, on stream in per stage, no liquid off take."""
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(rich_fluid),
+            fluid_model=rich_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),
@@ -248,7 +243,7 @@ def variable_speed_compressor_train_two_compressors_ingoning_and_outgoing_stream
             connected_to_stage_no=1,
         ),
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(dry_fluid),
+            fluid_model=dry_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=1,
         ),
@@ -303,13 +298,13 @@ def variable_speed_compressor_train_two_compressors_one_ingoing_and_one_outgoing
     ]
     fluid_streams = [
         FluidStreamObjectForMultipleStreams(
-            fluid=FluidStream(medium_fluid),
+            fluid_model=medium_fluid,
             is_inlet_stream=True,
             connected_to_stage_no=0,
         ),
         FluidStreamObjectForMultipleStreams(
             is_inlet_stream=False,
-            fluid=None,
+            fluid_model=None,
             connected_to_stage_no=1,
         ),
     ]