structuralcodes 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

structuralcodes/sections/_generic.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations  # To have clean hints of ArrayLike in docs
 
+import math
 import typing as t
 import warnings
-from math import cos, sin
 
 import numpy as np
 from numpy.typing import ArrayLike
@@ -55,6 +55,16 @@ class GenericSection(Section):
                 of the section.
             name (str): The name of the section.
             integrator (str): The name of the SectionIntegrator to use.
+            kwargs (dict): A collection of keyword arguments to pass on to the
+                section calculator.
+
+        Note:
+            The GenericSection uses a GenericSectionCalculator for all
+            calculations. The GenericSectionCalculator uses a SectionIntegrator
+            for integrating over the section. Any additional keyword arguments
+            used when creating the GenericSection are passed on to the
+            SectionCalculator to customize the behaviour. See
+            GenericSectionCalculator for available keyword arguments.
         """
         if name is None:
             name = 'GenericSection'
@@ -98,7 +108,7 @@ class GenericSectionCalculator(SectionCalculator):
                 (default = 'marin').
 
         Note:
-            When using 'fiber' integrator the kwarg 'mesh_size' can be used to
+            When using `fiber` integrator the kwarg `mesh_size` can be used to
             specify a dimensionless number (between 0 and 1) specifying the
             size of the resulting mesh.
         """
@@ -142,13 +152,13 @@ class GenericSectionCalculator(SectionCalculator):
         # Computation of surface area, reinforcement area, EA (axial rigidity)
         # and mass: Morten -> problem with units! how do we deal with it?
         for geo in self.section.geometry.geometries:
-            gp.ea += geo.area * geo.material.get_tangent(eps=0)[0]
+            gp.ea += geo.area * geo.material.get_tangent(eps=0)
             if geo.density is not None:
                 # this assumes area in mm2 and density in kg/m3
                 gp.mass += geo.area * geo.density * 1e-9
 
         for geo in self.section.geometry.point_geometries:
-            gp.ea += geo.area * geo.material.get_tangent(eps=0)[0]
+            gp.ea += geo.area * geo.material.get_tangent(eps=0)
             gp.area_reinforcement += geo.area
             if geo.density is not None:
                 # this assumes area in mm2 and density in kg/m3
@@ -208,7 +218,13 @@ class GenericSectionCalculator(SectionCalculator):
             )
             # Change sign due to moment sign convention
             izz *= -1
-            if abs(abs(izy) - abs(iyz)) > 10:
+
+            # Compute reasonable value for absolute tolerance for checking iyz
+            rel_tol = 1e-9
+            abs_tol = 0.5 * (iyy + izz) * rel_tol
+
+            # Check calculated cross moment
+            if not math.isclose(iyz, izy, rel_tol=rel_tol, abs_tol=abs_tol):
                 error_str = 'Something went wrong with computation of '
                 error_str += f'moments of area: iyz = {iyz}, izy = {izy}.\n'
                 error_str += 'They should be equal but are not!'
@@ -574,7 +590,12 @@ class GenericSectionCalculator(SectionCalculator):
         """Rotate triangulated data of angle theta."""
         rotated_triangulated_data = []
         for tr in self.triangulated_data:
-            T = np.array([[cos(theta), -sin(theta)], [sin(theta), cos(theta)]])
+            T = np.array(
+                [
+                    [np.cos(theta), -np.sin(theta)],
+                    [np.sin(theta), np.cos(theta)],
+                ]
+            )
             coords = np.vstack((tr[0], tr[1]))
             coords_r = T @ coords
             rotated_triangulated_data.append(
@@ -636,7 +657,9 @@ class GenericSectionCalculator(SectionCalculator):
         )
 
         # Rotate back to section CRS TODO Check
-        T = np.array([[cos(theta), -sin(theta)], [sin(theta), cos(theta)]])
+        T = np.array(
+            [[np.cos(theta), -np.sin(theta)], [np.sin(theta), np.cos(theta)]]
+        )
         M = T @ np.array([[My], [Mz]])
         if self.triangulated_data is not None:
             # Rotate back also triangulated data!
