structuralcodes 0.3.0__tar.gz → 0.3.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structuralcodes
-Version: 0.3.0
+Version: 0.3.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.3.0 → structuralcodes-0.3.1}/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.3.1'
 
 __all__ = [
     'set_design_code',

{structuralcodes-0.3.0 → structuralcodes-0.3.1}/structuralcodes/geometry/_circular.py

@@ -9,6 +9,7 @@ input by the user.
 import typing as t
 
 import numpy as np
+from numpy.typing import ArrayLike
 from shapely import Polygon
 
 from structuralcodes.core.base import ConstitutiveLaw, Material
@@ -16,11 +17,12 @@ from structuralcodes.core.base import ConstitutiveLaw, Material
 from ._geometry import SurfaceGeometry
 
 
-def _create_circle(radius, npoints=20):
+def _create_circle(radius, npoints=20, origin: t.Optional[ArrayLike] = None):
     """Create a circle with a given radius."""
+    origin = origin if origin is not None else (0.0, 0.0)
     phi = np.linspace(0, 2 * np.pi, npoints + 1)
-    x = radius * np.cos(phi)
-    y = radius * np.sin(phi)
+    x = radius * np.cos(phi) + origin[0]
+    y = radius * np.sin(phi) + origin[1]
     points = np.transpose(np.array([x, y]))
     return Polygon(points)
 
@@ -39,6 +41,9 @@ class CircularGeometry(SurfaceGeometry):
         n_points: int = 20,
         density: t.Optional[float] = None,
         concrete: bool = False,
+        origin: t.Optional[ArrayLike] = None,
+        name: t.Optional[str] = None,
+        group_label: t.Optional[str] = None,
     ) -> None:
         """Initialize a CircularGeometry.
 
@@ -53,6 +58,10 @@ class CircularGeometry(SurfaceGeometry):
                 material is a Material object the density is taken from the
                 material.
             concrete (bool): Flag to indicate if the geometry is concrete.
+            origin (Optional(ArrayLike)): The center point of the circle.
+                (0.0, 0.0) is used as default.
+            name (Optional(str)): The name to be given to the object.
+            group_label (Optional(str)): A label for grouping several objects.
 
         Note:
             The CircularGeometry is simply a wrapper for a SurfaceGeometry
@@ -63,11 +72,22 @@ class CircularGeometry(SurfaceGeometry):
             raise ValueError('Diameter must be a positive number.')
         # Manage size as radius or diameter (default)
         self._radius = diameter / 2.0
+        # Parse origin
+        if origin is not None and len(origin) != 2:
+            raise ValueError('origin must be an ArrayLike with len == 2')
+        origin = origin if origin is not None else (0.0, 0.0)
         # Create the shapely polygon
-        polygon = _create_circle(radius=self._radius, npoints=n_points)
+        polygon = _create_circle(
+            radius=self._radius, npoints=n_points, origin=origin
+        )
         # Pass everything to the base class
         super().__init__(
-            poly=polygon, material=material, density=density, concrete=concrete
+            poly=polygon,
+            material=material,
+            density=density,
+            concrete=concrete,
+            name=name,
+            group_label=group_label,
         )
 
     @property

{structuralcodes-0.3.0 → structuralcodes-0.3.1}/structuralcodes/geometry/_geometry.py

@@ -323,7 +323,7 @@ def create_line_point_angle(
     return LineString([(x1, y1), (x2, y2)])
 
 
-class SurfaceGeometry:
+class SurfaceGeometry(Geometry):
     """Class for a surface geometry with material.
 
     Basically it is a wrapper for shapely polygon including the material (and
@@ -339,6 +339,8 @@ class SurfaceGeometry:
         material: t.Union[Material, ConstitutiveLaw],
         density: t.Optional[float] = None,
         concrete: bool = False,
+        name: t.Optional[str] = None,
+        group_label: t.Optional[str] = None,
     ) -> None:
         """Initializes a SurfaceGeometry object.
 
@@ -350,7 +352,10 @@ class SurfaceGeometry:
                 the density can be provided by this argument. When mat is a
                 Material object the density is taken from the material.
             concrete (bool): Flag to indicate if the geometry is concrete.
+            name (Optional(str)): The name to be given to the object.
+            group_label (Optional(str)): A label for grouping several objects.
         """
