Merge branch 'main' into 401-feature-request-add-formulas-from-chapter-589-from-nen_en_1992_1_1

# Conflicts:
#	docs/source/codes/eurocode/ec2_1992_1_1_2011/formulas.md

Author: egarciamendez

.pre-commit-config.yaml

@@ -17,7 +17,7 @@
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.0
+    rev: v0.8.4
     hooks:
       # Run the linter.
       - id: ruff
@@ -26,7 +26,7 @@ repos:
       - id: ruff-format
 
   -   repo: https://github.com/pre-commit/mirrors-mypy
-      rev: v1.13.0
+      rev: v1.14.0
       hooks:
       - id: mypy
         language_version: python3.12

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_21.py

@@ -0,0 +1,60 @@
+"""Formula 5.21 from NEN-EN 1992-1-1+C2:2011: Chapter 5 - Structural Analysis."""
+
+from blueprints.codes.eurocode.nen_en_1992_1_1_c2_2011 import NEN_EN_1992_1_1_C2_2011
+from blueprints.codes.formula import Formula
+from blueprints.codes.latex_formula import LatexFormula
+from blueprints.type_alias import DIMENSIONLESS, MM4, MPA
+from blueprints.validations import raise_if_negative
+
+
+class Form5Dot21NominalStiffness(Formula):
+    """Class representing formula 5.21 for the calculation of the nominal stiffness of slender compression members
+    with arbitrary cross-section, :math:`EI` [:math:`Nmm^2`].
+    """
+
+    label = "5.21"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(self, k_c: DIMENSIONLESS, e_cd: MPA, i_c: MM4, k_s: DIMENSIONLESS, e_s: MPA, i_s: MM4) -> None:
+        r"""[:math:`EI`] Nominal stiffness of slender compression members with arbitrary cross-section.
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.7.2(2) or (3) - Formula (5.21)
+
+        Parameters
+        ----------
+        k_c : DIMENSIONLESS
+            [:math:`K_{c}`] is a factor for effects of cracking, creep etc. see 5.8.7.2 (2) or (3).
+        e_cd : MPA
+            [:math:`E_{cd}`] is the design value of the modulus of elasticity of concrete, see 5.8.6 (3)
+        i_c : MPA
+            [:math:`I_{c}`] is the moment of inertia of concrete cross section.
+        k_s : DIMENSIONLESS
+            [:math:`K_{s}`] is a factor for contribution of reinforcement, see 5.8.7.2 (2) or (3).
+        e_s : MPA
+            [:math:`E_{s}`] is the design value of the modulus of elasticity of reinforcement, 5.8.6 (3).
+        i_s : MPA
+            [:math:`I_{s}`] is the second moment of area of reinforcement, about the centre of area of the concrete.
+        """
+        super().__init__()
+        self.k_c = k_c
+        self.e_cd = e_cd
+        self.i_c = i_c
+        self.k_s = k_s
+        self.e_s = e_s
+        self.i_s = i_s
+
+    @staticmethod
+    def _evaluate(k_c: DIMENSIONLESS, e_cd: MPA, i_c: MPA, k_s: DIMENSIONLESS, e_s: MPA, i_s: MPA) -> MPA:
+        """Evaluates the formula, for more information see the __init__ method."""
+        raise_if_negative(k_c=k_c, e_cd=e_cd, i_c=i_c, k_s=k_s, e_s=e_s, i_s=i_s)
+        return k_c * e_cd * i_c + k_s * e_s * i_s
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.21."""
+        return LatexFormula(
+            return_symbol=r"EI",
+            result=f"{self:.3f}",
+            equation=r"K_{c} \cdot E_{cd} \cdot I_{c} + K_{s} \cdot E_{s} \cdot I_{s}",
+            numeric_equation=rf"{self.k_c:.3f} \cdot {self.e_cd:.3f} \cdot {self.i_c:.3f} + {self.k_s:.3f} \cdot {self.e_s:.3f} \cdot {self.i_s:.3f}",
+            comparison_operator_label="=",
+        )

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_22.py

@@ -0,0 +1,92 @@
+"""Formula 5.22 from NEN-EN 1992-1-1+C2:2011: Chapter 5 - Structural Analysis."""
+
+from blueprints.codes.eurocode.nen_en_1992_1_1_c2_2011 import NEN_EN_1992_1_1_C2_2011
+from blueprints.codes.formula import Formula
+from blueprints.codes.latex_formula import LatexFormula
+from blueprints.type_alias import DIMENSIONLESS
+from blueprints.validations import raise_if_less_or_equal_to_zero, raise_if_negative
+
+
+class Form5Dot22FactorKs(Formula):
+    """Class representing the factor K_s that represents the factor for contribution of reinforcement to the resistance."""
+
+    label = "5.22"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(self, rho: float) -> None:
+        r"""[:math:`K_s`] Factor K_s = 1.
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.7.2(2) - Formula (5.22)
+
+        Parameters
+        ----------
+        rho : float
+            [:math:`\rho`] Geometric reinforcement ratio, As/Ac. Must be >= 0.002.
+        """
+        super().__init__()
+        self.rho = rho
+
+    @staticmethod
+    def _evaluate(rho: float) -> float:
+        """Evaluates the formula, for more information see the __init__ method."""
+        if rho < 0.002:
+            raise ValueError(f"Invalid rho: {rho}. rho cannot be less than 0.002")
+        return 1.0
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.22 K_s."""
+        return LatexFormula(
+            return_symbol=r"K_s",
+            result=f"{self._evaluate(self.rho):.3f}",
+            equation=r"1",
+            numeric_equation="1",
+            comparison_operator_label="=",
+        )
+
+
+class Form5Dot22FactorKc(Formula):
+    """Class representing the factor K_c representing the factor for effects of cracking, creep, etc."""
+
+    label = "5.22"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(self, k1: DIMENSIONLESS, k2: DIMENSIONLESS, phi_ef: DIMENSIONLESS, rho: float) -> None:
+        r"""[:math:`K_c`] Factor K_c = k_1 * k_2 / (1 + \phi_{ef}).
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.7.2(2) - Formula (5.22)
+
+        Parameters
+        ----------
+        k1 : DIMENSIONLESS
+            [:math:`k_1`] Factor which depends on concrete strength class, Expression (5.23).
+        k2 : DIMENSIONLESS
+            [:math:`k_2`] Factor which depends on axial force and slenderness, Expression (5.24).
+        phi_ef : DIMENSIONLESS
+            [:math:`\phi_{ef}`] Effective creep ratio, see 5.8.4.
+        rho : float
+            [:math:`\rho`] Geometric reinforcement ratio, As/Ac. Must be >= 0.002.
+        """
+        super().__init__()
+        self.k1 = k1
+        self.k2 = k2
+        self.phi_ef = phi_ef
+        self.rho = rho
+
+    @staticmethod
+    def _evaluate(k1: DIMENSIONLESS, k2: DIMENSIONLESS, phi_ef: DIMENSIONLESS, rho: float) -> DIMENSIONLESS:
+        """Evaluates the formula, for more information see the __init__ method."""
+        if rho < 0.002:
+            raise ValueError(f"Invalid rho: {rho}. rho cannot be less than 0.002")
+        raise_if_less_or_equal_to_zero(phi_ef=phi_ef)
+        raise_if_negative(k1=k1, k2=k2)
+        return k1 * k2 / (1 + phi_ef)
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.22 K_c."""
+        return LatexFormula(
+            return_symbol=r"K_c",
+            result=f"{self:.3f}",
+            equation=r"\frac{k_1 \cdot k_2}{1 + \phi_{ef}}",
+            numeric_equation=rf"\frac{{{self.k1:.3f} \cdot {self.k2:.3f}}}{{1 + {self.phi_ef:.3f}}}",
+            comparison_operator_label="=",
+        )

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_23.py

@@ -0,0 +1,43 @@
+"""Formula 5.23 from NEN-EN 1992-1-1+C2:2011: Chapter 5 - Structural Analysis."""
+
+from blueprints.codes.eurocode.nen_en_1992_1_1_c2_2011 import NEN_EN_1992_1_1_C2_2011
+from blueprints.codes.formula import Formula
+from blueprints.codes.latex_formula import LatexFormula
+from blueprints.type_alias import DIMENSIONLESS, MPA
+from blueprints.validations import raise_if_negative
+
+
+class Form5Dot23FactorConcreteStrengthClass(Formula):
+    """Class representing formula 5.23 for the calculation of the factor for concrete strength class, :math:`k_{1}`."""
+
+    label = "5.23"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(self, f_ck: MPA) -> None:
+        r"""[:math:`k_{1}`] Factor for concrete strength class.
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.6(3) - Formula (5.23)
+
+        Parameters
+        ----------
+        f_ck : MPA
+            [:math:`f_{ck}`] is the characteristic compressive strength of concrete.
+        """
+        super().__init__()
+        self.f_ck = f_ck
+
+    @staticmethod
+    def _evaluate(f_ck: MPA) -> DIMENSIONLESS:
+        """Evaluates the formula, for more information see the __init__ method."""
+        raise_if_negative(f_ck=f_ck)
+        return (f_ck / 20) ** 0.5
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.23."""
+        return LatexFormula(
+            return_symbol=r"k_{1}",
+            result=f"{self:.3f}",
+            equation=r"\sqrt{\frac{f_{ck}}{20}}",
+            numeric_equation=rf"\sqrt{{\frac{{{self.f_ck:.3f}}}{{20}}}}",
+            comparison_operator_label="=",
+        )

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_24.py

