version 0.12.0

Author: patrickboateng

geolysis/__init__.py

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

geolysis/bearing_capacity/ubc/_core.py

@@ -33,14 +33,14 @@ class UltimateBearingCapacityResult:
 
 class UltimateBearingCapacity(ABC):
     def __init__(
-            self,
-            friction_angle: float,
-            cohesion: float,
-            moist_unit_wgt: float,
-            foundation_size: Foundation,
-            saturated_unit_wgt: float = 20.5,
-            apply_local_shear: bool = False,
-            factor_of_safety: float = 3.0,
+        self,
+        friction_angle: float,
+        cohesion: float,
+        moist_unit_wgt: float,
+        foundation_size: Foundation,
+        saturated_unit_wgt: float = 20.5,
+        apply_local_shear: bool = False,
+        factor_of_safety: float = 3.0,
     ) -> None:
         r"""
         :param friction_angle: Internal angle of friction for general
@@ -197,20 +197,20 @@ def _embedment_term(self, coef: float = 0.5) -> float:
                     unit_wgt = wgt + (d / width) * (self.moist_unit_wgt - wgt)
 
         return (
-                coef
-                * unit_wgt
-                * width
-                * self.n_gamma
-                * self.s_gamma
-                * self.d_gamma
-                * self.i_gamma
+            coef
+            * unit_wgt
+            * width
+            * self.n_gamma
+            * self.s_gamma
+            * self.d_gamma
+            * self.i_gamma
         )
 
     def _bearing_capacity(self) -> float:
         return (
-                self._cohesion_term(1.0)
-                + self._surcharge_term()
-                + self._embedment_term(0.5)
+            self._cohesion_term(1.0)
+            + self._surcharge_term()
+            + self._embedment_term(0.5)
         )
 
     def bearing_capacity_results(self) -> UltimateBearingCapacityResult:
@@ -265,15 +265,12 @@ def allowable_applied_load(self) -> float:
 
     @property
     @abstractmethod
-    def n_c(self) -> float:
-        ...
+    def n_c(self) -> float: ...
 
     @property
     @abstractmethod
-    def n_q(self) -> float:
-        ...
+    def n_q(self) -> float: ...
 
     @property
     @abstractmethod
-    def n_gamma(self) -> float:
-        ...
+    def n_gamma(self) -> float: ...

geolysis/bearing_capacity/ubc/_hansen_ubc.py

@@ -24,7 +24,7 @@ def n_c(friction_angle: float) -> float:
         if isclose(friction_angle, 0.0):
             return 5.14
         return cotdeg(friction_angle) * (
-                HansenBearingCapacityFactors.n_q(friction_angle) - 1.0
+            HansenBearingCapacityFactors.n_q(friction_angle) - 1.0
         )
 
     @staticmethod
@@ -38,9 +38,9 @@ def n_q(friction_angle: float) -> float:
     @round_(ndigits=2)
     def n_gamma(friction_angle: float) -> float:
         return (
-                1.8
-                * (HansenBearingCapacityFactors.n_q(friction_angle) - 1.0)
-                * tandeg(friction_angle)
+            1.8
+            * (HansenBearingCapacityFactors.n_q(friction_angle) - 1.0)
+            * tandeg(friction_angle)
         )
 
 
@@ -102,10 +102,10 @@ class HansenInclinationFactors:
     @staticmethod
     @round_(ndigits=2)
     def i_c(
-            cohesion: float,
-            load_angle: float,
-            f_width: float,
-            f_length: float,
+        cohesion: float,
+        load_angle: float,
+        f_width: float,
+        f_length: float,
     ) -> float:
         return 1.0 - sindeg(load_angle) / (2.0 * cohesion * f_width * f_length)
 

geolysis/bearing_capacity/ubc/_terzaghi_ubc.py

@@ -27,7 +27,7 @@ def n_c(friction_angle: float) -> float:
         if isclose(friction_angle, 0.0):
             return 5.7
         return cotdeg(friction_angle) * (
-                TerzaghiBearingCapacityFactors.n_q(friction_angle) - 1.0
+            TerzaghiBearingCapacityFactors.n_q(friction_angle) - 1.0
         )
 
     @staticmethod
@@ -40,8 +40,7 @@ def n_q(friction_angle: float) -> float:
     @staticmethod
     @round_(ndigits=2)
     def n_gamma(friction_angle: float) -> float:
-        return (TerzaghiBearingCapacityFactors.n_q(
-            friction_angle) - 1.0) * tandeg(
+        return (TerzaghiBearingCapacityFactors.n_q(friction_angle) - 1.0) * tandeg(
             1.4 * friction_angle
         )
 
@@ -77,9 +76,9 @@ class TerzaghiUBC4StripFooting(TerzaghiUltimateBearingCapacity):
     def _bearing_capacity(self) -> float:
         """Calculates ultimate bearing capacity for strip footing."""
         return (
-                self._cohesion_term(1.0)
-                + self._surcharge_term()
-                + self._embedment_term(0.5)
+            self._cohesion_term(1.0)
+            + self._surcharge_term()
+            + self._embedment_term(0.5)
         )
 
 
@@ -95,9 +94,9 @@ class TerzaghiUBC4CircularFooting(TerzaghiUltimateBearingCapacity):
     def _bearing_capacity(self) -> float:
         """Calculates ultimate bearing capacity for circular footing."""
         return (
-                self._cohesion_term(1.3)
-                + self._surcharge_term()
-                + self._embedment_term(0.3)
+            self._cohesion_term(1.3)
+            + self._surcharge_term()
+            + self._embedment_term(0.3)
         )
 
 
@@ -118,9 +117,9 @@ def _bearing_capacity(self) -> float:
         emb_coef = (1.0 - 0.2 * (width / length)) / 2.0
 
         return (
-                self._cohesion_term(coh_coef)
-                + self._surcharge_term()
-                + self._embedment_term(emb_coef)
+            self._cohesion_term(coh_coef)
+            + self._surcharge_term()
+            + self._embedment_term(emb_coef)
         )
 
 

geolysis/bearing_capacity/ubc/_vesic_ubc.py

@@ -22,20 +22,20 @@ def n_q(friction_angle: float) -> float:
     @round_(ndigits=2)
     def n_gamma(friction_angle: float) -> float:
         return (
-                2.0
-                * (VesicBearingCapacityFactors.n_q(friction_angle) + 1.0)
-                * tandeg(friction_angle)
+            2.0
+            * (VesicBearingCapacityFactors.n_q(friction_angle) + 1.0)
+            * tandeg(friction_angle)
         )
 
 
 class VesicShapeFactors:
     @staticmethod
     @round_(ndigits=3)
     def s_c(
-            friction_angle: float,
-            f_width: float,
-            f_length: float,
-            f_shape: Shape,
+        friction_angle: float,
+        f_width: float,
+        f_length: float,
+        f_shape: Shape,
     ) -> float:
         n_q = VesicBearingCapacityFactors.n_q(friction_angle)
         n_c = VesicBearingCapacityFactors.n_c(friction_angle)
@@ -48,10 +48,10 @@ def s_c(
     @staticmethod
     @round_(ndigits=3)
     def s_q(
-            friction_angle: float,
-            f_width: float,
-            f_length: float,
-            f_shape: Shape,
+        friction_angle: float,
+        f_width: float,
+        f_length: float,
+        f_shape: Shape,
     ) -> float:
         if f_shape == Shape.STRIP:
             return 1.0
@@ -103,19 +103,18 @@ def d_q(friction_angle: float, f_depth: float, f_width: float) -> float:
                 _d_q = 1.0
             else:
                 _d_q = (
-                        1.0
-                        + 2
-                        * tandeg(friction_angle)
-                        * (1 - sindeg(friction_angle)) ** 2
-                        * d2w
+                    1.0
+                    + 2
+                    * tandeg(friction_angle)
+                    * (1 - sindeg(friction_angle)) ** 2
+                    * d2w
                 )
         else:
             if isclose(friction_angle, 0.0):
                 _d_q = 1.0
             else:
                 _d_q = 1.0 + (
-                        2.0 * tandeg(friction_angle) * (
-                            1 - sindeg(friction_angle)) ** 2
+                    2.0 * tandeg(friction_angle) * (1 - sindeg(friction_angle)) ** 2
                 ) * atan(d2w)
         return _d_q
 
@@ -215,5 +214,4 @@ def i_q(self) -> float:
     @property
     def i_gamma(self) -> float:
         r"""Inclination factor $I_{\gamma}$."""
-        return VesicInclinationFactors.i_gamma(self.friction_angle,
-                                               self.load_angle)
+        return VesicInclinationFactors.i_gamma(self.friction_angle, self.load_angle)

tests/test_bearing_capacity/test_ubc_4_soils/test_terzaghi_ubc.py

@@ -61,15 +61,15 @@ class TestTerzaghiUBC4SquareFooting:
         [(25.0, 15.0, 18.0, 1.0, 2.0, inf, True, 323.01)],
     )
     def test_bearing_capacity(
-            self,
-            friction_angle,
-            cohesion,
-            moist_unit_wgt,
-            depth,
-            width,
-            water_level,
-            apply_loc_shear,
-            expected,
+        self,
+        friction_angle,
+        cohesion,
+        moist_unit_wgt,
+        depth,
+        width,
+        water_level,
+        apply_loc_shear,
+        expected,
     ):
         ubc = create_ubc_4_all_soil_types(
             friction_angle=friction_angle,
@@ -102,15 +102,15 @@ class TestTerzaghiUBC4CircFooting:
         [(25.0, 15.0, 18.0, 1.0, 2.3, None, True, 318.9)],
     )
     def test_bearing_capacity(
-            self,
-            friction_angle,
-            cohesion,
-            moist_unit_wgt,
-            depth,
-            width,
-            water_level,
-            apply_loc_shear,
-            expected,
+        self,
+        friction_angle,
+        cohesion,
+        moist_unit_wgt,
+        depth,
+        width,
+        water_level,
+        apply_loc_shear,
+        expected,
     ):
         ubc = create_ubc_4_all_soil_types(
             friction_angle=friction_angle,
@@ -144,16 +144,16 @@ class TestTerzaghiUBC4RectFooting:
         [(25.0, 15.0, 18.0, 1.0, 1.5, 2.5, None, True, 300.03)],
     )
     def test_bearing_capacity(
-            self,
-            friction_angle,
-            cohesion,
-            moist_unit_wgt,
-            depth,
-            width,
-            length,
-            water_level,
-            apply_loc_shear,
-            expected,
+        self,
+        friction_angle,
+        cohesion,
+        moist_unit_wgt,
+        depth,
+        width,
+        length,
+        water_level,
+        apply_loc_shear,
+        expected,
     ):
         ubc = create_ubc_4_all_soil_types(
             friction_angle=friction_angle,