py-pilecore 0.3.0__tar.gz → 0.3.1__tar.gz

{py-pilecore-0.3.0/src/py_pilecore.egg-info → py-pilecore-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.3.0
+Version: 0.3.1
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         

{py-pilecore-0.3.0 → py-pilecore-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-pilecore"
-version = "0.3.0"
+version = "0.3.1"
 description = "Public python SDK for the CEMS PileCore web-API."
 requires-python = ">=3.9"
 dependencies = [

{py-pilecore-0.3.0 → py-pilecore-0.3.1/src/py_pilecore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.3.0
+Version: 0.3.1
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         

{py-pilecore-0.3.0 → py-pilecore-0.3.1}/src/pypilecore/_version.py

@@ -4,4 +4,4 @@ try:
     __version__ = version("py-pilecore")
 # during CI
 except PackageNotFoundError:
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"

{py-pilecore-0.3.0 → py-pilecore-0.3.1}/src/pypilecore/input/multi_cpt.py

@@ -24,6 +24,7 @@ def create_multi_cpt_payload(
     ] = "lower_bound",
     stiff_construction: bool = False,
     cpts_group: List[str] | None = None,
+    ocr: float | None = None,
     fixed_negative_friction_range_nap: Tuple[float, float] | None = None,
     fixed_positive_friction_range_nap: Tuple[float, Literal["ptl"] | float]
     | None = None,
@@ -41,6 +42,7 @@ def create_multi_cpt_payload(
         str, Tuple[float, Literal["ptl"] | float]
     ]
     | None = None,
+    individual_ocr: Mapping[str, float] | None = None,
     diameter_base: float | None = None,
     diameter_shaft: float | None = None,
     width_base_large: float | None = None,
@@ -129,6 +131,8 @@ def create_multi_cpt_payload(
     cpts_group:
         CPTs that are considered one group. Items must relate to the alias of the CPTData
         objects in `cptdata_objects`.
+    ocr:
+        The Over-Consolidation-Ratio [-] of the foundation layer.
     fixed_negative_friction_range_nap:
         Optionally sets the fixed depth range between which the negative sleeve friction
         is calculated. If an array of format [top, bottom], the range is set between top
@@ -189,6 +193,10 @@ def create_multi_cpt_payload(
     individual_positive_friction_range_nap:
         A dictionary, mapping ``CPTData.alias`` values to fixed positive-friction ranges.
         For a specification of the values, see ``fixed_positive_friction_range_nap``
+    individual_ocr:
+        A dictionary, mapping ``CPTData.alias`` values to Over-Consolidation-Ratio [-]
+        values of the foundation layer. This will overrule the general `ocr` setting for
+        these specific CPTs only.
     diameter_base:
         Pile base diameter [m].
         Only relevant if ``pile_shape`` = "round".
@@ -299,8 +307,10 @@ def create_multi_cpt_payload(
         groundwater_level_nap=groundwater_level_nap,
         friction_range_strategy=friction_range_strategy,
         excavation_depth_nap=excavation_depth_nap,
+        master_ocr=ocr,
         individual_negative_friction_range_nap=individual_negative_friction_range_nap,
         individual_positive_friction_range_nap=individual_positive_friction_range_nap,
+        individual_ocr=individual_ocr,
     )
     pile_properties = create_pile_properties_payload(
         pile_type=pile_type,

{py-pilecore-0.3.0 → py-pilecore-0.3.1}/src/pypilecore/input/soil_properties.py

@@ -15,10 +15,6 @@ transform = {
     "peat": "V",
 }
 
-# Create input_table
-results_passover = {}
-soil_properties_list = []
-
 
 def create_soil_properties_payload(
     cptdata_objects: List[CPTData],
@@ -26,12 +22,14 @@ def create_soil_properties_payload(
     groundwater_level_nap: float,
     friction_range_strategy: Literal["manual", "lower_bound", "settlement_driven"],
     excavation_depth_nap: float | None = None,
+    master_ocr: float | None = None,
     individual_negative_friction_range_nap: Mapping[Any, Tuple[float, float]]
     | None = None,
     individual_positive_friction_range_nap: Mapping[
         Any, Tuple[float, Literal["ptl"] | float]
     ]
     | None = None,
+    individual_ocr: Mapping[Any, float] | None = None,
 ) -> Tuple[List[dict], Dict[str, dict]]:
     """
     Creates a dictionary with the `soil_properties` payload content for the PileCore
@@ -79,12 +77,18 @@ def create_soil_properties_payload(
         "lower_bound" or "settlement_driven".
     excavation_depth_nap:
         Soil excavation depth after the CPT was taken. Unit: [m] w.r.t. NAP.
+    ocr:
+        The Over-Consolidation-Ratio [-] of the foundation layer.
     individual_negative_friction_range_nap:
         A dictionary, mapping `CPTData.alias` values to fixed negative-friction ranges.
         For a specification of the values, see `fixed_negative_friction_range_nap`
     individual_positive_friction_range_nap:
         A dictionary, mapping `CPTData.alias` values to fixed positive-friction ranges.
         For a specification of the values, see `fixed_positive_friction_range_nap`
+    individual_ocr:
+        A dictionary, mapping ``CPTData.alias`` values to Over-Consolidation-Ratio [-]
+        values of the foundation layer. This will overrule the general `ocr` setting for
+        these specific CPTs only.
 
     Returns
     -------
@@ -95,6 +99,10 @@ def create_soil_properties_payload(
         Dictionary with keyword arguments for the `pilecore.MultiCPTBearingResults`
         object.
     """
+    # Initialize outputs
+    results_passover = {}
+    soil_properties_list = []
+
     for cpt in tqdm(cptdata_objects, desc="Create soil properties payload"):
         # Construct the cpt_data payload
         cpt_data = dict(
@@ -158,6 +166,14 @@ def create_soil_properties_payload(
                     "fixed_positive_friction_range_nap"
                 ] = individual_positive_friction_range_nap[cpt.alias]
 
+        # Optionally add OCR parameter
+        if individual_ocr is not None and cpt.alias in individual_ocr.keys():
+            ocr: float | None = individual_ocr[cpt.alias]
+        else:
+            ocr = master_ocr
+        if ocr is not None:
+            soil_properties["ocr"] = ocr
+
         soil_properties_list.append(soil_properties)
         results_passover[cpt.alias] = {
             "ref_height": cpt.delivered_vertical_position_offset,

{py-pilecore-0.3.0 → py-pilecore-0.3.1}/tests/test_input.py

@@ -369,7 +369,9 @@ def test_create_multi_cpt_payload_defaults(
     # Check the payload content
 
     # We don't completely check the soil_properties list here
-    assert isinstance(payload.pop("list_soil_properties"), list)
+    list_soil_properties = payload.pop("list_soil_properties")
+    assert isinstance(list_soil_properties, list)
+    assert len(list_soil_properties) == 1
 
     assert payload.pop("excavation_param_t") == 1.0
     assert payload.pop("pile_head_level_nap") == "surface"
@@ -513,6 +515,8 @@ def test_create_multi_cpt_payload_extended_rect_pile(
     function with extended arguments for a rect pile.
     """
 
+    assert isinstance(cpt.alias, str)
+
     payload, _ = create_multi_cpt_payload(
         pile_tip_levels_nap=[0, 1],
         cptdata_objects=[cpt],
@@ -561,7 +565,9 @@ def test_create_multi_cpt_payload_extended_rect_pile(
     # Check the payload content
 
     # We don't completely check the soil_properties list here
-    assert isinstance(payload.pop("list_soil_properties"), list)
+    list_soil_properties = payload.pop("list_soil_properties")
+    assert isinstance(list_soil_properties, list)
+    assert len(list_soil_properties) == 1
 
     assert payload.pop("excavation_param_t") == 0.5
     assert payload.pop("pile_head_level_nap") == 5.0
@@ -615,6 +621,59 @@ def test_create_multi_cpt_payload_extended_rect_pile(
     assert len(payload.keys()) == 0
 
 
+def test_create_multi_cpt_payload_extended_ocr(
+    cpt: CPTData, mock_classify_response: dict
+) -> None:
+    """
+    Test creating the multi_cpt_results payload with the `create_multi_cpt_payload`
+    function with extended OCR arguments.
+    """
+
+    payload, _ = create_multi_cpt_payload(
+        pile_tip_levels_nap=[0, 1],
+        cptdata_objects=[cpt],
+        classify_tables={cpt.alias: mock_classify_response},
+        groundwater_level_nap=-2.5,
+        pile_type="concrete",
+        specification="1",
+        installation="A",
+        pile_shape="round",
+        diameter_base=0.3,
+        ocr=2.5,
+    )
+
+    # Check the payload content
+
+    list_soil_properties = payload.get("list_soil_properties")
+    assert isinstance(list_soil_properties, list)
+    assert len(list_soil_properties) == 1
+    assert "ocr" in list_soil_properties[0].keys()
+    assert np.isclose(list_soil_properties[0]["ocr"], 2.5)
+
+    # Case 2: set OCR with individual_ocr parameter
+
+    payload, _ = create_multi_cpt_payload(
+        pile_tip_levels_nap=[0, 1],
+        cptdata_objects=[cpt],
+        classify_tables={cpt.alias: mock_classify_response},
+        groundwater_level_nap=-2.5,
+        pile_type="concrete",
+        specification="1",
+        installation="A",
+        pile_shape="round",
+        diameter_base=0.3,
+        ocr=1.0,
+        individual_ocr={cpt.alias: 2.0},
+    )
+
+    # Check the payload content
+
+    list_soil_properties = payload.pop("list_soil_properties")
+    assert isinstance(list_soil_properties, list)
+    assert "ocr" in list_soil_properties[0].keys()
+    assert np.isclose(list_soil_properties[0]["ocr"], 2.0)
+
+
 def test_create_multi_cpt_payload_errors(
     cpt: CPTData, mock_classify_response: dict
 ) -> None: