Skip to content

fix: use fck when deriving the ultimate strain for sargin in ConcreteEc2_2004 #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mortenengen merged 1 commit into from
Jan 7, 2026
Merged

fix: use fck when deriving the ultimate strain for sargin in ConcreteEc2_2004 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions structuralcodes/materials/concrete/_concreteEC2_2004.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,11 @@ def eps_cu1(self) -> float:
float: The maximum strength at failure of concrete.

Note:
The returned value is derived from fcm if eps_cu1 is not manually
The returned value is derived from fck if eps_cu1 is not manually
provided when initializing the object.
"""
if self._eps_cu1 is None:
return ec2_2004.eps_cu1(self.fcm)
return ec2_2004.eps_cu1(self.fck)
return self._eps_cu1

@property
Expand Down
26 changes: 26 additions & 0 deletions tests/test_materials/test_concrete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import pytest

from structuralcodes.codes import ec2_2004
from structuralcodes.materials.concrete import (
Concrete,
ConcreteEC2_2004,
Expand Down Expand Up @@ -120,3 +121,28 @@ def test_invalid_constitutive_law(concrete_type):
)
with pytest.raises(ValueError):
concrete_type(fck=45, constitutive_law=invalid_constitutive_law)


@pytest.mark.parametrize(
'fck',
(
35,
45,
55,
65,
70,
),
)
def test_sargin_strains_ec2_2004(fck):
"""Test that ConcreteEC2_2004 initializes the correct ultimate strain for
the Sargin law.
"""
# Arrange
concrete = ConcreteEC2_2004(fck=fck)

# Act
eps_cu1_concrete = concrete.eps_cu1
eps_cu1_code = ec2_2004.eps_cu1(fck=fck)

# Assert
assert math.isclose(eps_cu1_concrete, eps_cu1_code)