Update other concrete geometry generation functions to include updated behaviour for calculating bar area

Author: connorferster

sectionproperties/pre/library/concrete_sections.py

@@ -92,39 +92,30 @@ def concrete_rectangular_section(
     x_i_bot = cover + dia_bot / 2
     spacing_top = (b - 2 * cover - dia_top) / (n_top - 1)
     spacing_bot = (b - 2 * cover - dia_bot) / (n_bot - 1)
+    
+    if area_top is None:
+        area_top = np.pi * dia_top**2 / 4
+    if area_bottom is None:
+        area_bottom = np.pi * dia_bot**2 / 4
 
     # add top bars
     for i in range(n_top):
-        if area_top:
-            bar = primitive_sections.circular_section_by_area(
-                area=area_top, n=n_circle, material=steel_mat
-            )
-        else:
-            bar = primitive_sections.circular_section(
-                d=dia_top, n=n_circle, material=steel_mat
-            )
-
+        bar = primitive_sections.circular_section_by_area(
+            area=area_top, n=n_circle, material=steel_mat
+        )
         bar = bar.shift_section(
             x_offset=x_i_top + spacing_top * i, y_offset=d - cover - dia_top / 2
         )
-
         geom = (geom - bar) + bar
 
     # add bot bars
     for i in range(n_bot):
-        if area_bot:
-            bar = primitive_sections.circular_section_by_area(
-                area=area_bot, n=n_circle, material=steel_mat
-            )
-        else:
-            bar = primitive_sections.circular_section(
-                d=dia_bot, n=n_circle, material=steel_mat
-            )
-
+        bar = primitive_sections.circular_section_by_area(
+            area=area_bot, n=n_circle, material=steel_mat
+        )
         bar = bar.shift_section(
             x_offset=x_i_bot + spacing_bot * i, y_offset=cover + dia_bot / 2
         )
-
         geom = (geom - bar) + bar
 
     return geom
@@ -346,16 +337,16 @@ def concrete_tee_section(
     spacing_top = (b_f - 2 * cover - dia_top) / (n_top - 1)
     spacing_bot = (b - 2 * cover - dia_bot) / (n_bot - 1)
 
+    if area_top is None:
+        area_top = np.pi * dia_top**2 / 4
+    if area_bot is None:
+        area_bot = np.pi * dia_bot**2 / 4
+
     # add top bars
     for i in range(n_top):
-        if area_top:
-            bar = primitive_sections.circular_section_by_area(
-                area=area_top, n=n_circle, material=steel_mat
-            )
-        else:
-            bar = primitive_sections.circular_section(
-                d=dia_top, n=n_circle, material=steel_mat
-            )
+        bar = primitive_sections.circular_section_by_area(
+            area=area_top, n=n_circle, material=steel_mat
+        )
 
         bar = bar.shift_section(
             x_offset=x_i_top + spacing_top * i, y_offset=d - cover - dia_top / 2
@@ -365,14 +356,9 @@ def concrete_tee_section(
 
     # add bot bars
     for i in range(n_bot):
-        if area_bot:
-            bar = primitive_sections.circular_section_by_area(
-                area=area_bot, n=n_circle, material=steel_mat
-            )
-        else:
-            bar = primitive_sections.circular_section(
-                d=dia_bot, n=n_circle, material=steel_mat
-            )
+        bar = primitive_sections.circular_section(
+            d=dia_bot, n=n_circle, material=steel_mat
+        )
 
         bar = bar.shift_section(
             x_offset=x_i_bot + spacing_bot * i, y_offset=cover + dia_bot / 2
@@ -465,20 +451,15 @@ def concrete_circular_section(
     r = d / 2 - cover - dia / 2
     d_theta = 2 * np.pi / n_bar
 
+    if area_bar is None:
+        area_bar = np.pi * dia**2 / 4
     for i in range(n_bar):
-        if area_bar:
-            bar = primitive_sections.circular_section_by_area(
-                area=area_bar, n=n_circle, material=steel_mat
-            )
-        else:
-            bar = primitive_sections.circular_section(
-                d=dia, n=n_circle, material=steel_mat
-            )
-
+        bar = primitive_sections.circular_section_by_area(
+            area=area_bar, n=n_circle, material=steel_mat
+        )
         bar = bar.shift_section(
             x_offset=r * np.cos(i * d_theta), y_offset=r * np.sin(i * d_theta)
         )
-
         geom = (geom - bar) + bar
 
     return geom