Skip to content

Commit 03c24d7

Browse files
bro-wibro-wi
authored
Merge pull request #632 from Blueprints-org/629-feature-request-nen-en-1993-1-9-to-en-1993-1-9
NEN-EN 1993-1-9 to EN 1993-1-9
2 parents 4c3f8f6 + 2684bcb commit 03c24d7

File tree

14 files changed

+26
-26
lines changed

14 files changed

+26
-26
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Our mission is to reduce the cost and time associated with civil engineering cal
6161

6262
* Eurocode formulas [templates for making formula](https://github.com/orgs/Blueprints-org/discussions/432)
6363
- [ ] EN 1992-1-1:2004 ![](https://img.shields.io/badge/80-%25-grey?style=plastic&labelColor=yellowgreen)
64-
- [ ] EN 1993-1-1:2005 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
65-
- [ ] NEN-EN 1993-1-9+C2:2012 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
64+
- [ ] EN 1993-1-1:2005 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
65+
- [ ] EN 1993-1-9:2005 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
6666
- [ ] EN 1993-5:2007 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
6767
- [ ] NEN 9997-1+C2:2017 ![](https://img.shields.io/badge/20%25-grey?style=plastic&labelColor=orange)
6868

‎blueprints/codes/eurocode/en_1993_1_9_2005/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"""Eurocode EN 1993-1-9:2005."""
2+
3+
EN_1993_1_9_2005 = "EN 1993-1-9:2005"

‎blueprints/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Package containing all formulas from EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification formats."""

‎blueprints/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/formula_a_1.py renamed to ‎blueprints/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/formula_a_1.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"""Formula A.1 from NEN-EN 1993-1-9+C2:2012: Annex A - Determination of fatigue load parameters and verification formats."""
1+
"""Formula A.1 from EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification formats."""
22

3-
from blueprints.codes.eurocode.nen_en_1993_1_9_c2_2012 import NEN_EN_1993_1_9_C2_2012
3+
from blueprints.codes.eurocode.en_1993_1_9_2005 import EN_1993_1_9_2005
44
from blueprints.codes.formula import Formula
55
from blueprints.codes.latex_formula import LatexFormula
66
from blueprints.type_alias import DIMENSIONLESS
@@ -11,12 +11,12 @@ class FormADot1DamageDuringDesignLife(Formula):
1111
"""Class representing formula A.1 for the calculation of the damage during the design life [$D_d$]."""
1212

1313
label = "A.1"
14-
source_document = NEN_EN_1993_1_9_C2_2012
14+
source_document = EN_1993_1_9_2005
1515

1616
def __init__(self, n_e: list[DIMENSIONLESS], n_r: list[DIMENSIONLESS]) -> None:
1717
r"""[$D_d$] The calculation of the damage during the design life [$-$].
1818
19-
NEN-EN 1993-1-9+C2:2012 art.A.5 - Formula (A.1)
19+
EN 1993-1-9:2005 art.A.5 - Formula (A.1)
2020
2121
Parameters
2222
----------

‎blueprints/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/formula_a_2.py renamed to ‎blueprints/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/formula_a_2.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"""Formula A.1 from NEN-EN 1993-1-9+C2:2012: Annex A - Determination of fatigue load parameters and verification formats."""
1+
"""Formula A.1 from EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification formats."""
22

3-
from blueprints.codes.eurocode.nen_en_1993_1_9_c2_2012 import NEN_EN_1993_1_9_C2_2012
3+
from blueprints.codes.eurocode.en_1993_1_9_2005 import EN_1993_1_9_2005
44
from blueprints.codes.formula import Formula
55
from blueprints.codes.latex_formula import LatexFormula
66
from blueprints.type_alias import DIMENSIONLESS
@@ -11,15 +11,15 @@ class FormADot2CriteriaBasedOnDamageAccumulation(Formula):
1111
"""Class representing formula A.2 for the calculation of the damage during the design life."""
1212

1313
label = "A.2"
14-
source_document = NEN_EN_1993_1_9_C2_2012
14+
source_document = EN_1993_1_9_2005
1515

1616
def __init__(
1717
self,
1818
d_d: DIMENSIONLESS,
1919
) -> None:
2020
r"""[$CHECK$] Criteria met, based on damage accumulation.
2121
22-
NEN-EN 1993-1-9+C2:2012 art.A.5 - Formula (A.1)
22+
EN 1993-1-9:2005 art.A.5 - Formula (A.1)
2323
2424
Parameters
2525
----------

‎blueprints/codes/eurocode/nen_en_1993_1_9_c2_2012/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎blueprints/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/codes/eurocode/en_1992_1_1_2004/chapter_5_structural_analysis/test_formula_5_18.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Testing formula 5.18 from NEN-EN 1993-1-9+C2:2012."""
1+
"""Testing formula 5.18 from EN 1993-1-9:2005."""
22

33
import pytest
44

@@ -7,7 +7,7 @@
77

88

99
class TestForm5Dot18ComparisonGeneralSecondOrderEffects:
10-
"""Testing formula 5.18 from NEN-EN 1993-1-9+C2:2012."""
10+
"""Testing formula 5.18 from EN 1993-1-9:2005."""
1111

1212
@pytest.mark.parametrize(
1313
("f_ved", "k_1", "n_s", "length", "e_cd", "i_c", "result_manual"),

‎tests/codes/eurocode/en_1993_1_9_2005/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Package contains tests for Eurocode EN 1993-1-9:2005."""

‎tests/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"""Module containing all tests for formula A.1 of EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification
2+
formats.
3+
"""

‎tests/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/test_formula_a_1.py renamed to ‎tests/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/test_formula_a_1.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
"""Testing formula A.1 from NEN-EN 1993-1-9+C2:2012: Annex A - Determination of fatigue load parameters and verification formats."""
1+
"""Testing formula A.1 from EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification formats."""
22

33
import pytest
44

5-
from blueprints.codes.eurocode.nen_en_1993_1_9_c2_2012.annex_a_determination_of_fatigue_load_parameters_and_verification_formats.formula_a_1 import (
5+
from blueprints.codes.eurocode.en_1993_1_9_2005.annex_a_determination_of_fatigue_load_parameters_and_verification_formats.formula_a_1 import (
66
FormADot1DamageDuringDesignLife,
77
)
88
from blueprints.validations import LessOrEqualToZeroError, ListsNotSameLengthError, NegativeValueError
99

1010

1111
class TestFormADot1DamageDuringDesignLife:
12-
"""Validation for formula A.1 from NEN-EN 1993-1-9+C2:2012."""
12+
"""Validation for formula A.1 from EN 1993-1-9:2005."""
1313

1414
def test_evaluation(self) -> None:
1515
"""Test the evaluation of the result."""

‎tests/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/test_formula_a_2.py renamed to ‎tests/codes/eurocode/en_1993_1_9_2005/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/test_formula_a_2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
"""Testing formula A.1 from NEN-EN 1993-1-9+C2:2012: Annex A - Determination of fatigue load parameters and verification formats."""
1+
"""Testing formula A.1 from EN 1993-1-9:2005: Annex A - Determination of fatigue load parameters and verification formats."""
22

33
import pytest
44

5-
from blueprints.codes.eurocode.nen_en_1993_1_9_c2_2012.annex_a_determination_of_fatigue_load_parameters_and_verification_formats.formula_a_2 import (
5+
from blueprints.codes.eurocode.en_1993_1_9_2005.annex_a_determination_of_fatigue_load_parameters_and_verification_formats.formula_a_2 import (
66
FormADot2CriteriaBasedOnDamageAccumulation,
77
)
88
from blueprints.validations import NegativeValueError
99

1010

1111
class TestFormADot2CriteriaBasedOnDamageAccumulation:
12-
"""Validation for formula A.2 from NEN-EN 1993-1-9+C2:2012."""
12+
"""Validation for formula A.2 from EN 1993-1-9:2005."""
1313

1414
@pytest.mark.parametrize(
1515
("d_d", "result_manual"),

‎tests/codes/eurocode/nen_en_1993_1_9_c2_2012/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/codes/eurocode/nen_en_1993_1_9_c2_2012/annex_a_determination_of_fatigue_load_parameters_and_verification_formats/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)