Add the prepared Scalar and Array to regressions;

PWPA-1933

src/alfasim_score/common.py

@@ -0,0 +1,25 @@
+from typing import Any
+from typing import Dict
+
+from barril.units import Array
+from barril.units import Scalar
+
+
+def prepare_for_regression(values: Dict[str, Any]) -> Dict[str, Any]:
+    """ "Prepare Scalar and Array to the be used in regression test"""
+    regression_values = {}
+    for key, value in values.items():
+        if isinstance(value, Scalar):
+            regression_values[key] = {
+                "value": value.value,
+                "unit": value.unit,
+            }
+        elif isinstance(value, Array):
+            regression_values[key] = {
+                "values": value.values,
+                "unit": value.unit,
+            }
+        else:
+            regression_values[key] = value
+
+    return regression_values

src/alfasim_score/converter/alfacase/_tests/test_convert_casing.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 from pytest_regressions.data_regression import DataRegressionFixture
 
+from alfasim_score.common import prepare_for_regression
 from alfasim_score.converter.alfacase.convert_alfacase import ScoreAlfacaseConverter
 from alfasim_score.converter.alfacase.score_input_reader import ScoreInputReader
 
@@ -17,19 +18,21 @@ def test_convert_casing_list(
     casings = builder._convert_casing_list()
     data_regression.check(
         [
-            {
-                "name": casing.name,
-                "hanger_depth": casing.hanger_depth.GetValue(),
-                "settings_depth": casing.settings_depth.GetValue(),
-                "hole_diameter": casing.hole_diameter.GetValue(),
-                "outer_diameter": casing.outer_diameter.GetValue(),
-                "inner_diameter": casing.inner_diameter.GetValue(),
-                "inner_roughness": casing.inner_roughness.GetValue(),
-                "material": casing.material,
-                "top_of_filler": casing.top_of_filler.GetValue(),
-                "filler_material": casing.filler_material,
-                "material_above_filler": casing.material_above_filler,
-            }
+            prepare_for_regression(
+                {
+                    "name": casing.name,
+                    "hanger_depth": casing.hanger_depth,
+                    "settings_depth": casing.settings_depth,
+                    "hole_diameter": casing.hole_diameter,
+                    "outer_diameter": casing.outer_diameter,
+                    "inner_diameter": casing.inner_diameter,
+                    "inner_roughness": casing.inner_roughness,
+                    "material": casing.material,
+                    "top_of_filler": casing.top_of_filler,
+                    "filler_material": casing.filler_material,
+                    "material_above_filler": casing.material_above_filler,
+                }
+            )
             for casing in casings
         ]
     )
@@ -43,14 +46,16 @@ def test_convert_tubing_list(
     tubings = builder._convert_tubing_list()
     data_regression.check(
         [
-            {
-                "name": tubing.name,
-                "length": tubing.length.GetValue(),
-                "outer_diameter": tubing.outer_diameter.GetValue(),
-                "inner_diameter": tubing.inner_diameter.GetValue(),
-                "inner_roughness": tubing.inner_roughness.GetValue(),
-                "material": tubing.material,
-            }
+            prepare_for_regression(
+                {
+                    "name": tubing.name,
+                    "length": tubing.length,
+                    "outer_diameter": tubing.outer_diameter,
+                    "inner_diameter": tubing.inner_diameter,
+                    "inner_roughness": tubing.inner_roughness,
+                    "material": tubing.material,
+                }
+            )
             for tubing in tubings
         ]
     )
@@ -64,11 +69,13 @@ def test_convert_packer_list(
     packers = builder._convert_packer_list()
     data_regression.check(
         [
-            {
-                "name": packer.name,
-                "position": packer.position.GetValue(),
-                "material_above": packer.material_above,
-            }
+            prepare_for_regression(
+                {
+                    "name": packer.name,
+                    "position": packer.position,
+                    "material_above": packer.material_above,
+                }
+            )
             for packer in packers
         ]
     )
@@ -82,12 +89,14 @@ def test_convert_open_hole_list(
     open_holes = builder._convert_open_hole_list()
     data_regression.check(
         [
-            {
-                "name": hole.name,
-                "length": hole.length.GetValue(),
-                "diameter": hole.diameter.GetValue(),
-                "inner_roughness": hole.inner_roughness.GetValue(),
-            }
+            prepare_for_regression(
+                {
+                    "name": hole.name,
+                    "length": hole.length,
+                    "diameter": hole.diameter,
+                    "inner_roughness": hole.inner_roughness,
+                }
+            )
             for hole in open_holes
         ]
     )

src/alfasim_score/converter/alfacase/_tests/test_convert_casing/test_convert_casing_list.yml

@@ -1,55 +1,125 @@
 - filler_material: cement
-  hanger_depth: 2072.0
-  hole_diameter: 42.0
-  inner_diameter: 33.0
-  inner_roughness: 0.05
+  hanger_depth:
+    unit: m
+    value: 2072.0
+  hole_diameter:
+    unit: in
+    value: 42.0
+  inner_diameter:
+    unit: in
+    value: 33.0
+  inner_roughness:
+    unit: mm
+    value: 0.05
   material: B
   material_above_filler: fluid_default
   name: CONDUCTOR_DRILLING_1
-  outer_diameter: 36.0
-  settings_depth: 2168.0
-  top_of_filler: 2072.0
+  outer_diameter:
+    unit: in
+    value: 36.0
+  settings_depth:
+    unit: m
+    value: 2168.0
+  top_of_filler:
+    unit: m
+    value: 2072.0
 - filler_material: cement
-  hanger_depth: 2072.0
-  hole_diameter: 20.0
-  inner_diameter: 16.25
-  inner_roughness: 0.05
+  hanger_depth:
+    unit: m
+    value: 2072.0
+  hole_diameter:
+    unit: in
+    value: 20.0
+  inner_diameter:
+    unit: in
+    value: 16.25
+  inner_roughness:
+    unit: mm
+    value: 0.05
   material: X-80
   material_above_filler: fluid_default
   name: SURFACE_CASING_1
-  outer_diameter: 18.0
-  settings_depth: 3490.0
-  top_of_filler: 2072.0
+  outer_diameter:
+    unit: in
+    value: 18.0
+  settings_depth:
+    unit: m
+    value: 3490.0
+  top_of_filler:
+    unit: m
+    value: 2072.0
 - filler_material: cement
-  hanger_depth: 2072.0
-  hole_diameter: 14.75
-  inner_diameter: 10.711
-  inner_roughness: 0.05
+  hanger_depth:
+    unit: m
+    value: 2072.0
+  hole_diameter:
+    unit: in
+    value: 14.75
+  inner_diameter:
+    unit: in
+    value: 10.711
+  inner_roughness:
+    unit: mm
+    value: 0.05
   material: N-80
   material_above_filler: fluid_default
   name: PRODUCTION_CASING_1
-  outer_diameter: 11.875
-  settings_depth: 3072.0
-  top_of_filler: 4905.0
+  outer_diameter:
+    unit: in
+    value: 11.875
+  settings_depth:
+    unit: m
+    value: 3072.0
+  top_of_filler:
+    unit: m
+    value: 4905.0
 - filler_material: cement
-  hanger_depth: 3072.0
-  hole_diameter: 14.75
-  inner_diameter: 9.156
-  inner_roughness: 0.05
+  hanger_depth:
+    unit: m
+    value: 3072.0
+  hole_diameter:
+    unit: in
+    value: 14.75
+  inner_diameter:
+    unit: in
+    value: 9.156
+  inner_roughness:
+    unit: mm
+    value: 0.05
   material: C-110 HC
   material_above_filler: fluid_default
   name: PRODUCTION_CASING_2
-  outer_diameter: 10.75
-  settings_depth: 5441.0
-  top_of_filler: 4905.0
+  outer_diameter:
+    unit: in
+    value: 10.75
+  settings_depth:
+    unit: m
+    value: 5441.0
+  top_of_filler:
+    unit: m
+    value: 4905.0
 - filler_material: cement
-  hanger_depth: 5441.0
-  hole_diameter: 14.75
-  inner_diameter: 8.684000000000001
-  inner_roughness: 0.05
+  hanger_depth:
+    unit: m
+    value: 5441.0
+  hole_diameter:
+    unit: in
+    value: 14.75
+  inner_diameter:
+    unit: in
+    value: 8.684000000000001
+  inner_roughness:
+    unit: mm
+    value: 0.05
   material: SDSS/125KSI
   material_above_filler: fluid_default
   name: PRODUCTION_CASING_3
-  outer_diameter: 10.75
-  settings_depth: 5607.0
-  top_of_filler: 4905.0
+  outer_diameter:
+    unit: in
+    value: 10.75
+  settings_depth:
+    unit: m
+    value: 5607.0
+  top_of_filler:
+    unit: m
+    value: 4905.0

src/alfasim_score/converter/alfacase/_tests/test_convert_casing/test_convert_open_hole_list.yml

@@ -1,4 +1,10 @@
-- diameter: 9.5
-  inner_roughness: 0.1
-  length: 371.0
+- diameter:
+    unit: in
+    value: 9.5
+  inner_roughness:
+    unit: mm
+    value: 0.1
+  length:
+    unit: m
+    value: 371.0
   name: OPEN_HOLE_1

src/alfasim_score/converter/alfacase/_tests/test_convert_casing/test_convert_packer_list.yml

@@ -1,3 +1,5 @@
 - material_above: fluid_default
   name: 'Packer (Hidráulico) #1'
-  position: 5565.18
+  position:
+    unit: m
+    value: 5565.18