Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@HansKallekleiv
HansKallekleiv committed Jan 29, 2025
1 parent f45912c commit 2f39ab5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 43 deletions.
4 changes: 2 additions & 2 deletions backend_py/primary/primary/routers/relperm/converters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ def to_api_relperm_saturation_axis(axis: RelPermSaturationAxis) -> schemas.RelPe

return schemas.RelPermSaturationAxis(
saturation_name=axis.saturation_name,
relperm_curve_names=[schemas.RelPermCurveNames(curvename) for curvename in axis.relperm_curve_names],
relperm_curve_names=axis.relperm_curve_names,
capillary_pressure_curve_names=axis.capillary_pressure_curve_names,
)


def to_api_relperm_realization_data(
data: RelPermRealizationData,
) -> schemas.RelPermRealizationData:
print("*****************************", data)

return schemas.RelPermRealizationData(
saturation_axis_data=schemas.CurveData(
curve_name=data.saturation_axis_data.curve_name,
Expand Down
9 changes: 0 additions & 9 deletions backend_py/primary/primary/routers/relperm/schemas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ class RelPermRealizationData(BaseModel):
relperm_curve_data: List[RelPermRealizationCurveData]


class RelPermCurveNames(StrEnum):
KRW = "Relative permeability water"
KRG = "Relative permeability gas"
KROW = "Relative permeability oil water"
KROG = "Relative permeability oil gas"
PCOW = "Capilar pressure oil water"
PCOG = "Capilar pressure oil gas"


class Statistic(StrEnum):
"""
Definition of possible statistics
Expand Down
45 changes: 13 additions & 32 deletions backend_py/primary/primary/services/relperm_assembler/relperm_assembler.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from enum import StrEnum
from enum import Enum
from typing import List, Callable, Dict
import logging
from dataclasses import dataclass
Expand All @@ -15,7 +15,7 @@
LOGGER = logging.getLogger(__name__)


class RelPermFamily(StrEnum):
class RelPermFamily(str, Enum):
"""Enumeration of relative permeability keyword families"""

FAMILY_1 = "family_1" # SWOF, SGOF, SLGOF family
Expand All @@ -28,19 +28,10 @@ class RelPermFamily(StrEnum):
}


class RelPermCurveNames(StrEnum):
KRW = "Relative permeability water"
KRG = "Relative permeability gas"
KROW = "Relative permeability oil water"
KROG = "Relative permeability oil gas"
PCOW = "Capilar pressure oil water"
PCOG = "Capilar pressure oil gas"


@dataclass
class RelPermSaturationAxis:
saturation_name: str
relperm_curve_names: List[RelPermCurveNames]
relperm_curve_names: List[str]
capillary_pressure_curve_names: List[str]


Expand All @@ -65,7 +56,7 @@ class RelPermRealizationCurveData:
realization_id: int


class Statistic(StrEnum):
class Statistic(str, Enum):
"""
Definition of possible statistics for a result column in an inplace volumetrics table
"""
Expand Down Expand Up @@ -337,12 +328,10 @@ def extract_saturation_axes_from_relperm_table(
RelPermSaturationAxis(
saturation_name="SW",
relperm_curve_names=[
curve_name
for curve_name in [RelPermCurveNames.KROW, RelPermCurveNames.KRW]
if curve_name in relperm_table_columns
curve_name for curve_name in ["KROW", "KRW"] if curve_name in relperm_table_columns
],
capillary_pressure_curve_names=[
curve_name for curve_name in [RelPermCurveNames.PCOW] if curve_name in relperm_table_columns
curve_name for curve_name in ["PCOW"] if curve_name in relperm_table_columns
],
)
)
Expand All @@ -351,12 +340,10 @@ def extract_saturation_axes_from_relperm_table(
RelPermSaturationAxis(
saturation_name="SG",
relperm_curve_names=[
curve_name
for curve_name in [RelPermCurveNames.KRG, RelPermCurveNames.KROG]
if curve_name in relperm_table_columns
curve_name for curve_name in ["KRG", "KROG"] if curve_name in relperm_table_columns
],
capillary_pressure_curve_names=[
curve_name for curve_name in [RelPermCurveNames.PCOG] if curve_name in relperm_table_columns
curve_name for curve_name in ["PCOG"] if curve_name in relperm_table_columns
],
)
)
Expand All @@ -366,23 +353,19 @@ def extract_saturation_axes_from_relperm_table(
saturation_infos.append(
RelPermSaturationAxis(
saturation_name="SW",
relperm_curve_names=[
curve_name for curve_name in [RelPermCurveNames.KRW] if curve_name in relperm_table_columns
],
relperm_curve_names=[curve_name for curve_name in ["KRW"] if curve_name in relperm_table_columns],
capillary_pressure_curve_names=[
curve_name for curve_name in [RelPermCurveNames.PCOW] if curve_name in relperm_table_columns
curve_name for curve_name in ["PCOW"] if curve_name in relperm_table_columns
],
)
)
if "SG" in relperm_table_columns:
saturation_infos.append(
RelPermSaturationAxis(
saturation_name="SG",
relperm_curve_names=[
curve_name for curve_name in [RelPermCurveNames.KRG] if curve_name in relperm_table_columns
],
relperm_curve_names=[curve_name for curve_name in ["KRG"] if curve_name in relperm_table_columns],
capillary_pressure_curve_names=[
curve_name for curve_name in [RelPermCurveNames.PCOG] if curve_name in relperm_table_columns
curve_name for curve_name in ["PCOG"] if curve_name in relperm_table_columns
],
)
)
Expand All @@ -391,9 +374,7 @@ def extract_saturation_axes_from_relperm_table(
RelPermSaturationAxis(
saturation_name="SO",
relperm_curve_names=[
curve_name
for curve_name in [RelPermCurveNames.KROW, RelPermCurveNames.KROG]
if curve_name in relperm_table_columns
curve_name for curve_name in ["KROW", "KROG"] if curve_name in relperm_table_columns
],
capillary_pressure_curve_names=[],
)
Expand Down

0 comments on commit 2f39ab5

Please sign in to comment.