geolysis 0.10.0__tar.gz → 0.10.1__tar.gz

{geolysis-0.10.0 → geolysis-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geolysis
-Version: 0.10.0
+Version: 0.10.1
 Summary: geolysis is an opensource software for geotechnical engineering analysis and modeling.
 Author-email: Patrick Boateng <boatengpato.pb@gmail.com>
 License: MIT License
@@ -24,6 +24,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: func-validator
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis/__init__.py

@@ -1,5 +1,5 @@
 from . import bearing_capacity, foundation, soil_classifier, spt
 
-__version__ = "0.10.0"
+__version__ = "0.10.1"
 
 __all__ = ["foundation", "soil_classifier", "spt", "bearing_capacity"]

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis/bearing_capacity/abc/_cohl/_core.py

@@ -15,10 +15,10 @@ class AllowableBearingCapacity(ABC):
     MAX_TOL_SETTLEMENT = 25.4
 
     def __init__(
-        self,
-        corrected_spt_n_value: float,
-        tol_settlement: float,
-        foundation_size: Foundation,
+            self,
+            corrected_spt_n_value: float,
+            tol_settlement: float,
+            foundation_size: Foundation,
     ) -> None:
         self.corrected_spt_n_value = corrected_spt_n_value
         self.tol_settlement = tol_settlement
@@ -42,7 +42,7 @@ class AllowableBearingCapacity(ABC):
     @tol_settlement.setter
     @validate_func_args
     def tol_settlement(
-        self, tol_settlement: Annotated[float, MustBeLessThanOrEqual(25.4)]
+            self, tol_settlement: Annotated[float, MustBeLessThanOrEqual(25.4)]
     ):
         self._tol_settlement = tol_settlement
 
@@ -56,5 +56,11 @@ class AllowableBearingCapacity(ABC):
         width = self.foundation_size.width
         return min(1.0 + 0.33 * depth / width, 1.33)
 
+    def bearing_capacity_results(self) -> dict:
+        return {
+            "bearing_capacity": self.bearing_capacity(),
+            "depth_factor": self._fd(),
+        }
+
     @abstractmethod
     def bearing_capacity(self): ...

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis/bearing_capacity/abc/_cohl/terzaghi_abc.py

@@ -103,6 +103,11 @@ class TerzaghiABC4PadFoundation(AllowableBearingCapacity):
                 * self._sr()
         )
 
+    def bearing_capacity_results(self) -> dict:
+        res = super().bearing_capacity_results()
+        res["water_correction_factor"] = self._cw()
+        return res
+
 
 class TerzaghiABC4MatFoundation(TerzaghiABC4PadFoundation):
     r"""Allowable bearing capacity for mat foundation on cohesionless

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis/bearing_capacity/ubc/_core.py

@@ -195,6 +195,23 @@ class UltimateBearingCapacity(ABC):
                 + self._embedment_term(0.5)
         )
 
+    def bearing_capacity_results(self) -> dict:
+        return {
+            "bearing_capacity": self.bearing_capacity(),
+            "n_c": self.n_c,
+            "n_q": self.n_q,
+            "n_gamma": self.n_gamma,
+            "s_c": self.s_c,
+            "s_q": self.s_q,
+            "s_gamma": self.s_gamma,
+            "d_c": self.d_c,
+            "d_q": self.d_q,
+            "d_gamma": self.d_gamma,
+            "i_c": self.i_c,
+            "i_q": self.i_q,
+            "i_gamma": self.i_gamma,
+        }
+
     @property
     @abstractmethod
     def n_c(self) -> float:

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis/soil_classifier.py

@@ -657,9 +657,7 @@ class USCS:
     ):
         """
         :param atterberg_limits: Atterberg limits of the soil.
-
         :param psd: Particle size distribution of the soil.
-
         :param organic: Indicates whether soil is organic or not.
         """
         self.atterberg_limits = atterberg_limits
@@ -782,7 +780,9 @@ class USCS:
 
 
 def create_aashto_classifier(
-        liquid_limit: float, plastic_limit: float, fines: float
+        liquid_limit: float,
+        plastic_limit: float,
+        fines: float,
 ) -> AASHTO:
     """A helper function that encapsulates the creation of a AASHTO
     classifier.

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geolysis
-Version: 0.10.0
+Version: 0.10.1
 Summary: geolysis is an opensource software for geotechnical engineering analysis and modeling.
 Author-email: Patrick Boateng <boatengpato.pb@gmail.com>
 License: MIT License
@@ -24,6 +24,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: func-validator
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{geolysis-0.10.0 → geolysis-0.10.1}/geolysis.egg-info/requires.txt

@@ -1,3 +1,4 @@
+func-validator
 
 [dev]
 pytest

{geolysis-0.10.0 → geolysis-0.10.1}/pyproject.toml

@@ -15,7 +15,7 @@ keywords = [
     "standard-penetration-test-analysis",
 ]
 authors = [{ name = "Patrick Boateng", email = "boatengpato.pb@gmail.com" }]
-dependencies = []
+dependencies = ["func-validator"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",