Skip to content

Commit 31a0127

Browse files
committed
chore: somehow support timeseriesflowrate, for now
1 parent 5473c23 commit 31a0127

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from dataclasses import dataclass
22

33
from libecalc.domain.process.value_objects.fluid_stream import FluidModel
4+
from libecalc.presentation.yaml.domain.expression_time_series_flow_rate import ExpressionTimeSeriesFlowRate
45
from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
56

67

@@ -9,4 +10,4 @@ class TimeSeriesStream:
910
fluid_model: FluidModel
1011
pressure_bara: TimeSeriesExpression
1112
temperature_kelvin: TimeSeriesExpression
12-
standard_rate_m3_per_day: TimeSeriesExpression
13+
standard_rate_m3_per_day: ExpressionTimeSeriesFlowRate

src/libecalc/presentation/yaml/domain/expression_time_series_flow_rate.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ def _validate(self):
5050
if rate < 0:
5151
raise InvalidFlowRateException(rate, str(self._time_series_expression.get_expression()))
5252

53+
def get_original_expression(self) -> TimeSeriesExpression:
54+
return self._time_series_expression
55+
5356
def _get_stream_day_values(self) -> list[float]:
5457
"""
5558
Returns the stream day flow rate values.

src/libecalc/presentation/yaml/mappers/process_simulation_mapper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
from libecalc.domain.process.value_objects.fluid_stream.time_series_stream import TimeSeriesStream
5151
from libecalc.domain.regularity import Regularity
5252
from libecalc.domain.resource import Resources
53-
from libecalc.domain.time_series_flow_rate import TimeSeriesFlowRate
5453
from libecalc.expression.expression import ExpressionType
5554
from libecalc.presentation.yaml.domain.expression_time_series_flow_rate import ExpressionTimeSeriesFlowRate
5655
from libecalc.presentation.yaml.domain.reference_service import ReferenceService
@@ -267,7 +266,9 @@ def _get_regularity(self) -> Regularity:
267266
target_period=self._expression_evaluator.get_period(),
268267
)
269268

270-
def _map_rate(self, yaml_rate: YamlInletStreamRate) -> TimeSeriesFlowRate:
269+
def _map_rate(
270+
self, yaml_rate: YamlInletStreamRate
271+
) -> ExpressionTimeSeriesFlowRate: # TODO: Ok? treat everything as expression when reading from yaml?
271272
return ExpressionTimeSeriesFlowRate(
272273
time_series_expression=TimeSeriesExpression(
273274
expression_evaluator=self._expression_evaluator,

0 commit comments

Comments
 (0)