chore: fix merge conflicts

equinor · Feb 26, 2025 · fa961dd · fa961dd
1 parent 140721f
commit fa961dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/libecalc/domain/process/pump/pump.py b/src/libecalc/domain/process/pump/pump.py
@@ -10,10 +10,10 @@
 from libecalc.common.list.adjustment import transform_linear
 from libecalc.common.logger import logger
 from libecalc.common.units import Unit, UnitConstants
-from libecalc.core.models.base import BaseModel
-from libecalc.core.models.chart import SingleSpeedChart, VariableSpeedChart
-from libecalc.core.models.results import PumpModelResult
-from libecalc.core.models.results.pump import PumpFailureStatus
+from libecalc.domain.process.core.base import BaseModel
+from libecalc.domain.process.core.chart import SingleSpeedChart, VariableSpeedChart
+from libecalc.domain.process.core.results import PumpModelResult
+from libecalc.domain.process.core.results.pump import PumpFailureStatus
 from libecalc.domain.stream_conditions import StreamConditions
 
 EPSILON = 1e-15

diff --git a/tests/libecalc/core/consumers/system/conftest.py b/tests/libecalc/core/consumers/system/conftest.py
@@ -5,7 +5,7 @@
 
 from libecalc.common.time_utils import Period, Periods
 from libecalc.common.units import Unit
-from libecalc.core.models.results.pump import PumpFailureStatus
+from libecalc.domain.process.core.results.pump import PumpFailureStatus
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.system.consumer_function import (
     CompressorSystemConsumerFunction,
     PumpSystemConsumerFunction,

diff --git a/tests/libecalc/core/models/test_pump.py b/tests/libecalc/core/models/test_pump.py
@@ -3,10 +3,10 @@
 import pytest
 
 from libecalc.common.serializable_chart import ChartCurveDTO, SingleSpeedChartDTO, VariableSpeedChartDTO
-from libecalc.core.models.chart import SingleSpeedChart, VariableSpeedChart
-from libecalc.core.models.pump import PumpSingleSpeed, PumpVariableSpeed
-from libecalc.core.models.pump.pump import _adjust_for_head_margin
-from libecalc.core.models.results.pump import PumpFailureStatus
+from libecalc.domain.process.core.chart import SingleSpeedChart, VariableSpeedChart
+from libecalc.domain.process.core.pump import PumpSingleSpeed, PumpVariableSpeed
+from libecalc.domain.process.core.pump.pump import _adjust_for_head_margin
+from libecalc.domain.process.core.results.pump import PumpFailureStatus
 
 
 def test_adjust_for_head_margin():