@@ -771,7 +794,12 @@ class GenericSectionCalculator(SectionCalculator):
                 geo=rotated_geom, strain=strain, tri=self.triangulated_data
             )
             # Rotate back to section CRS
-            T = np.array([[cos(theta), -sin(theta)], [sin(theta), cos(theta)]])
+            T = np.array(
+                [
+                    [np.cos(theta), -np.sin(theta)],
+                    [np.sin(theta), np.cos(theta)],
+                ]
+            )
             M = T @ np.array([[My], [Mz]])
             eps_a[i] = strain[0]
             my[i] = M[0, 0]
@@ -1106,7 +1134,9 @@ class GenericSectionCalculator(SectionCalculator):
         eps_a = eps_n - kappa_y * y_n
 
         # rotate back components to work in section CRS
-        T = np.array([[cos(theta), -sin(theta)], [sin(theta), cos(theta)]])
+        T = np.array(
+            [[np.cos(theta), -np.sin(theta)], [np.sin(theta), np.cos(theta)]]
+        )
         components = np.vstack((kappa_y, np.zeros_like(kappa_y)))
         rotated_components = T @ components
         return np.column_stack((eps_a, rotated_components.T)), field_num

structuralcodes/sections/section_integrators/_fiber_integrator.py

@@ -103,9 +103,7 @@ class FiberIntegrator(SectionIntegrator):
                 # define the maximum area of the triangles
                 max_area = g.area * mesh_size
                 # triangulate the geometry getting back the mesh
-                mesh = triangle.triangulate(
-                    tri, f'pq{30:.1f}Aa{max_area:.1f}o1'
-                )
+                mesh = triangle.triangulate(tri, f'pq{30:.1f}Aa{max_area}o1')
                 mat = g.material
                 # Get x and y coordinates (centroid) and area for each fiber
                 x = []

structuralcodes/sections/section_integrators/_marin_integrator.py

@@ -143,7 +143,7 @@ class MarinIntegrator(SectionIntegrator):
             strain = strain_rotated[0] + strain_rotated[1] * yp
             x.append(xp)
             y.append(yp)
-            F.append(pg.material.get_stress(strain)[0] * A)
+            F.append(pg.material.get_stress(strain) * A)
         prepared_input.append((1, np.array(x), np.array(y), np.array(F)))
 
         return angle, prepared_input

