py-pilecore 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

{py_pilecore-0.3.0.dist-info → py_pilecore-0.3.1.dist-info}/METADATA

@@ -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.dist-info → py_pilecore-0.3.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 pypilecore/__init__.py,sha256=T2Uuao6fboVhrzKI_Sa7jXbcNAUl_PKk9BFdsozOG98,78
-pypilecore/_version.py,sha256=u5a8MuyVlm36VXiKEYGftODGd_60MOLCDZ8IMh1Is5E,175
+pypilecore/_version.py,sha256=YxvR7Y0Tsf_BUbHAeQJdfQVgFNjWkq8WBqPIIATmUb4,175
 pypilecore/api.py,sha256=Bq7FRSQQGOENY7HTI8bW41-WBNPpqXZvyN1A71VUam4,5141
 pypilecore/exceptions.py,sha256=-MZOfsxyHLCI0k1-wZFfVsMxc1lya5buuhLks5rxlCo,89
 pypilecore/plot_utils.py,sha256=rK5_067-4-x7LzZgt_t6ahcGrZInxNrqHqsy0RzCnq8,954
 pypilecore/utils.py,sha256=ib9LgJBIgWukL7zd_Zk1LP27UTMIZTRJ4RBB6ubn97o,1186
 pypilecore/input/__init__.py,sha256=tlmThdPtO8e6L6pqxuRQ7EOHRxYwuIcaNNGlZyAnzig,606
 pypilecore/input/grouper_properties.py,sha256=AqZHvg-CXcoTW7u9wgyqSm1oZLBc7sSoTawxGK69144,10895
-pypilecore/input/multi_cpt.py,sha256=ksXwMzY1KeSyWeeyiCkJVMilIWxAS45XwKXaS_uEQAE,19086
+pypilecore/input/multi_cpt.py,sha256=1gEK-Imdhr0xOfcn50lq1OwYvjFs2NMf51LDaVddGas,19539
 pypilecore/input/pile_properties.py,sha256=mK8_VRy-tHZCKFHcv8ftMlCEs8KEsZpG9eGLq13hYPA,8400
-pypilecore/input/soil_properties.py,sha256=6JIy5CHXReKZNrsB0m-ehJKUM97t-GBO04MG9QyHXMM,6962
+pypilecore/input/soil_properties.py,sha256=SL9aJ9IiVx00YjBu-hzAAIpbPZgTLpSNGnfphUVZjKQ,7659
 pypilecore/results/__init__.py,sha256=ggTI2QzILhX_oNx1YMOih6IVCkBFg8I5-Jyn9Sw3_h0,389
 pypilecore/results/grouper_result.py,sha256=XzrvsWezFB0ZXmIfC_Foy9oxqOqttRLDAxTa7eve1rc,21066
 pypilecore/results/load_settlement.py,sha256=EbfTrSvH_g96KE-x8ZjmO8D0mt5KFaQ_-AR8u4blLsU,9752
@@ -16,8 +16,8 @@ pypilecore/results/multi_cpt_results.py,sha256=_5cXM3lWFobfG3w6a6h5e5MQVdP6lgmca
 pypilecore/results/pile_properties.py,sha256=z1R5UNoYjBem2rS8LMJ_ye2J5ejDoSilU5fCjUrNdUg,28592
 pypilecore/results/single_cpt_results.py,sha256=eFeqMOOhgiQimv9EHFFWPFWWZWV_iYcqhXU39jSreF4,19358
 pypilecore/results/soil_properties.py,sha256=oZYTKSXP5UgxY2vwX-bu_X447KLptuYPpsgFi_E00IQ,20704
-py_pilecore-0.3.0.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
-py_pilecore-0.3.0.dist-info/METADATA,sha256=pWc63xom63zwZkpcMMAJDrLzhChCP966t5ziLC33gkA,5806
-py_pilecore-0.3.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-py_pilecore-0.3.0.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
-py_pilecore-0.3.0.dist-info/RECORD,,
+py_pilecore-0.3.1.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
+py_pilecore-0.3.1.dist-info/METADATA,sha256=TaAuonuIG1bDL4r4IqC8cDweFcnmGK-Ar-Pq-WGxsWA,5806
+py_pilecore-0.3.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+py_pilecore-0.3.1.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
+py_pilecore-0.3.1.dist-info/RECORD,,

pypilecore/_version.py

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

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,

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,