+        super().__init__(name=name, group_label=group_label)
         # Check if inputs are of the correct type, otherwise return error
         if not isinstance(poly, Polygon):
             raise TypeError(

{structuralcodes-0.3.0 → structuralcodes-0.3.1}/structuralcodes/geometry/_rectangular.py

@@ -8,6 +8,7 @@ input by the user.
 
 import typing as t
 
+from numpy.typing import ArrayLike
 from shapely import Polygon
 
 from structuralcodes.core.base import ConstitutiveLaw, Material
@@ -30,6 +31,9 @@ class RectangularGeometry(SurfaceGeometry):
         material: t.Union[Material, ConstitutiveLaw],
         density: t.Optional[float] = None,
         concrete: bool = False,
+        origin: t.Optional[ArrayLike] = None,
+        name: t.Optional[str] = None,
+        group_label: t.Optional[str] = None,
     ) -> None:
         """Initialize a RectangularGeometry.
 
@@ -44,6 +48,10 @@ class RectangularGeometry(SurfaceGeometry):
                 material.
             concrete (bool): Flag to indicate if the geometry is concrete. When
                 passing a Material as material, this is automatically inferred.
+            origin (Optional(ArrayLike)): The center point of the rectangle.
+                (0.0, 0.0) is used as default.
+            name (Optional(str)): The name to be given to the object.
+            group_label (Optional(str)): A label for grouping several objects.
 
         Note:
             The RectangularGeometry is simply a wrapper for a SurfaceGeometry
@@ -58,18 +66,28 @@ class RectangularGeometry(SurfaceGeometry):
         self._width = width
         self._height = height
 
+        # Parse origin
+        if origin is not None and len(origin) != 2:
+            raise ValueError('origin must be an ArrayLike with len == 2')
+        origin = origin if origin is not None else (0.0, 0.0)
+
         # Create the shapely polygon
         polygon = Polygon(
             (
-                (-width / 2, -height / 2),
-                (width / 2, -height / 2),
-                (width / 2, height / 2),
-                (-width / 2, height / 2),
+                (-width / 2 + origin[0], -height / 2 + origin[1]),
+                (width / 2 + origin[0], -height / 2 + origin[1]),
+                (width / 2 + origin[0], height / 2 + origin[1]),
+                (-width / 2 + origin[0], height / 2 + origin[1]),
             )
         )
         # Pass everything to the base class
         super().__init__(
-            poly=polygon, material=material, density=density, concrete=concrete
+            poly=polygon,
+            material=material,
+            density=density,
+            concrete=concrete,
+            name=name,
+            group_label=group_label,
         )
 
     @property

{structuralcodes-0.3.0 → structuralcodes-0.3.1}/structuralcodes/materials/constitutive_laws/_bilinearcompression.py

@@ -51,10 +51,10 @@ class BilinearCompression(ConstitutiveLaw):
         # Compute stress
         # If it is a scalar
         if np.isscalar(eps):
-            sig = 0
-            if self._fc / self._E <= eps <= 0:
-                sig = self._E * eps
-            return sig
+            if eps > 0 or eps < self._eps_cu:
+                return 0
+            return max(self._E * eps, self._fc)
+
         # If it is an array
         sig = self._E * eps
         sig[sig < self._fc] = self._fc
@@ -69,13 +69,14 @@ class BilinearCompression(ConstitutiveLaw):
         eps = eps if np.isscalar(eps) else np.atleast_1d(eps)
         # If it is a scalar
         if np.isscalar(eps):
-            tangent = 0
-            if self._fc / self._E <= eps <= 0:
-                tangent = self._E
-            return tangent
+            if self._eps_c < eps <= 0:
+                return self._E
+            return 0
+
         # If it is an array
         tangent = np.ones_like(eps) * self._E
-        tangent[eps < self._eps_c] = 0.0
+        tangent[eps >= 0] = 0
+        tangent[eps < self._eps_c] = 0
 
         return tangent