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

structuralcodes/__init__.py

@@ -3,7 +3,7 @@
 from . import codes, core, geometry, materials, sections
 from .codes import get_design_codes, set_design_code, set_national_annex
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 __all__ = [
     'set_design_code',

structuralcodes/codes/ec2_2004/annex_b_shrink_and_creep.py

@@ -191,7 +191,7 @@ def eps_cs(
         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_ds = (t - t_S) / (t - t_S + 0.04 * h_0 ** (3 / 2))  # (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)

structuralcodes/codes/ec2_2004/shear.py

@@ -1,6 +1,7 @@
 """Design rules according to EN 1992-1-1 regarding shear."""
 
 import math
+import typing as t
 
 # General functions
 
@@ -171,6 +172,7 @@ def VRdc(
     fcd: float,
     k1: float = 0.15,
     gamma_c: float = 1.5,
+    CRdc: t.Optional[float] = None,
 ) -> float:
     """Compute the design strength of the shear resistance.
 
@@ -194,11 +196,13 @@ def VRdc(
             value might differ between National Annexes.
         gamma_c (float): Partial factor for concrete. Default value = 1.5,
             value might differ between National Annexes.
+        CRdc (Optional[float]): Scaling factor for the shear resistance.
+            Default value is 0.18 / gamma_c.
 
     Returns:
         float: The concrete shear resistance in MPa.
     """
-    CRdc = 0.18 / gamma_c
+    CRdc = CRdc or 0.18 / gamma_c
     return (
         max(
             CRdc * _k(d) * (100 * _rho_L(Asl, bw, d) * fck) ** (1.0 / 3.0)

structuralcodes/codes/mc2010/_concrete_creep_and_shrinkage.py

@@ -291,7 +291,9 @@ def beta_ds(
         numpy.ndarray: Multiplication factor used for calculating the drying
         shrinkage as a function of time.
     """
-    return np.sqrt((time - ts) / (0.035 * (notional_size) ** 2 + (time - ts)))
+    time_drying = np.atleast_1d(time - ts)
+    time_drying[time_drying < 0.0] = 0.0
+    return np.sqrt(time_drying / (0.035 * (notional_size) ** 2 + time_drying))
 
 
 def beta_s1(fcm: float) -> float:

structuralcodes/geometry/_reinforcement.py

@@ -18,6 +18,7 @@ def add_reinforcement(
     coords: t.Tuple[float, float],
     diameter: float,
     material: t.Union[Material, ConstitutiveLaw],
+    group_label: t.Optional[str] = None,
 ) -> CompoundGeometry:
     """Add a single bar given coordinate.
 
@@ -28,12 +29,16 @@ def add_reinforcement(
         diameter (float): The diameter of the reinforcement.
         material (Union(Material, ConstitutiveLaw)): A material or a
             constitutive law for the behavior of the reinforcement.
+        group_label (Optional(str)): A label for grouping several objects
+            (default is None).
 
     Returns:
         CompoundGeometry: A compound geometry with the original geometry and
         the reinforcement.
     """
-    bar = PointGeometry(Point(coords), diameter, material)
+    bar = PointGeometry(
+        Point(coords), diameter, material, group_label=group_label
+    )
     return geo + bar
 
 
@@ -47,6 +52,7 @@ def add_reinforcement_line(
     s: float = 0.0,
     first: bool = True,
     last: bool = True,
+    group_label: t.Optional[str] = None,
 ) -> CompoundGeometry:
     """Adds a set of bars distributed in a line.
 
@@ -66,6 +72,8 @@ def add_reinforcement_line(
             True).
         last (bool): Boolean indicating if placing the last bar (default =
             True).
+        group_label (Optional(str)): A label for grouping several objects
+            (default is None).
 
     Note:
         At least n or s should be greater than zero.
@@ -110,6 +118,10 @@ def add_reinforcement_line(
             continue
         coords = p1 + v * s * i
         geo = add_reinforcement(
-            geo, (coords[0], coords[1]), diameter, material
+            geo,
+            (coords[0], coords[1]),
+            diameter,
+            material,
+            group_label=group_label,
         )
     return geo

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
@@ -208,7 +208,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 +580,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 +647,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 +784,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 +1124,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-0.1.0.dist-info → structuralcodes-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: structuralcodes
-Version: 0.1.0
+Version: 0.1.1
 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.1.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
-structuralcodes/__init__.py,sha256=opNmFZxtV5QKx38kj-eHuoZX-JPLuLojIGDH7au31WE,390
+structuralcodes/__init__.py,sha256=4WhcwbLVv6pNyZiQjaNHUXYs0YzQTVU0kkM9EMA9ZyE,390
 structuralcodes/codes/__init__.py,sha256=g5xMAJ3jEZHFd0cypvZY6lMCi7XeVEntsO8zHzI2mWc,2803
 structuralcodes/codes/ec2_2004/__init__.py,sha256=_PdL9kX7qlfn9VBfqUCJQy6V9fWmIyugzIiSZczjNAA,1986
 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/annex_b_shrink_and_creep.py,sha256=kaMXZ_Ufp-k1wYQDXB27Tt2BUmi_lGYYuNzQxGtC6SQ,7348
+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
@@ -24,7 +24,7 @@ structuralcodes/core/_section_results.py,sha256=hHXoS71TpSmWqw276pBeLiLrEEiMEWcl
 structuralcodes/core/base.py,sha256=TqgsXzIXITQmER3tKNjzjPrbSN5uT_PqCpG3PVMd3Yw,8562
 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/_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
@@ -39,13 +39,13 @@ structuralcodes/materials/reinforcement/_reinforcementEC2_2004.py,sha256=svLpubj
 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=jpubO8wBsVWJajpOkUYzBpunf4ltse8rmiNFyiwDuoI,49968
 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/_marin_integration.py,sha256=SZgya6d_Tequ3jez7UEBlYioZepW2IDKaAxn_6WrMbU,1563
 structuralcodes/sections/section_integrators/_marin_integrator.py,sha256=rtEtd1X0QYAWNcaH7Pjd_b6LEzVjHqD_fbIrX64p7fg,9121
 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.1.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+structuralcodes-0.1.1.dist-info/METADATA,sha256=CDs31oS5sYYBt1hk-gRLTGPJtfa6SiM1H5QP3IlGecI,2444
+structuralcodes-0.1.1.dist-info/RECORD,,