From 71a0f772b747bc26d50a52f06b801729454abfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ant=C3=A3o?= Date: Tue, 2 Jul 2024 11:51:04 -0300 Subject: [PATCH] Remove the default values; Redo the comment for annulus task; PWPA-1977 --- src/alfasim_score/constants.py | 5 ----- .../test_create_alfacase.alfacase | 16 ++++++++-------- .../converter/alfacase/convert_alfacase.py | 12 ++---------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/alfasim_score/constants.py b/src/alfasim_score/constants.py index 2349088..dd40287 100644 --- a/src/alfasim_score/constants.py +++ b/src/alfasim_score/constants.py @@ -25,8 +25,3 @@ GAS_LIFT_PVT_TABLE_NAME = "gas_lift" NULL_VOLUMETRIC_FLOW_RATE = Scalar(0.0, STD_VOLUMETRIC_FLOW_RATE_UNIT) NULL_MASS_FLOW_RATE = Scalar(0.0, MASS_FLOW_RATE_UNIT) -WELL_TOP_NODE_DEFAULT_TEMPERATURE = Scalar(40.0, TEMPERATURE) -WELL_TOP_NODE_DEFAULT_PRESSURE = Scalar(9.0, PRESSURE) -WELL_BOTTOM_NODE_DEFAULT_TEMPERATURE = Scalar(60.0, TEMPERATURE) -WELL_BOTTOM_NODE_DEFAULT_PRESSURE = Scalar(10.0, PRESSURE) -GAS_LIFT_TEMPERATURE = Scalar(40.0, TEMPERATURE) diff --git a/src/alfasim_score/converter/alfacase/_tests/test_convert_alfacase/test_create_alfacase.alfacase b/src/alfasim_score/converter/alfacase/_tests/test_convert_alfacase/test_create_alfacase.alfacase index fda7f09..b1a92f9 100644 --- a/src/alfasim_score/converter/alfacase/_tests/test_convert_alfacase/test_create_alfacase.alfacase +++ b/src/alfasim_score/converter/alfacase/_tests/test_convert_alfacase/test_create_alfacase.alfacase @@ -130,8 +130,8 @@ nodes: values: [] unit: '-' temperature: - value: 40.0 - unit: degC + value: 288.6 + unit: K source_type: mass_source_type_all_volumetric_flow_rates volumetric_flow_rates_std: gas: @@ -198,11 +198,11 @@ nodes: pvt_model: base pressure_properties: pressure: - value: 10.0 - unit: kgf/cm2 + value: 100000.0 + unit: Pa temperature: - value: 60.0 - unit: degC + value: 288.6 + unit: K tracer_mass_fraction: values: [] unit: '-' @@ -302,8 +302,8 @@ nodes: values: [] unit: '-' temperature: - value: 40.0 - unit: degC + value: 288.6 + unit: K source_type: mass_source_type_all_volumetric_flow_rates volumetric_flow_rates_std: gas: diff --git a/src/alfasim_score/converter/alfacase/convert_alfacase.py b/src/alfasim_score/converter/alfacase/convert_alfacase.py index 916cce5..60f8f60 100644 --- a/src/alfasim_score/converter/alfacase/convert_alfacase.py +++ b/src/alfasim_score/converter/alfacase/convert_alfacase.py @@ -31,14 +31,9 @@ from alfasim_score.constants import FLUID_DEFAULT_NAME from alfasim_score.constants import GAS_LIFT_MASS_NODE_NAME from alfasim_score.constants import GAS_LIFT_PVT_TABLE_NAME -from alfasim_score.constants import GAS_LIFT_TEMPERATURE -from alfasim_score.constants import NULL_MASS_FLOW_RATE from alfasim_score.constants import NULL_VOLUMETRIC_FLOW_RATE from alfasim_score.constants import ROCK_DEFAULT_ROUGHNESS from alfasim_score.constants import TUBING_DEFAULT_ROUGHNESS -from alfasim_score.constants import WELL_BOTTOM_NODE_DEFAULT_PRESSURE -from alfasim_score.constants import WELL_BOTTOM_NODE_DEFAULT_TEMPERATURE -from alfasim_score.constants import WELL_TOP_NODE_DEFAULT_TEMPERATURE from alfasim_score.constants import WELLBORE_BOTTOM_NODE_NAME from alfasim_score.constants import WELLBORE_NAME from alfasim_score.constants import WELLBORE_TOP_NODE_NAME @@ -94,7 +89,8 @@ def convert_materials(self) -> List[MaterialDescription]: def _convert_annulus(self) -> AnnulusDescription: # TODO PWPA-1937: implement this method - # TODO PWPA-1937: top_node = GAS_LIFT_MASS_NODE if has_gas_lift else ANNULUS_TOP_NODE_NAME + # TODO PWPA-1937: Use the GAS_LIFT_MASS_NODE, check for the gas lift presence + # and set flow rate zero with the flag false for annulus flow. return AnnulusDescription(has_annulus_flow=False, top_node=ANNULUS_TOP_NODE_NAME) def _convert_formation(self) -> FormationDescription: @@ -203,7 +199,6 @@ def build_nodes(self) -> List[NodeDescription]: pvt_model=BASE_PVT_TABLE_NAME, mass_source_properties=MassSourceNodePropertiesDescription( temperature_input_type=MultiInputType.Constant, - temperature=WELL_TOP_NODE_DEFAULT_TEMPERATURE, source_type=MassSourceType.AllVolumetricFlowRates, volumetric_flow_rates_std={ "gas": NULL_VOLUMETRIC_FLOW_RATE, @@ -217,8 +212,6 @@ def build_nodes(self) -> List[NodeDescription]: node_type=NodeCellType.Pressure, pvt_model=BASE_PVT_TABLE_NAME, pressure_properties=PressureNodePropertiesDescription( - pressure=WELL_BOTTOM_NODE_DEFAULT_PRESSURE, - temperature=WELL_BOTTOM_NODE_DEFAULT_TEMPERATURE, split_type=MassInflowSplitType.Pvt, ), ), @@ -232,7 +225,6 @@ def build_nodes(self) -> List[NodeDescription]: pvt_model=GAS_LIFT_PVT_TABLE_NAME, mass_source_properties=MassSourceNodePropertiesDescription( temperature_input_type=MultiInputType.Constant, - temperature=GAS_LIFT_TEMPERATURE, source_type=MassSourceType.AllVolumetricFlowRates, volumetric_flow_rates_std={ "gas": NULL_VOLUMETRIC_FLOW_RATE,