Merge pull request #73 from robbievanleeuwen/prestress

Add prestressed concrete sections

Author: robbievanleeuwen

README.md

@@ -36,6 +36,12 @@ through submitting bug reports, feature requests or pull requests. Please read t
 
 ## Current Capabilities
 
+### Analysis Types
+
+- [x] Reinforced Concrete
+- [x] Steel-Concrete Composite
+- [x] Prestressed Concrete
+
 ### Material Properties
 
 - [x] Concrete material
@@ -53,10 +59,14 @@ through submitting bug reports, feature requests or pull requests. Please read t
   - [x] Stress-strain profiles
     - [x] Elastic-plastic
     - [x] Elastic-plastic (with hardening)
+- [x] Strand material
+  - [x] Stress-strain profiles
+    - [x] Elastic-plastic (with hardening)
+    - [x] PCI journal (1992) non-linear
 
 ### Gross Section Properties
 
-- [x] Cross-sectional areas (total, concrete, steel)
+- [x] Cross-sectional areas (total, concrete, steel, strand)
 - [x] Axial rigidity
 - [x] Cross-section mass
 - [x] Cross-section perimeter
@@ -68,11 +78,12 @@ through submitting bug reports, feature requests or pull requests. Please read t
 - [x] Principal second moments of area
 - [x] Centroidal section moduli
 - [x] Principal section moduli
+- [x] Prestressed Aations
 
 ### Service Analysis
 
 - [x] Cracking moment
-- [x] Cracked second moment of area
+- [x] Cracked area properties
 - [x] Moment-curvature diagram
 
 ### Ultimate Analysis

concreteproperties/analysis_section.py

@@ -172,15 +172,16 @@ def get_elastic_stress(
 
     def service_analysis(
         self,
-        point_na: Tuple[float, float],
+        ecf: Tuple[float, float],
+        eps0: float,
         theta: float,
         kappa: float,
         centroid: Tuple[float, float],
     ) -> Tuple[float, float, float, float, float]:
         r"""Performs a service stress analysis on the section.
 
-        :param point_na: Point on the neutral axis
-        :param d_n: Depth of the neutral axis from the extreme compression fibre
+        :param ecf: Global coordinate of the extreme compressive fibre
+        :param eps0: Strain at top fibre
         :param theta: Angle (in radians) the neutral axis makes with the
             horizontal axis (:math:`-\pi \leq \theta \leq \pi`)
         :param kappa: Curvature
@@ -204,7 +205,8 @@ def service_analysis(
                 el_min_strain,
                 el_max_strain,
             ) = el.calculate_service_actions(
-                point_na=point_na,
+                ecf=ecf,
+                eps0=eps0,
                 theta=theta,
                 kappa=kappa,
                 centroid=centroid,
@@ -220,18 +222,18 @@ def service_analysis(
 
     def get_service_stress(
         self,
-        d_n: float,
         kappa: float,
-        point_na: Tuple[float, float],
+        ecf: Tuple[float, float],
+        eps0: float,
         theta: float,
         centroid: Tuple[float, float],
     ) -> Tuple[np.ndarray, float, float, float]:
         r"""Given the neutral axis depth `d_n` and curvature `kappa` determines the
         service stresses within the section.
 
-        :param d_n: Neutral axis depth
         :param kappa: Curvature
-        :param point_na: Point on the neutral axis
+        :param ecf: Global coordinate of the extreme compressive fibre
+        :param eps0: Strain at top fibre
         :param theta: Angle (in radians) the neutral axis makes with the
             horizontal axis (:math:`-\pi \leq \theta \leq \pi`)
         :param centroid: Centroid about which to take moments
@@ -248,7 +250,8 @@ def get_service_stress(
             # get strain at node
             strain = utils.get_service_strain(
                 point=(node[0], node[1]),
-                point_na=point_na,
+                ecf=ecf,
+                eps0=eps0,
                 theta=theta,
                 kappa=kappa,
             )
@@ -258,7 +261,8 @@ def get_service_stress(
 
         # calculate total force
         n_sec, m_x_sec, m_y_sec, _, _ = self.service_analysis(
-            point_na=point_na,
+            ecf=ecf,
+            eps0=eps0,
             theta=theta,
             kappa=kappa,
             centroid=centroid,
@@ -607,14 +611,16 @@ def calculate_elastic_actions(
 
     def calculate_service_actions(
         self,
-        point_na: Tuple[float, float],
+        ecf: Tuple[float, float],
+        eps0: float,
         theta: float,
         kappa: float,
         centroid: Tuple[float, float],
     ) -> Tuple[float, float, float, float, float]:
         r"""Calculates service actions for the current finite element.
 
-        :param point_na: Point on the neutral axis
+        :param ecf: Global coordinate of the extreme compressive fibre
+        :param eps0: Strain at top fibre
         :param theta: Angle (in radians) the neutral axis makes with the
             horizontal axis (:math:`-\pi \leq \theta \leq \pi`)
         :param kappa: Curvature
@@ -645,7 +651,8 @@ def calculate_service_actions(
             # get strain at gauss point
             strain = utils.get_service_strain(
                 point=(x, y),
-                point_na=point_na,
+                ecf=ecf,
+                eps0=eps0,
                 theta=theta,
                 kappa=kappa,
             )