Blackify

Author: connorferster

sectionproperties/pre/library/concrete_sections.py

@@ -131,8 +131,8 @@ def concrete_rectangular_section(
 
 
 def concrete_column_section(
-    b: float, 
-    d: float, 
+    b: float,
+    d: float,
     dia_bar: float,
     bar_area: float,
     cover: float,
@@ -144,7 +144,7 @@ def concrete_column_section(
     n_circle: int = 4,
 ) -> geometry.CompoundGeometry:
     """Constructs a concrete rectangular section of width *b* and depth *d*, with
-    steel bar reinforcing organized as an *n_bars_b* by *n_bars_d* array, discretised 
+    steel bar reinforcing organized as an *n_bars_b* by *n_bars_d* array, discretised
     with *n_circle* points with equal sides and top/bottom *cover* to the steel which
     is taken as the clear cover (edge of bar to edge of concrete).
 
@@ -160,14 +160,14 @@ def concrete_column_section(
     :param Optional[sectionproperties.pre.pre.Material] steel_mat: Material to
         associate with the reinforcing steel
     :param bool filled: When True, will populate the concrete section with an equally
-        spaced 2D array of reinforcing bars numbering 'n_bars_b' by 'n_bars_d'. 
+        spaced 2D array of reinforcing bars numbering 'n_bars_b' by 'n_bars_d'.
         When False, only the bars around the perimeter of the array will be present.
     :param int n_circle: The number of points used to discretize the circle of the reinforcing
         bars. The bars themselves will have an exact area of 'bar_area' regardless of the
         number of points used in the circle. Useful for making the reinforcing bars look
         more circular when plotting the concrete section.
 
-    :raises ValueErorr: If the number of bars in either 'n_bars_b' or 'n_bars_d' is not greater 
+    :raises ValueErorr: If the number of bars in either 'n_bars_b' or 'n_bars_d' is not greater
         than or equal to 2.
 
     The following example creates a 600D x 300W concrete column with 25 mm diameter
@@ -187,7 +187,7 @@ def concrete_column_section(
         )
 
         geometry = concrete_column_section(
-            b=300, d=600, dia_bar=25, bar_area=500, cover=35, n_bars_b=3, n_bars_d=6, 
+            b=300, d=600, dia_bar=25, bar_area=500, cover=35, n_bars_b=3, n_bars_d=6,
             conc_mat=concrete, steel_mat=steel, filled=False, n_circle=4
         )
         geometry.create_mesh(mesh_sizes=[500])
@@ -205,17 +205,18 @@ def concrete_column_section(
         Mesh generated from the above geometry.
     """
     concrete_geometry = primitive_sections.rectangular_section(b, d, material=conc_mat)
-    bar_extents = concrete_geometry.offset_perimeter(-cover - dia_bar/2).calculate_extents()
+    bar_extents = concrete_geometry.offset_perimeter(
+        -cover - dia_bar / 2
+    ).calculate_extents()
     bar_x_min, bar_x_max, bar_y_min, bar_y_max = bar_extents
-    
+
     b_edge_bars_x = np.linspace(bar_x_min, bar_x_max, n_bars_b)
     d_edge_bars_y = np.linspace(bar_y_min, bar_y_max, n_bars_d)
-    
+
     if not filled:
         b_edge_bars_y1 = [bar_y_min] * n_bars_b
         b_edge_bars_y2 = [bar_y_max] * n_bars_b
 
-
         d_edge_bars_x1 = [bar_x_min] * n_bars_d
         d_edge_bars_x2 = [bar_x_max] * n_bars_d
 
@@ -224,23 +225,26 @@ def concrete_column_section(
         d_edge_bars_right = list(zip(d_edge_bars_x2, d_edge_bars_y))
         d_edge_bars_left = list(zip(d_edge_bars_x1, d_edge_bars_y))
 
-        all_bar_coords = list(set(b_edge_bars_top + b_edge_bars_bottom + d_edge_bars_right + d_edge_bars_left))
+        all_bar_coords = list(
+            set(
+                b_edge_bars_top
+                + b_edge_bars_bottom
+                + d_edge_bars_right
+                + d_edge_bars_left
+            )
+        )
     if filled:
         xy = np.meshgrid(b_edge_bars_x, d_edge_bars_y)
-        all_bar_coords = np.append(
-            xy[0].reshape(-1,1), 
-            xy[1].reshape(-1,1),
-            axis=1
-        )
-        
+        all_bar_coords = np.append(xy[0].reshape(-1, 1), xy[1].reshape(-1, 1), axis=1)
+
     for bar_coord in all_bar_coords:
         concrete_geometry = add_bar(
-            concrete_geometry, 
-            area=bar_area, 
-            material=steel_mat, 
-            x=bar_coord[0], 
-            y=bar_coord[1], 
-            n=n_circle
+            concrete_geometry,
+            area=bar_area,
+            material=steel_mat,
+            x=bar_coord[0],
+            y=bar_coord[1],
+            n=n_circle,
         )
     return concrete_geometry
 

sectionproperties/tests/test_concrete_sections.py

@@ -141,21 +141,38 @@ def test_concrete_circular_section():
 def test_concrete_column_section():
 
     concrete = pre.Material(
-        name='Concrete', elastic_modulus=30.1e3, poissons_ratio=0.2, yield_strength=32,
-        density=2.4e-6, color='lightgrey'
+        name="Concrete",
+        elastic_modulus=30.1e3,
+        poissons_ratio=0.2,
+        yield_strength=32,
+        density=2.4e-6,
+        color="lightgrey",
     )
     steel = pre.Material(
-        name='Steel', elastic_modulus=200e3, poissons_ratio=0.3, yield_strength=500,
-        density=7.85e-6, color='grey'
+        name="Steel",
+        elastic_modulus=200e3,
+        poissons_ratio=0.3,
+        yield_strength=500,
+        density=7.85e-6,
+        color="grey",
     )
 
     geometry = cs.concrete_column_section(
-        b=300, d=600, dia_bar=40, bar_area=500, cover=40, n_bars_b=3, n_bars_d=6, 
-        conc_mat=concrete, steel_mat=steel, filled=False, n_circle=4
-    ) # NOTE: Bar diam and Bar area do not match. This is intentional.
+        b=300,
+        d=600,
+        dia_bar=40,
+        bar_area=500,
+        cover=40,
+        n_bars_b=3,
+        n_bars_d=6,
+        conc_mat=concrete,
+        steel_mat=steel,
+        filled=False,
+        n_circle=4,
+    )  # NOTE: Bar diam and Bar area do not match. This is intentional.
     geometry.create_mesh(mesh_sizes=[500])
 
-        # check geometry is created correctly
+    # check geometry is created correctly
     conc_area = 0
     steel_area = 0
 
@@ -170,24 +187,25 @@ def test_concrete_column_section():
             )
 
     net_area = 300 * 600
-    actual_steel_area = 14 * 500.   
-    
+    actual_steel_area = 14 * 500.0
+
     check.almost_equal(conc_area, net_area - actual_steel_area, rel=r_tol)
     check.almost_equal(steel_area, actual_steel_area, rel=r_tol)
 
     bar_centroids = [tuple(geom.geom.centroid.coords[0]) for geom in geometry.geoms[1:]]
 
     from collections import Counter
+
     x_coords = Counter(round(coord[0], 0) for coord in bar_centroids)
     y_coords = Counter(round(coord[1], 0) for coord in bar_centroids)
 
     # Validate that we have 14 bars with the correct x-coordinates
-    check.equal(x_coords.get(60) , 6)
+    check.equal(x_coords.get(60), 6)
     check.equal(x_coords.get(150), 2)
     check.equal(x_coords.get(240), 6)
 
     # Validate that we have 14 bars with the correct y-coordinates
-    check.equal(y_coords.get(60) , 3)
+    check.equal(y_coords.get(60), 3)
     check.equal(y_coords.get(156), 2)
     check.equal(y_coords.get(252), 2)
     check.equal(y_coords.get(348), 2)
@@ -198,16 +216,20 @@ def test_concrete_column_section():
 def test_add_bar():
     rect = ps.rectangular_section(b=400, d=600)
     steel = pre.Material(
-        name='Steel', elastic_modulus=200e3, poissons_ratio=0.3, yield_strength=500,
-        density=7.85e-6, color='grey'
+        name="Steel",
+        elastic_modulus=200e3,
+        poissons_ratio=0.3,
+        yield_strength=500,
+        density=7.85e-6,
+        color="grey",
     )
     rect = cs.add_bar(rect, area=500, x=100, y=100, material=steel)
     rect = cs.add_bar(rect, area=500, x=200, y=200, material=steel)
     rect_area = rect.geoms[0].geom.area
-    steel_area = 2 * 500.
-    check.almost_equal(rect_area, 400*600 - steel_area)
-    
+    steel_area = 2 * 500.0
+    check.almost_equal(rect_area, 400 * 600 - steel_area)
+
     bar_1 = rect.geoms[1]
     bar_2 = rect.geoms[2]
     check.almost_equal(bar_1.calculate_centroid(), (100, 100))
-    check.almost_equal(bar_2.calculate_centroid(), (200, 200))
+    check.almost_equal(bar_2.calculate_centroid(), (200, 200))