-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #120 from Blueprints-org/119-feature-request-add-f…
…ormula-6.5-from-nen-en-1993-1-1+c2+a22016
- Loading branch information
Showing
5 changed files
with
92 additions
and
1 deletion.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
...ints/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
"""Module containing all formulas from 1993-1-1+C2+A1:2016: Chapter 6 - Ultimate limit state.""" |
43 changes: 43 additions & 0 deletions
43
...s/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/formula_6_5.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
"""Formula 6.5 from NEN-EN 1993-1-1+C2+A1:2016: Chapter 6 - Ultimate limit state.""" | ||
# pylint: disable=arguments-differ | ||
from blueprints.codes.eurocode.nen_en_1993_1_1_c2_a1_2016 import NEN_EN_1993_1_1_C2_A1_2016 | ||
from blueprints.codes.formula import Formula | ||
from blueprints.type_alias import KN, RATIO | ||
from blueprints.validations import raise_if_less_or_equal_to_zero, raise_if_negative | ||
|
||
|
||
class Form6Dot5UnityCheckTensileStrength(Formula): | ||
"""Class representing formula 6.5 for the unity check for tensile strength.""" | ||
|
||
label = "6.5" | ||
source_document = NEN_EN_1993_1_1_C2_A1_2016 | ||
|
||
def __init__( | ||
self, | ||
n_ed: KN, | ||
n_t_rd: KN, | ||
) -> None: | ||
"""[N_ed/N_t_rd] Unity check for tensile strength of an element in tension. | ||
NEN-EN 1993-1-1+C2+A1:2016 art.6.2.3(1) - Formula (6.5) | ||
Parameters | ||
---------- | ||
n_ed : KN | ||
[NEd] Design value of the normal tensile force [kN]. | ||
n_t_rd : KN | ||
[Nt,Rd] Design value of the resistance against tenslie force [kN]. | ||
""" | ||
super().__init__() | ||
self.n_ed = n_ed | ||
self.n_t_rd = n_t_rd | ||
|
||
@staticmethod | ||
def _evaluate( | ||
n_ed: KN, | ||
n_t_rd: KN, | ||
) -> RATIO: | ||
"""Evaluates the formula, for more information see the __init__ method.""" | ||
raise_if_less_or_equal_to_zero(n_t_rd=n_t_rd) | ||
raise_if_negative(n_ed=n_ed) | ||
return n_ed / n_t_rd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
tests/codes/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
"""Module containing all formulas from NEN_EN_1993_1_1_C2_A1_2016: Chapter 6 - Ultimate limit state.""" |
46 changes: 46 additions & 0 deletions
46
...es/eurocode/nen_en_1993_1_1_c2_a1_2016/chapter_6_ultimate_limit_state/test_formula_6_5.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
"""Testing formula 6.5 of NEN-EN 1993-1-1+C2+A1:2016.""" | ||
import pytest | ||
|
||
from blueprints.codes.eurocode.nen_en_1993_1_1_c2_a1_2016.chapter_6_ultimate_limit_state.formula_6_5 import ( | ||
Form6Dot5UnityCheckTensileStrength, | ||
) | ||
from blueprints.validations import LessOrEqualToZeroError, NegativeValueError | ||
|
||
|
||
class TestForm6Dot5UnityCheckTensileStrength: | ||
"""Validation for formula 6.5 from NEN-EN 1993-1-1+C2+A1:2016.""" | ||
|
||
def test_evaluation(self) -> None: | ||
"""Test the evaluation of the result.""" | ||
# Example values | ||
n_ed = 7 # kN | ||
n_t_rd = 10 # kN | ||
form = Form6Dot5UnityCheckTensileStrength(n_ed=n_ed, n_t_rd=n_t_rd) | ||
|
||
# Expected result, manually calculated | ||
expected = 0.7 | ||
|
||
assert form == pytest.approx(expected) | ||
|
||
@pytest.mark.parametrize( | ||
("n_ed", "n_t_rd"), | ||
[ | ||
(-7, 10), # n_ed is negative | ||
], | ||
) | ||
def test_raise_error_when_negative_n_ed_is_given(self, n_ed: float, n_t_rd: float) -> None: | ||
"""Test a negative value for n_ed.""" | ||
with pytest.raises(NegativeValueError): | ||
Form6Dot5UnityCheckTensileStrength(n_ed=n_ed, n_t_rd=n_t_rd) | ||
|
||
@pytest.mark.parametrize( | ||
("n_ed", "n_t_rd"), | ||
[ | ||
(7, 0), # n_ed is negative | ||
(7, -10), # n_t_rd is negative | ||
], | ||
) | ||
def test_raise_error_when_negative_or_zero_n_t_rd_is_given(self, n_ed: float, n_t_rd: float) -> None: | ||
"""Test a zero value for n_t_rd.""" | ||
with pytest.raises(LessOrEqualToZeroError): | ||
Form6Dot5UnityCheckTensileStrength(n_ed=n_ed, n_t_rd=n_t_rd) |