structuralcodes 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

structuralcodes/__init__.py

@@ -3,7 +3,7 @@
 from . import codes, core, geometry, materials, sections
 from .codes import get_design_codes, set_design_code, set_national_annex
 
-__version__ = '0.4.0'
+__version__ = '0.6.0'
 
 __all__ = [
     'set_design_code',

structuralcodes/codes/ec2_2004/__init__.py

@@ -78,6 +78,7 @@ from ._section_7_3_crack_control import (
 )
 from .shear import (
     Asw_max,
+    Asw_s_required,
     VEdmax_unreinf,
     VRdc,
     VRdc_prin_stress,
@@ -90,6 +91,7 @@ __all__ = [
     'As_min_2',
     'As_min_p',
     'Asw_max',
+    'Asw_s_required',
     'alpha_e',
     'eps_sm_eps_cm',
     'hc_eff',

structuralcodes/codes/ec2_2004/shear.py

@@ -112,8 +112,8 @@ def _theta(theta: float, cot_min: float = 1.0, cot_max: float = 2.5) -> None:
             'Wrong value for theta is chosen. Theta has '
             f'to be chosen such that 1/tan(theta) lies between '
             f'{cot_min} and {cot_max}. This corresponds to an angle '
-            f'between {round(math.degrees(math.atan(1/cot_min)),2)} '
-            f'and {round(math.degrees(math.atan(1/cot_max)),2)} '
+            f'between {round(math.degrees(math.atan(1 / cot_min)), 2)} '
+            f'and {round(math.degrees(math.atan(1 / cot_max)), 2)} '
             f'degrees, respectively. Current angle is set at {theta}'
             ' degrees.'
         )
@@ -152,7 +152,7 @@ def alpha_cw(Ned: float, Ac: float, fcd: float) -> float:
         value = 2.5 * (1 - sigma_cp / fcd)
     else:
         raise ValueError(
-            f'sigma_cp/fcd={sigma_cp/fcd}. Prestress has to be smaller'
+            f'sigma_cp/fcd={sigma_cp / fcd}. Prestress has to be smaller'
             ' than design compressive strength.'
         )
     return value
@@ -400,6 +400,46 @@ def VRds(
     )
 
 
+# Equation (6.8 & 6.13) -> Reinforcement ratio isolated from the equation.
+def Asw_s_required(
+    Ved: float,
+    z: float,
+    theta: float,
+    fywd: float,
+    alpha: float = 90.0,
+) -> float:
+    """Calculate the required shear reinforcement.
+
+    EN 1992-1-1 (2005). Eq. (6.13)
+
+    Args:
+        Ved (float): The shear force in N.
+        z (float): The inner lever arm of internal forces in mm.
+        theta (float): The angle of the compression strut in degrees.
+        fywd (float): The design strength of the shear reinforcement steel in
+            MPa.
+
+    Keyword Args:
+        alpha (float): The angle of the shear reinforcement with respect to the
+            neutral axis in degrees. Default value = 90 degrees.
+
+    Returns:
+        float: The amount of required shear reinforcement in mm2/mm.
+
+    Raises:
+        ValueError: When theta < 21.8 degrees or theta > 45 degrees.
+    """
+    theta = math.radians(theta)
+    alpha = math.radians(alpha)
+    return (
+        Ved
+        / z
+        / fywd
+        / (1 / math.tan(theta) + 1.0 / math.tan(alpha))
+        / math.sin(alpha)
+    )
+
+
 # Equation (6.9 & 6.14)
 # For alpha == 90 degrees, Equation (6.14) reduces to Equation (6.9).
 def VRdmax(
@@ -480,7 +520,7 @@ def Asw_max(
         bw (float): The smallest width of the cross-section in tension in mm.
         s (float): The centre-to-centre distance of the shear reinforcement in
             mm.
-        fwyd (float): The design strength of the shear reinforcement steel in
+        fywd (float): The design strength of the shear reinforcement steel in
             MPa.
         NEd (float): The normal force in the cross-section due to loading or
             prestress (NEd > 0 for compression) in N.

structuralcodes/codes/mc2010/__init__.py

@@ -55,8 +55,17 @@ from ._concrete_material_properties import (
 )
 from ._concrete_punching import (
     b_0,
+    b_s,
+    b_sr,
+    k_dg,
+    k_psi,
     m_ed,
     psi_punching,
+    psi_punching_level_one,
+    psi_punching_level_three,
+    psi_punching_level_two,
+    r_s,
+    sigma_swd,
     v_rd_max_punching,
     v_rd_punching,
     v_rdc_punching,
@@ -184,6 +193,15 @@ __all__ = [
     's_tau_bu_split',
     'f_stm',
     'tau_yield',
+    'b_s',
+    'b_sr',
+    'k_dg',
+    'k_psi',
+    'r_s',
+    'psi_punching_level_one',
+    'psi_punching_level_two',
+    'psi_punching_level_three',
+    'sigma_swd',
 ]
 
 __title__: str = 'fib Model Code 2010'

structuralcodes/codes/mc2010/_concrete_creep_and_shrinkage.py

@@ -95,13 +95,13 @@ def _check_initial_stress(sigma: float, fcm: float) -> None:
         raise ValueError(
             'The stress level exceeds the range of application.'
             'Maximum allowable stress is 0.6*fcm. Current stress level '
-            f'is {round(abs(sigma)/fcm, 3)}*fcm.'
+            f'is {round(abs(sigma) / fcm, 3)}*fcm.'
         )
     if abs(sigma) > 0.4 * fcm:
         warnings.warn(
             'Initial stress is too high to consider the '
             'concrete as an aging linear visco-elastic material: '
-            f'sigma = {round(abs(sigma)/fcm,3)}*fcm > 0.4*fcm. Nonlinear'
+            f'sigma = {round(abs(sigma) / fcm, 3)}*fcm > 0.4*fcm. Nonlinear'
             ' creep calculations are performed according to subclause '
             '5.1.9.4.3 (d) of the fib Model Code 2010 to account for '
             'large compressive stresses.'