structuralcodes 0.3.0__tar.gz → 0.4.0__tar.gz

structuralcodes-0.4.0/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2023 fib - Fédération Internationale du Béton
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

{structuralcodes-0.3.0 → structuralcodes-0.4.0}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: structuralcodes
-Version: 0.3.0
+Version: 0.4.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
 Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
+License-File: LICENSE
 Requires-Dist: numpy>=1.20.0
 Requires-Dist: scipy>=1.6.0
 Requires-Dist: shapely>=2.0.2

{structuralcodes-0.3.0 → structuralcodes-0.4.0}/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.3.0'
+__version__ = '0.4.0'
 
 __all__ = [
     'set_design_code',

{structuralcodes-0.3.0 → structuralcodes-0.4.0}/structuralcodes/codes/mc2010/__init__.py

@@ -81,6 +81,18 @@ from ._concrete_shear import (
     v_rds,
 )
 from ._concrete_torsion import t_rd, t_rd_max, v_ed_ti
+from ._interface_concrete_steel_rebar import (
+    K_tr,
+    eta_2,
+    f_stm,
+    s_1,
+    s_2,
+    s_3,
+    s_tau_bu_split,
+    tau_bmax,
+    tau_bu_split,
+    tau_yield,
+)
 from ._reinforcement_material_properties import (
     epsud,
     fyd,
@@ -162,6 +174,16 @@ __all__ = [
     'tau_edi',
     'tau_rdi_with_reinforcement',
     'tau_rdi_without_reinforcement',
+    'eta_2',
+    'tau_bu_split',
+    'K_tr',
+    'tau_bmax',
+    's_1',
+    's_2',
+    's_3',
+    's_tau_bu_split',
+    'f_stm',
+    'tau_yield',
 ]
 
 __title__: str = 'fib Model Code 2010'

structuralcodes-0.4.0/structuralcodes/codes/mc2010/_interface_concrete_steel_rebar.py

@@ -0,0 +1,348 @@
+"""Provides functions to determine parameters of the bond stress-slip
+relations as shown in Figure 6.1-1 of the fib
+ModelCode 2010.
+
+- Eq. 6.1-5.
+- Eq. 6.1-6.
+- Table 6.1-1 s_1, s_2 and s_3
+- Solve s for Eq. 6.1-1 with substitution of tau_bu_split for tau_b.
+- Eq. 6.1-19.
+"""
+
+import typing as t
+import warnings
+
+
+def _validate_bond_value(bond: t.Optional[str] = None) -> str:
+    """Validate the value provided for 'bond'."""
+    valid_bond_values = ('good', 'other')
+    if (
+        bond is not None
+        and isinstance(bond, str)
+        and bond.lower() in valid_bond_values
+    ):
+        return bond.lower()
+    raise ValueError("Invalid bond condition. Must be 'good' or 'other'.")
+
+
+def _validate_confinement_value(confinement: t.Optional[str] = None) -> str:
+    """Validate the value provided for 'confinement'."""
+    valid_confinement_values = ('unconfined', 'stirrups')
+    if (
+        confinement is not None
+        and isinstance(confinement, str)
+        and confinement.lower() in valid_confinement_values
+    ):
+        return confinement.lower()
+    raise ValueError(
+        "Invalid confinement value. Must be 'unconfined' or 'stirrups'."
+    )
+
+
+def _validate_failmod_value(failmod: t.Optional[str] = None) -> str:
+    """Validate the value provided for 'failmod'."""
+    valid_failmod_values = ['po', 'sp']
+    if (
+        failmod is not None
+        and isinstance(failmod, str)
+        and failmod.lower() in valid_failmod_values
+    ):
+        return failmod.lower()
+    raise ValueError("Invalid failmod value. Must be 'PO' or 'SP'.")
+
+
+def eta_2(bond: t.Literal['good', 'other']) -> float:
+    """Bond coefficient eta_2.
+
+    fib Model Code 2010, Eq. (6.1-5).
+
+    Args:
+        bond (str): Bond condition according to Subsection 6.1.3.2. Input must
+            be 'good' or 'other'.
+
+    Returns:
+        float: eta_2 value.
+
+    Raises:
+        ValueError: If a proper value for 'bond' is not input.
+    """
+    eta_2 = {'good': 1.0, 'other': 0.7}
+
+    return eta_2[_validate_bond_value(bond=bond)]
+
+
+def tau_bu_split(
+    eta_2: float,
+    f_cm: float,
+    phi: float,
+    c_min: float,
+    c_max: float,
+    k_m: float,
+    K_tr: float,
+) -> float:
+    """Maximum bond stress in case of splitting failure.
+
+    fib Model Code 2010, Eq. (6.1-5).
+
+    Args:
+        eta_2 (float): Parameter based on bond condition. 1.0 for 'good' bond
+            condition and 0.7 for 'other' conditions.
+        f_cm (float): Mean cylinder concrete compressive strength in MPa.
+        phi (float): Nominal bar diameter in mm.
+        c_min (float): Parameter according to MC2010 Figure 6.1-2.
+        c_max (float): Parameter according to MC2010 Figure 6.1-2.
+        k_m (float): Parameter according to MC2010 Figure 6.1-3.
+        K_tr (float): To be calculated with MC2010 Eq.(6.1-6).
+
+    Returns:
+        float: tau_bu_split in MPa.
+    """
+    return (
+        eta_2
+        * 6.5
+        * (f_cm / 25) ** 0.25
+        * (25 / phi) ** 0.2
+        * ((c_min / phi) ** 0.33 * (c_max / c_min) ** 0.1 + k_m * K_tr)
+    )
+
+
+def K_tr(
+    n_t: float,
+    A_st: float,
+    n_b: float,
+    phi: float,
+    s_t: float,
+) -> float:
+    """Coefficient accounting for transverse stresses, K_tr.
+
+    fib Model Code 2010, Eq. (6.1-6).
+
+    Args:
+        n_t (float): Number of legs of confining reinforcement crossing a
+            potential splitting failure surface at a section.
+        A_st (float): Cross-sectional area of one leg of a confining bar in
+            mm^2.
+        n_b (float): Number of anchored bars or pairs of lapped bars in
+            potential splitting surface.
+        phi (float): Nominal bar diameter in mm.
+        s_t (float): Longitudnal spacing of confining reinforcement in mm.
+
+    Returns:
+        float: K_tr as value.
+    """
+    return min((n_t * A_st / (n_b * phi * s_t)), 0.05)
+
+
+def tau_bmax(bond: t.Literal['good', 'other'], f_cm: float) -> float:
+    """Maximum bond stress tau_bmax.
+
+    fib Model Code 2010, Table 6.1-1.
+
+    Args:
+        bond (str): Bond condition according to Subsection 6.1.3.2. Must be
+            'good' or 'other'.
+        f_cm (float): Mean cylinder concrete compressive strength in MPa.
+
+    Returns:
+        float: tau_bmax in MPa.
+
+    Raises:
+        ValueError: If a proper value for 'bond' is not input.
+    """
+    tau_bmax = {'good': 2.5 * f_cm**0.5, 'other': 1.25 * f_cm**0.5}
+
+    return tau_bmax[_validate_bond_value(bond)]
+
+
+def s_1(bond: t.Literal['good', 'other']) -> float:
+    """Slip at maximum bond stress, s_1.
+
+    fib Model Code 2010, Table 6.1-1.
+
+    Args:
+        bond (str): Bond condition according to Subsection 6.1.3.2. Must be
+            'good' or 'other'.
+
+    Returns:
+        float: s_1 in mm.
+
+    Raises:
+        ValueError: If a proper value for 'bond' is not input.
+    """
+    s_1_values = {'good': 1.0, 'other': 1.8}
+
+    return s_1_values[_validate_bond_value(bond)]
+
+
+def s_2(bond: t.Literal['good', 'other']) -> float:
+    """s_2 according to Table 6.1-1.
+
+    Args:
+        bond (str): Bond condition according to Subsection 6.1.3.2. Must be
+            'good' or 'other'.
+
+    Returns:
+        float: s_2 in mm.
+
+    Raises:
+        ValueError: If a proper value for 'bond' is not input.
+    """
+    s_2_values = {'good': 2.0, 'other': 3.6}
+
+    return s_2_values[_validate_bond_value(bond)]
+
+
+def s_3(
+    failmod: t.Literal['PO', 'SP'],
+    bond: t.Literal['good', 'other'],
+    confinement: t.Literal['unconfined', 'stirrups'],
+    c_clear: float,
+    s_1: float,
+) -> float:
+    """s_3 according to Table 6.1-1.
+
+    Args:
+        failmod (str): Failure mode. Must be "PO" for Pull-out of "SP" for
+            Splitting.
+        bond (str): Bond condition according to Subsection 6.1.3.2. Must be
+            'Good' or 'Other'.
+        confinement (str): Confinement conditions. Must be "Unconfined" or
+            "Stirrups"
+        c_clear (float): Clear distance between ribs in mm.
+        s_1 (float): s_1 according to Table 6.1-1 columns 1 and 2 for Pull-out
+            failure.
+
+    Returns:
+        float: s_3 in mm.
+
+    Raises:
+        ValueError: If a proper value for 'failmod' is not input.
+        ValueError: If a proper value for 'bond' is not input.
+        ValueError: If a proper value for 'confinement' is not input.
+    """
+    s_3_values = {
+        'po': {
+            'good': c_clear,
+            'other': c_clear,
+        },
+        'sp': {
+            'good': {'unconfined': 1.2 * s_1, 'stirrups': 0.5 * c_clear},
+            'other': {'unconfined': 1.2 * s_1, 'stirrups': 0.5 * c_clear},
+        },
+    }
+
+    if _validate_failmod_value(failmod) == 'po':
+        return s_3_values[_validate_failmod_value(failmod)][
+            _validate_bond_value(bond)
+        ]
+    if _validate_failmod_value(failmod) == 'sp':
+        return s_3_values[_validate_failmod_value(failmod)][
+            _validate_bond_value(bond)
+        ][_validate_confinement_value(confinement)]
+    return 0.0
+
+
+def s_tau_bu_split(
+    tau_bmax: float,
+    tau_bu_split: float,
+    alpha: float,
+    s_1: float,
+) -> float:
+    """Calculates the slip at tau_bu_split by rewriting Eq. 6.1-1 to solve for
+    s and substituting tau_bu_split for tau_b.
+
+    Args:
+        tau_bmax (float): Maximum bond stress according to Table 6.1-1.
+        tau_bu_split (float): Concrete bond stress at splitting failure.
+        alpha (float): Parameter in Eq. 6.1-1. Alpha is 0.4 in Table 6.1-1.
+        s_1 (float): s_1 according to Table 6.1-1.
+
+    Returns:
+        float: Slip at tau_bu_split in mm.
+    """
+    return (tau_bu_split / tau_bmax) ** (1 / alpha) * s_1
+
+
+def f_stm(
+    f_cm: float,
+    phi: float,
+    l_b: float,
+    c_min: float,
+    c_max: float,
+    k_m: float,
+    K_tr: float,
+) -> float:
+    """Reinforcement stress, f_stm.
+
+    fib Model Code 2010, Eq. (6.1-19).
+
+    Args:
+        f_cm (float): Mean cylinder concrete compressive strength in MPa.
+        phi (float): Nominal bar diameter in mm.
+        l_b (float): Bond length in mm.
+        c_min (float): Parameter shown in Figure 6.1-2.
+        c_max (float): Parameter shown in Figure 6.1-2.
+        k_m (float): Parameter shown in Figure 6.1-3.
+        K_tr (float): Parameter calculated with Eq.(6.1-6).
+
+    Returns:
+        float: f_stm in MPa.
+
+    Raises:
+        UserWarning: If not 15 MPa < f_cm < 110 MPa.
+        UserWarning: If not 0.5 < c_min / phi < 3.5.
+        UserWarning: If not 1.0 < c_max / c_min < 5.0.
+        UserWarning: If not K_tr <= 0.05.
+    """
+    if not 15 < f_cm < 110:
+        warnings.warn(
+            'Warning: Eq.(6.1-19) is valid for 15 MPa < f_cm < 110 MPa.',
+            UserWarning,
+        )
+    if not 0.5 < c_min / phi < 3.5:
+        warnings.warn(
+            'Warning: Eq.(6.1-19) is valid for 0.5 < c_min / phi < 3.5.',
+            UserWarning,
+        )
+    if not 1.0 < c_max / c_min < 5.0:
+        warnings.warn(
+            'Warning: Eq.(6.1-19) is valid for 1.0 < c_max / c_min < 5.0',
+            UserWarning,
+        )
+    if not K_tr <= 0.05:
+        warnings.warn(
+            'Warning: Eq.(6.1-19) is valid for K_tr <= 0.05.',
+            UserWarning,
+        )
+
+    return (
+        54
+        * (f_cm / 25) ** 0.25
+        * (25 / phi) ** 0.2
+        * (l_b / phi) ** 0.55
+        * ((c_min / phi) ** 0.25 * (c_max / c_min) ** 0.1 + k_m * K_tr)
+    )
+
+
+def tau_yield(
+    f_y: float,
+    l_b: float,
+    phi: float,
+) -> float:
+    """Calculates the bond stress at yield of the reinforcement bar based
+    on a uniform bond stress over l_b.
+
+    The bond stress at yield is a limit for:
+    - tau_bmax, given with eps_s < eps_s,y in Table 6.1-1.
+    - tau_bu_split, explicitly stated for Eq. 6.1-19.
+
+    Args:
+        f_y (float): Reinforcement bar yield stress in MPa.
+        l_b (float): Bond length with uniform bond stress assumed in mm.
+        phi (float): Nominal bar diameter in mm.
+
+    Returns:
+        float: Bond stress at yield of rebar in MPa.
+
+    """
+    return f_y / (4 * l_b / phi)

{structuralcodes-0.3.0 → structuralcodes-0.4.0}/structuralcodes/core/base.py

@@ -4,7 +4,6 @@ from __future__ import annotations  # To have clean hints of ArrayLike in docs
 
 import abc
 import typing as t
-import warnings
 
 import numpy as np
 from numpy.typing import ArrayLike
@@ -29,26 +28,6 @@ class Material(abc.ABC):
         self._density = abs(density)
         self._name = name if name is not None else 'Material'
 
-    def update_attributes(self, updated_attributes: t.Dict) -> None:
-        """Function for updating the attributes specified in the input
-        dictionary.
-
-        Args:
-            updated_attributes (dict): the dictionary of parameters to be
-                updated (not found parameters are skipped with a warning)
-        """
-        for key, value in updated_attributes.items():
-            if not hasattr(self, '_' + key):
-                str_list_keys = ', '.join(updated_attributes.keys())
-                str_warn = (
-                    f"WARNING: attribute '{key}' not found."
-                    " Ignoring the entry.\n"
-                    f"Used keys in the call: {str_list_keys}"
-                )
-                warnings.warn(str_warn)
-                continue
-            setattr(self, '_' + key, value)
-
     @property
     def constitutive_law(self):
         """Returns the ConstitutiveLaw of the object."""