@@ -0,0 +1,55 @@
+"""Formula 5.24 from NEN-EN 1992-1-1+C2:2011: Chapter 5 - Structural Analysis."""
+
+from blueprints.codes.eurocode.nen_en_1992_1_1_c2_2011 import NEN_EN_1992_1_1_C2_2011
+from blueprints.codes.formula import Formula
+from blueprints.codes.latex_formula import LatexFormula
+from blueprints.type_alias import DIMENSIONLESS
+from blueprints.validations import raise_if_negative
+
+
+class Form5Dot24AxialForceCorrectionFactor(Formula):
+    """Class representing formula 5.24 for the calculation of the axial force correction factor [:math:`k_{2}`]."""
+
+    label = "5.24"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(
+        self,
+        n: DIMENSIONLESS,
+        lambda_factor: DIMENSIONLESS,
+    ) -> None:
+        """[:math:`k_{2}`] Axial force correction factor.
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.3 - Formula (5.24)
+
+        Parameters
+        ----------
+        n : DIMENSIONLESS
+            [:math:`n`] Relative axial force, :math:`N_{ed} / (A_{c} * f_{cd})` [-].
+        lambda_factor : DIMENSIONLESS
+            [:math:`λ`] Slenderness ratio, see 5.8.3 [-].
+
+        Notes
+        -----
+        The value of :math:`k_{2}` cannot be larger than 0.20.
+        """
+        super().__init__()
+        self.n = n
+        self.lambda_factor = lambda_factor
+
+    @staticmethod
+    def _evaluate(n: DIMENSIONLESS, lambda_factor: DIMENSIONLESS) -> DIMENSIONLESS:
+        """Evaluates the formula, for more information see the __init__ method."""
+        raise_if_negative(n=n, lambda_factor=lambda_factor)
+        k2 = n * lambda_factor / 170
+        return min(k2, 0.20)
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.24."""
+        return LatexFormula(
+            return_symbol=r"k_2",
+            result=f"{self:.3f}",
+            equation=r"\min(0.20; n \cdot \frac{λ}{170})",
+            numeric_equation=rf"\min(0.20; {self.n:.3f} \cdot \frac{{{self.lambda_factor:.3f}}}{{170}})",
+            comparison_operator_label="=",
+        )

blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_5_structural_analysis/formula_5_25.py

@@ -0,0 +1,44 @@
+"""Formula 5.25 from NEN-EN 1992-1-1+C2:2011: Chapter 5 - Structural Analysis."""
+
+from blueprints.codes.eurocode.nen_en_1992_1_1_c2_2011 import NEN_EN_1992_1_1_C2_2011
+from blueprints.codes.formula import Formula
+from blueprints.codes.latex_formula import LatexFormula
+from blueprints.type_alias import DIMENSIONLESS
+from blueprints.validations import raise_if_negative
+
+
+class Form5Dot25AxialForceCorrectionFactor(Formula):
+    """Class representing formula 5.25 for the calculation of the axial force correction factor [:math:`k_{2}`]."""
+
+    label = "5.25"
+    source_document = NEN_EN_1992_1_1_C2_2011
+
+    def __init__(self, n: DIMENSIONLESS) -> None:
+        r"""[:math:`k_{2}`] Axial force correction factor.
+
+        NEN-EN 1992-1-1+C2:2011 art.5.8.6(3) - Formula (5.25)
+
+        Parameters
+        ----------
+        n : DIMENSIONLESS
+            [:math:`n`] Relative axial force, :math:`N_{ed} / (A_{c} * f_{cd})` [-].
+        """
+        super().__init__()
+        self.n = n
+
+    @staticmethod
+    def _evaluate(n: DIMENSIONLESS) -> DIMENSIONLESS:
+        """Evaluates the formula, for more information see the __init__ method."""
+        raise_if_negative(n=n)
+        k2 = n * 0.30
+        return min(k2, 0.20)
+
+    def latex(self) -> LatexFormula:
+        """Returns LatexFormula object for formula 5.25."""
+        return LatexFormula(
+            return_symbol=r"k_{2}",
+            result=f"{self:.3f}",
+            equation=r"\min(0.20; n \cdot 0.30)",
+            numeric_equation=rf"\min(0.20; {self.n:.3f} \cdot 0.30)",
+            comparison_operator_label="=",
+        )