{structuralcodes-0.1.0.dist-info → structuralcodes-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: structuralcodes
-Version: 0.1.0
+Version: 0.2.0
 Summary: A Python package that contains models from structural design codes.
 Author-email: fib - International Federation for Structural Concrete <info@fib-international.org>
 Requires-Python: >=3.8

{structuralcodes-0.1.0.dist-info → structuralcodes-0.2.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-structuralcodes/__init__.py,sha256=opNmFZxtV5QKx38kj-eHuoZX-JPLuLojIGDH7au31WE,390
+structuralcodes/__init__.py,sha256=pxmTgFCzRRSx9OPXM_I5KbP045gFiNqoR_v6N1Ni7as,390
 structuralcodes/codes/__init__.py,sha256=g5xMAJ3jEZHFd0cypvZY6lMCi7XeVEntsO8zHzI2mWc,2803
-structuralcodes/codes/ec2_2004/__init__.py,sha256=_PdL9kX7qlfn9VBfqUCJQy6V9fWmIyugzIiSZczjNAA,1986
+structuralcodes/codes/ec2_2004/__init__.py,sha256=DljXFNrCGE1lZIOsgyZgJ7Xo-xUidJomDrDKyfOHcH8,2431
+structuralcodes/codes/ec2_2004/_concrete_creep_and_shrinkage.py,sha256=y4HhOpaXwNMCHh4wu4LSn14oD1ylpPNvVJOJXLxStzQ,15284
 structuralcodes/codes/ec2_2004/_concrete_material_properties.py,sha256=Ol51tzcVOHUvc2Vea24WQJ4FABxXc-9cB5RVu2N1pio,5964
 structuralcodes/codes/ec2_2004/_reinforcement_material_properties.py,sha256=_ZlvdHcOswu1Ge1XjSvt4j5ue-znDceMOlA0s528IqM,2779
 structuralcodes/codes/ec2_2004/_section_7_3_crack_control.py,sha256=a91tWQKNTxB2SpSKu0Wtm-P5GdmifRLggNlEHIQ3XMY,31981
-structuralcodes/codes/ec2_2004/annex_b_shrink_and_creep.py,sha256=Vht8VjmpHNRl7-AirTm2buJl1RzL76AbW6-XgdDK6Kg,7348
-structuralcodes/codes/ec2_2004/shear.py,sha256=uA9a5Po5X4ysp5pDI8HB0pBjI9Z9txxhPD_joLTM8O0,16910
+structuralcodes/codes/ec2_2004/shear.py,sha256=gzhgIa-EgoD9gLO_Hfa8VeCmjAxuPK0wZ0soDKC7W5w,17095
 structuralcodes/codes/ec2_2023/__init__.py,sha256=UohRxikCUqPAUpHj4uSWHw5drICjZm3zvJJw7clljo0,1618
 structuralcodes/codes/ec2_2023/_annexB_time_dependent.py,sha256=ykRAHBHzqtMSErkVA-rwTHBdUq8-L7q2AOaEd2YW5wc,472
 structuralcodes/codes/ec2_2023/_section5_materials.py,sha256=-vYowBVcebyPyuGvX3wLfxiePdM0OrBgRrYil71Vd88,32384
 structuralcodes/codes/ec2_2023/_section9_sls.py,sha256=l1d3xcALAweU9jAAf1d91TJaGB_0p-eMzbRGuhfKydQ,11252
 structuralcodes/codes/mc2010/__init__.py,sha256=g2J2GTIy9jbLTVq_yF4DXau4WLmAkpmMTgnD4QmW2vI,2844
-structuralcodes/codes/mc2010/_concrete_creep_and_shrinkage.py,sha256=7VRzXGjGAM7JkfMcgWvntq4PC2n7VVtSS7CHQuxZaHM,23193
+structuralcodes/codes/mc2010/_concrete_creep_and_shrinkage.py,sha256=wFTVHfJKIyt0jUGthd1gWKfr4JfoFo9YN6d3nL6Ouq4,23277
 structuralcodes/codes/mc2010/_concrete_interface_different_casting_times.py,sha256=x_n9Z9WEPY6DFf8Og5UIERPivNh-O_3RM4ZnGBy64cs,3570
 structuralcodes/codes/mc2010/_concrete_material_properties.py,sha256=MTz70-9iaN_s0Z8gJksCEzP0Yza4pPfZ-vOI30pzbw4,12362
 structuralcodes/codes/mc2010/_concrete_punching.py,sha256=ZG2P7WXIRcFh5sGlmHP20BsJbz0o44cFO51FCru2kXw,17431
@@ -21,31 +21,38 @@ structuralcodes/codes/mc2010/_reinforcement_material_properties.py,sha256=FELmgM
 structuralcodes/codes/mc2020/__init__.py,sha256=5hrAfBtAeG69N_lroFpG10_ZKB1SuNlKBnuHug2DI3E,174
 structuralcodes/core/__init__.py,sha256=spnvZIm_w3jX_lV-v3bloDjgHh8lrH6UHpA1Nv1zeAI,55
 structuralcodes/core/_section_results.py,sha256=hHXoS71TpSmWqw276pBeLiLrEEiMEWclOd28ArRW_Kk,8280
-structuralcodes/core/base.py,sha256=TqgsXzIXITQmER3tKNjzjPrbSN5uT_PqCpG3PVMd3Yw,8562
+structuralcodes/core/base.py,sha256=7cpDM2hvBZp9nyU714XRiMzDPNdydJqLtIHHvcXZctE,8935
 structuralcodes/geometry/__init__.py,sha256=FwzywfyGKOk6v96ZyOfyBo5iVeuK_W0TQVz5llAkYW4,559
-structuralcodes/geometry/_geometry.py,sha256=kmY7TER5yS-TVw0XY4EuwNviLuEhExtLoon8oO2TJbA,31175
-structuralcodes/geometry/_reinforcement.py,sha256=8Xes3N8zm85bJVu_bgVNzMs4zo2zPv17xadw2I9CnE0,3739
+structuralcodes/geometry/_geometry.py,sha256=8usT5UfDlT-A8sMwM6Bh4YKIB9QuyAU5tGgsujeACEA,31240
+structuralcodes/geometry/_reinforcement.py,sha256=N2wTH-NoZ1fG-_vRT9gGX2Kk3zlW7CbDtl1oqS_lMv0,4144
 structuralcodes/geometry/_steel_sections.py,sha256=UdJmhhnK8r5gEfBzvWsMFHGs5gmuoOhFoduBanlRMQg,60225
 structuralcodes/materials/__init__.py,sha256=r5E5vsXVKB-BGZXTnEbsrYJbH6rr6Xlc_b4LlcUPIbc,173
-structuralcodes/materials/constitutive_laws.py,sha256=DX_yuC4OpgDCl_g3sl0Hi2ee7lFD2fy3yO4PTINKBzE,34455
 structuralcodes/materials/concrete/__init__.py,sha256=GRD5WcbYrnE4iN-L7qVkhVTi7w_PUP7pnbGueOaVeFs,2576
 structuralcodes/materials/concrete/_concrete.py,sha256=3zMTFtaqFeUl7ne7-pe9wF4LryzqvGpUwThnHTidCZU,3774
 structuralcodes/materials/concrete/_concreteEC2_2004.py,sha256=gWG3O9yeGw3UeftCjYTajZco_XYDmBxPGqhAEpH3nY0,14666
 structuralcodes/materials/concrete/_concreteEC2_2023.py,sha256=vguNzlfoPuaieTVw9T3xWU0wb230WvER4Vy1jswcdlo,14017
 structuralcodes/materials/concrete/_concreteMC2010.py,sha256=lHy-WYiVpXPwiNAyjUBxuGWuGFd0-Uirh6KiolMH4MY,15313
+structuralcodes/materials/constitutive_laws/__init__.py,sha256=r817qyeimqZyyan2mU8cVwjwMkiB--f-BOIBSzXKiZo,2954
+structuralcodes/materials/constitutive_laws/_bilinearcompression.py,sha256=mkuMSiKpfZv-meIvHedrlILfRBdOsR46QCiaiyxPxVs,4528
+structuralcodes/materials/constitutive_laws/_elastic.py,sha256=Kl-A_3W2qoJUEPE3meWABSqUlNChMExiq2LdRehbqrI,3722
+structuralcodes/materials/constitutive_laws/_elasticplastic.py,sha256=GDIIXJ93nqV-G8-o6HxXGUTd3TgNWiHQqXbULFcCGUI,6096
+structuralcodes/materials/constitutive_laws/_parabolarectangle.py,sha256=CvjmiGCmNTqxY6d5jNqCo6MAh_BUkypvv_-ZJB9JyQE,6489
+structuralcodes/materials/constitutive_laws/_popovics.py,sha256=dpXFQ9KHE245C9dgOLz9KXYHZiAYrRan5exgj0j_JxM,4322
+structuralcodes/materials/constitutive_laws/_sargin.py,sha256=WJGw0EtqkPh-d3N6vTPRIfhE1Ypyc16JpGcoi-0U1A8,3495
+structuralcodes/materials/constitutive_laws/_userdefined.py,sha256=urt0yuJicO51jnQ2S8bfmrgVTyYh09Olnzy9_tISGK4,8292
 structuralcodes/materials/reinforcement/__init__.py,sha256=-UA04GSNN6_xLKqnH_5taiOmgxYwD_wtT6Nw8UbfkJY,2757
 structuralcodes/materials/reinforcement/_reinforcement.py,sha256=zrSdBvHKTYqOHpkJzxit8w_b2JG2pggviOvgZyH246Q,5029
 structuralcodes/materials/reinforcement/_reinforcementEC2_2004.py,sha256=svLpubjaTH_DepwY68TQIA8fRwadoAE3Y3KsyViGQHk,3265
 structuralcodes/materials/reinforcement/_reinforcementEC2_2023.py,sha256=3tKpFcMNYK52s5K2K_PctRcuSgwZTe-QXX3xziHPUno,2887
 structuralcodes/materials/reinforcement/_reinforcementMC2010.py,sha256=az_IAQJNKSF6Vv9KMoXjWTdYkWI6xcEm7s8i8GETn3A,2939
 structuralcodes/sections/__init__.py,sha256=qPoD5eS31at-uveYtxtVkXGLNHPrIMRrxGYY3wOLQ4s,441
-structuralcodes/sections/_generic.py,sha256=UHbj7r2fsBvT4DVDWkxpaQck82cQiV0XFkY8N-g_eYI,49479
+structuralcodes/sections/_generic.py,sha256=I_YQNeK9ww3wDtkSBlhF7u6gXVAj2I5Sttv9i-uk8UI,50525
 structuralcodes/sections/section_integrators/__init__.py,sha256=PK4ixV0XrfHXN-itIrB1r90npoWo3aIJqMcenqcaees,399
 structuralcodes/sections/section_integrators/_factory.py,sha256=MHp14hfWU-oXTiIutCKLJEC47LirYsHgEAAmHVtnFMY,1242
-structuralcodes/sections/section_integrators/_fiber_integrator.py,sha256=5sxcfbmxMJfy45Pfd84I4sAh6HpPc5B4r6ab0WpjSNI,9305
+structuralcodes/sections/section_integrators/_fiber_integrator.py,sha256=Ucas8nA9BB4ILfFPplJp3WkgLc9ntf9UN7AmcUwqA_A,9263
 structuralcodes/sections/section_integrators/_marin_integration.py,sha256=SZgya6d_Tequ3jez7UEBlYioZepW2IDKaAxn_6WrMbU,1563
-structuralcodes/sections/section_integrators/_marin_integrator.py,sha256=rtEtd1X0QYAWNcaH7Pjd_b6LEzVjHqD_fbIrX64p7fg,9121
+structuralcodes/sections/section_integrators/_marin_integrator.py,sha256=DHAJwurHhVp68K9fozw0MbmxZvk_NAKnNVi5abp65sY,9118
 structuralcodes/sections/section_integrators/_section_integrator.py,sha256=O-jsG1Pu_doovgRJsFG1Sf0KlkN2wNfQdmgkJiSHNN0,1590
-structuralcodes-0.1.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-structuralcodes-0.1.0.dist-info/METADATA,sha256=z10AmhI6UDYF_wu-kJTNvLYcmSu_nhn1WBNiodbrm8M,2444
-structuralcodes-0.1.0.dist-info/RECORD,,
+structuralcodes-0.2.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+structuralcodes-0.2.0.dist-info/METADATA,sha256=7RAyKNKlQYjXC3sFiVRWTwp3HUMAhN5SvJAvcF2LTZ0,2444
+structuralcodes-0.2.0.dist-info/RECORD,,

structuralcodes/codes/ec2_2004/annex_b_shrink_and_creep.py

@@ -1,257 +0,0 @@
-"""Calculation routine for shrinkage and creep from EUROCODE 1992-1-1:2004
-Annex B.
-"""
-
-import math
-import typing as t
-
-import numpy as np
-
-ALPHA_CEMENT_DICT = {'R': 1, 'N': 0, 'S': -1}
-ALPHA_DS_DICT = {
-    'R': {'alpha_ds1': 6, 'alpha_ds2': 0.11},
-    'N': {'alpha_ds1': 4, 'alpha_ds2': 0.12},
-    'S': {'alpha_ds1': 3, 'alpha_ds2': 0.13},
-}
-
-
-def phi(
-    h_0: float,
-    f_cm: float,
-    RH: int = 50,
-    cement_class: t.Literal['R', 'N', 'S'] = 'R',
-    t0: int = 7,
-    t: int = 18263,
-) -> float:
-    """Calculates the creep number.
-
-    EN 1992-1-1:2004, Eq. (B.1).
-
-    Args:
-        h_0 (float): The product of 2 times the cross-sectional area divided by
-            the exposed circumference according to (B.6).
-        f_cm (float): The mean concrete strength,
-        RH (int): The relative humidity in percent, defaults to 50%.
-
-    Keyword Args:
-        cement_class (str): The cement class, defaults to 'R'. Possible values:
-            'R', 'N', 'S',
-        t0: The age of the concrete at the time (in days) of loading.
-        t: The age of the concrete at the time (in days) of evaluation (50
-            years default).
-
-    Returns:
-        float: The creep value for the load, phi(t, t0).
-
-    Raises:
-        ValueError: checks if the cement class equals R, N or S.
-    """
-    # The cement class will decide the value of alpha_cement, ds1 and ds2.
-    # The values are given in (B.9) and (B.12)
-
-    _cement_class = cement_class.upper().strip()
-    alpha_cement = ALPHA_CEMENT_DICT.get(_cement_class)
-    if alpha_cement is None:
-        raise ValueError(f'cement_class={cement_class}, expected R, N or S')
-
-    _beta_H = beta_H(h_0, f_cm, RH)
-    _phi_RH = phi_RH(h_0, f_cm, RH)
-    _beta_fcm = beta_fcm(f_cm)
-    _t0_adj = t0_adj(t0, alpha_cement)
-    beta_t0 = 1 / (0.1 + _t0_adj**0.20)  # (B.5)
-    _beta_c = beta_c(t0, t, _beta_H)
-
-    phi_0 = _phi_RH * _beta_fcm * beta_t0  # (B.2)
-    return phi_0 * _beta_c
-
-
-def beta_c(t0: float, t: float, beta_H: float) -> float:
-    """Calculates the factor beta_c.
-
-    EN 1992-1-1:2004, Eq. (B.7).
-
-    Args:
-        t0 (float): The concrete age in days a the time of loading.
-        t (float): The concrete age at the evaluated time.
-        beta_H: Parameter defined in (B.8).
-
-    Returns:
-        float: Parameter defined by Equation (B.7), beta_c.
-    """
-    return ((t - t0) / (beta_H + t - t0)) ** 0.3
-
-
-def t0_adj(t0: float, alpha_cement: float) -> float:
-    """Calculates the adjusted age of the concrete.
-
-    EN 1992-1-1:2004, Eq. (B.9).
-
-    Args:
-        t0 (float): The concrete age in days at the time of loading.
-        alpha_cement (float): Exponent derived from the sement type.
-
-    Returns:
-        float: The adjusted age of the concrete.
-    """
-    return max(t0 * (9 / (2 + t0**1.2) + 1) ** alpha_cement, 0.5)
-
-
-def beta_fcm(f_cm: float) -> float:
-    """Calculates beta_f_cm.
-
-    EN 1992-1-1:2004, Eq. (B.4).
-
-    Args:
-        f_cm (float): The mean concrete strength.
-
-    Returns:
-        float: The factor defined in Equation (B.4).
-    """
-    return 16.8 / f_cm**0.5
-
-
-def phi_RH(h_0: float, f_cm: float, RH: int) -> float:
-    """Calculates phi_RH.
-
-    EN 1992-1-1:2004, Eq. (B.3).
-
-    Args:
-        h_0 (float): The effective cross sectional thickness, Equation (B.6).
-        f_cm (float): The mean concrete strength.
-        RH (int): The relative humidity in percent.
-
-    Returns:
-        float: The calculation parameter (B.3).
-    """
-    # (B.8c) Alpha 1 to 2 is a constant where the only variable is f_cm
-    alpha_1, alpha_2 = (
-        (35 / f_cm) ** 0.7,
-        (35 / f_cm) ** 0.2,
-    )
-
-    if f_cm <= 35:
-        return 1 + (1 - RH / 100) / (0.1 * h_0 ** (1 / 3))
-    return (1 + (1 - RH / 100) / (0.1 * h_0 ** (1 / 3)) * alpha_1) * alpha_2
-
-
-def beta_H(h_0: float, f_cm: float, RH: int) -> float:
-    """Calculates beta_H.
-
-    EN 1992-1-1:2004, Eq. (B.8a and b).
-
-    Args:
-        h_0 (float): The effective cross sectional thickness, Equation (B.6).
-        f_cm (float): The mean concrete strength.
-        RH (int): The relative humidity in percent.
-
-    Returns:
-        float: The calculation parameter defined in (B.8).
-    """
-    # (B.8c) Alpha 3 is a constant where f_cm is the only  variable
-    alpha_3 = (35 / f_cm) ** 0.5
-
-    if f_cm <= 35:
-        # (B.8a) and (B.3a) applies
-        return min(1.5 * (1 + (0.012 * RH) ** 18) * h_0 + 250, 1500)
-    # (B.8b) and (B.3b) applies
-    return min(
-        1.5 * (1 + (0.012 * RH) ** 18) * h_0 + 250 * alpha_3,
-        1500 * alpha_3,
-    )
-
-
-def eps_cs(
-    h_0: float,
-    f_cm: float,
-    cement_class: t.Literal['R', 'N', 'S'] = 'R',
-    RH: int = 50,
-    t_S: int = 28,
-    t: int = 18263,
-) -> float:
-    """Calculates the shrinkage strain.
-
-    EN 1992-1-1:2004, Eq. (3.8).
-
-    Args:
-        h_0 (float): The effective cross sectional thickness, Equation (B.6).
-        f_cm (float): The mean concrete strength.
-        cement_class (str): The cement class, defaults to 'R'. Possible values:
-            'R', 'N', 'S'.
-
-    Keyword Args:
-        RH (int): The relative humidity in percent, defaults to 50.
-        t_S (int): the number of days when shrinkage begins, default: 28 days.
-        t (int): the concrete age at the time (in days) of evaluation, default:
-            50 years.
-
-    Returns:
-        float: The shrinkage. Given as absolute, not in percent or ppm.
-
-    Raises:
-        ValueError: Checks if the cement class equals R, N or S.
-    """
-    _cement_class = cement_class.upper().strip()
-    beta_ds = (t - t_S) / (t - t_S + 0.04 * h_0 ** (1 / 3))  # (3.10)
-    beta_as = 1 - math.exp(-0.2 * t**0.5)  # (3.13)
-
-    # k_h is defined in Table 3.3 under (3.9)
-    if h_0 >= 500:
-        k_h = 0.70
-    elif h_0 <= 100:
-        k_h = 1.0
-    else:
-        k_h = np.interp(h_0, [100, 200, 300, 500], [1.0, 0.85, 0.75, 0.7])
-
-    eps_ca_infinite = 2.5 * (f_cm - 18) * 1e-6  # (3.12)
-    eps_ca = beta_as * eps_ca_infinite  # (3.11)
-    eps_cd = beta_ds * k_h * eps_cd_0(_cement_class, f_cm, RH)  # (3.9)
-    return eps_cd + eps_ca  # (3.8)
-
-
-def beta_RH(RH: int, RH_0: int = 100) -> float:
-    """Calculates beta_RH.
-
-    EN 1992-1-1:2004, Eq. (B.12).
-
-    Args:
-        RH (int): The relative humidity in percent.
-
-    Keyword Args:
-        RH_0 (int): The reference relative humidity, default: 100%.
-
-    Returns:
-        float: Calculation parameter from Equation (B.12).
-    """
-    return 1.55 * (1 - (RH / RH_0) ** 3)
-
-
-def eps_cd_0(cement_class: str, f_cm: float, RH: int) -> float:
-    """Calculates eps_cd_0.
-
-    EN 1992-1-1:2004, Eq. (B.11).
-
-    Args:
-        cement_class (str): The cement class, defaults to 'R'. Possible values:
-            'R', 'N', 'S'.
-        f_cm (float): The mean concrete strength.
-        RH (int): The relative humidity in percent.
-
-    Returns:
-        float: The nominal value for shrinkage.
-
-    Raises:
-        ValueError: Checks if the cement class equals R, N or S.
-    """
-    _cement_class = cement_class.upper().strip()
-    alpha = ALPHA_DS_DICT.get(_cement_class)
-    if alpha is None:
-        raise ValueError(f'cement_class={cement_class}, expected R, N or S')
-    alpha_ds1 = alpha['alpha_ds1']
-    alpha_ds2 = alpha['alpha_ds2']
-
-    return (
-        0.85
-        * ((220 + 110 * alpha_ds1) * math.exp(-alpha_ds2 * f_cm / 10))
-        * 1e-6
-        * beta_RH(RH)
-    )  # (B.11)