Re-black

Author: connorferster

sectionproperties/analysis/fea.py

@@ -155,7 +155,7 @@ def shear_load_vectors(self, ixx, iyy, ixy, nu):
             Ny = np.dot(N, np.transpose(self.coords[1, :]))
 
             # determine shear parameters
-            r = Nx ** 2 - Ny ** 2
+            r = Nx**2 - Ny**2
             q = 2 * Nx * Ny
             d1 = ixx * r - ixy * q
             d2 = ixy * r + ixx * q
@@ -225,19 +225,19 @@ def shear_warping_integrals(self, ixx, iyy, ixy, omega):
             sc_xint += (
                 gp[0]
                 * (iyy * Nx + ixy * Ny)
-                * (Nx ** 2 + Ny ** 2)
+                * (Nx**2 + Ny**2)
                 * j
                 * self.material.elastic_modulus
             )
             sc_yint += (
                 gp[0]
                 * (ixx * Ny + ixy * Nx)
-                * (Nx ** 2 + Ny ** 2)
+                * (Nx**2 + Ny**2)
                 * j
                 * self.material.elastic_modulus
             )
             q_omega += gp[0] * Nomega * j * self.material.elastic_modulus
-            i_omega += gp[0] * Nomega ** 2 * j * self.material.elastic_modulus
+            i_omega += gp[0] * Nomega**2 * j * self.material.elastic_modulus
             i_xomega += gp[0] * Nx * Nomega * j * self.material.elastic_modulus
             i_yomega += gp[0] * Ny * Nomega * j * self.material.elastic_modulus
 
@@ -276,7 +276,7 @@ def shear_coefficients(self, ixx, iyy, ixy, psi_shear, phi_shear, nu):
             Ny = np.dot(N, np.transpose(self.coords[1, :]))
 
             # determine shear parameters
-            r = Nx ** 2 - Ny ** 2
+            r = Nx**2 - Ny**2
             q = 2 * Nx * Ny
             d1 = ixx * r - ixy * q
             d2 = ixy * r + ixx * q
@@ -466,7 +466,7 @@ def element_stress(
             (Nx_11, Ny_22) = principal_coordinate(phi, Nx, Ny)
 
             # determine shear parameters
-            r = Nx ** 2 - Ny ** 2
+            r = Nx**2 - Ny**2
             q = 2 * Nx * Ny
             d1 = ixx * r - ixy * q
             d2 = ixy * r + ixx * q
@@ -475,12 +475,12 @@ def element_stress(
 
             # calculate element stresses
             sig_zz_mxx_gp[i, :] = self.material.elastic_modulus * (
-                -(ixy * Mxx) / (ixx * iyy - ixy ** 2) * Nx
-                + (iyy * Mxx) / (ixx * iyy - ixy ** 2) * Ny
+                -(ixy * Mxx) / (ixx * iyy - ixy**2) * Nx
+                + (iyy * Mxx) / (ixx * iyy - ixy**2) * Ny
             )
             sig_zz_myy_gp[i, :] = self.material.elastic_modulus * (
-                -(ixx * Myy) / (ixx * iyy - ixy ** 2) * Nx
-                + (ixy * Myy) / (ixx * iyy - ixy ** 2) * Ny
+                -(ixx * Myy) / (ixx * iyy - ixy**2) * Nx
+                + (ixy * Myy) / (ixx * iyy - ixy**2) * Ny
             )
             sig_zz_m11_gp[i, :] = self.material.elastic_modulus * M11 / i11 * Ny_22
             sig_zz_m22_gp[i, :] = self.material.elastic_modulus * -M22 / i22 * Nx_11

sectionproperties/analysis/section.py

@@ -492,7 +492,7 @@ def shear_centres():
                 * (1 + self.section_props.nu_eff)
                 * (
                     self.section_props.ixx_c * self.section_props.iyy_c
-                    - self.section_props.ixy_c ** 2
+                    - self.section_props.ixy_c**2
                 )
             )
             x_se = (1 / Delta_s) * (
@@ -511,14 +511,14 @@ def shear_centres():
                 - self.section_props.iyy_c * i_yomega
             ) / (
                 self.section_props.ixx_c * self.section_props.iyy_c
-                - self.section_props.ixy_c ** 2
+                - self.section_props.ixy_c**2
             )
             y_st = (
                 self.section_props.ixx_c * i_xomega
                 - self.section_props.ixy_c * i_yomega
             ) / (
                 self.section_props.ixx_c * self.section_props.iyy_c
-                - self.section_props.ixy_c ** 2
+                - self.section_props.ixy_c**2
             )
 
             return (Delta_s, x_se, y_se, x11_se, y22_se, x_st, y_st)
@@ -543,7 +543,7 @@ def shear_centres():
         # calculate warping constant
         self.section_props.gamma = (
             i_omega
-            - q_omega ** 2 / self.section_props.ea
+            - q_omega**2 / self.section_props.ea
             - y_se * i_xomega
             + x_se * i_yomega
         )
@@ -579,14 +579,14 @@ def assemble_shear_deformation():
             (kappa_x, kappa_y, kappa_xy) = assemble_shear_deformation()
 
         # calculate shear areas wrt global axis
-        self.section_props.A_sx = Delta_s ** 2 / kappa_x
-        self.section_props.A_sy = Delta_s ** 2 / kappa_y
-        self.section_props.A_sxy = Delta_s ** 2 / kappa_xy
+        self.section_props.A_sx = Delta_s**2 / kappa_x
+        self.section_props.A_sy = Delta_s**2 / kappa_y
+        self.section_props.A_sxy = Delta_s**2 / kappa_xy
 
         # calculate shear areas wrt principal bending axis:
-        alpha_xx = kappa_x * self.section_props.area / Delta_s ** 2
-        alpha_yy = kappa_y * self.section_props.area / Delta_s ** 2
-        alpha_xy = kappa_xy * self.section_props.area / Delta_s ** 2
+        alpha_xx = kappa_x * self.section_props.area / Delta_s**2
+        alpha_yy = kappa_y * self.section_props.area / Delta_s**2
+        alpha_xy = kappa_xy * self.section_props.area / Delta_s**2
 
         # rotate the tensor by the principal axis angle
         phi_rad = self.section_props.phi * np.pi / 180
@@ -716,11 +716,11 @@ def calculate_frame():
             # calculate second moments of area about the centroidal xy axis
             self.section_props.ixx_c = (
                 self.section_props.ixx_g
-                - self.section_props.qx ** 2 / self.section_props.ea
+                - self.section_props.qx**2 / self.section_props.ea
             )
             self.section_props.iyy_c = (
                 self.section_props.iyy_g
-                - self.section_props.qy ** 2 / self.section_props.ea
+                - self.section_props.qy**2 / self.section_props.ea
             )
             self.section_props.ixy_c = (
                 self.section_props.ixy_g
@@ -730,7 +730,7 @@ def calculate_frame():
             # calculate the principal axis angle
             Delta = (
                 ((self.section_props.ixx_c - self.section_props.iyy_c) / 2) ** 2
-                + self.section_props.ixy_c ** 2
+                + self.section_props.ixy_c**2
             ) ** 0.5
 
             i11_c = (self.section_props.ixx_c + self.section_props.iyy_c) / 2 + Delta
@@ -4248,7 +4248,7 @@ def plot_mohrs_circles(self, x, y, title=None, **kwargs):
         tractions = []
         for col in range(3):
             ss = n_inv[:, col].T @ np.diag(s) @ n_inv[:, col]
-            ts = np.sqrt(np.linalg.norm(np.diag(s) @ n_inv[:, col]) ** 2 - ss ** 2)
+            ts = np.sqrt(np.linalg.norm(np.diag(s) @ n_inv[:, col]) ** 2 - ss**2)
             tractions.append((ss, ts))
 
         def plot_circle(ax, c, R, col, label=None, fill=None):
@@ -4470,23 +4470,23 @@ def calculate_combined_stresses(self):
         self.sig_zz_m = (
             self.sig_zz_mxx + self.sig_zz_myy + self.sig_zz_m11 + self.sig_zz_m22
         )
-        self.sig_zxy_mzz = (self.sig_zx_mzz ** 2 + self.sig_zy_mzz ** 2) ** 0.5
-        self.sig_zxy_vx = (self.sig_zx_vx ** 2 + self.sig_zy_vx ** 2) ** 0.5
-        self.sig_zxy_vy = (self.sig_zx_vy ** 2 + self.sig_zy_vy ** 2) ** 0.5
+        self.sig_zxy_mzz = (self.sig_zx_mzz**2 + self.sig_zy_mzz**2) ** 0.5
+        self.sig_zxy_vx = (self.sig_zx_vx**2 + self.sig_zy_vx**2) ** 0.5
+        self.sig_zxy_vy = (self.sig_zx_vy**2 + self.sig_zy_vy**2) ** 0.5
         self.sig_zx_v = self.sig_zx_vx + self.sig_zx_vy
         self.sig_zy_v = self.sig_zy_vx + self.sig_zy_vy
-        self.sig_zxy_v = (self.sig_zx_v ** 2 + self.sig_zy_v ** 2) ** 0.5
+        self.sig_zxy_v = (self.sig_zx_v**2 + self.sig_zy_v**2) ** 0.5
         self.sig_zz = self.sig_zz_n + self.sig_zz_m
         self.sig_zx = self.sig_zx_mzz + self.sig_zx_v
         self.sig_zy = self.sig_zy_mzz + self.sig_zy_v
-        self.sig_zxy = (self.sig_zx ** 2 + self.sig_zy ** 2) ** 0.5
+        self.sig_zxy = (self.sig_zx**2 + self.sig_zy**2) ** 0.5
         self.sig_1 = self.sig_zz / 2 + np.sqrt(
-            (self.sig_zz / 2) ** 2 + self.sig_zxy ** 2
+            (self.sig_zz / 2) ** 2 + self.sig_zxy**2
         )
         self.sig_3 = self.sig_zz / 2 - np.sqrt(
-            (self.sig_zz / 2) ** 2 + self.sig_zxy ** 2
+            (self.sig_zz / 2) ** 2 + self.sig_zxy**2
         )
-        self.sig_vm = (self.sig_zz ** 2 + 3 * self.sig_zxy ** 2) ** 0.5
+        self.sig_vm = (self.sig_zz**2 + 3 * self.sig_zxy**2) ** 0.5
 
 
 @dataclass
@@ -4692,8 +4692,8 @@ def calculate_centroidal_properties(self, mesh):
         """
 
         # calculate second moments of area about the centroidal xy axis
-        self.ixx_c = self.ixx_g - self.qx ** 2 / self.ea
-        self.iyy_c = self.iyy_g - self.qy ** 2 / self.ea
+        self.ixx_c = self.ixx_g - self.qx**2 / self.ea
+        self.iyy_c = self.iyy_g - self.qy**2 / self.ea
         self.ixy_c = self.ixy_g - self.qx * self.qy / self.ea
 
         # calculate section moduli about the centroidal xy axis
@@ -4712,7 +4712,7 @@ def calculate_centroidal_properties(self, mesh):
         self.ry_c = (self.iyy_c / self.ea) ** 0.5
 
         # calculate principal 2nd moments of area about the centroidal xy axis
-        Delta = (((self.ixx_c - self.iyy_c) / 2) ** 2 + self.ixy_c ** 2) ** 0.5
+        Delta = (((self.ixx_c - self.iyy_c) / 2) ** 2 + self.ixy_c**2) ** 0.5
         self.i11_c = (self.ixx_c + self.iyy_c) / 2 + Delta
         self.i22_c = (self.ixx_c + self.iyy_c) / 2 - Delta
 

sectionproperties/pre/library/bridge_sections.py

@@ -111,7 +111,7 @@ def super_t_girder_section(
 
     # Origin is middle at level of bottom of top flange
     # Some geometrics of the slope
-    web_hyp = np.sqrt(1 + web_slope ** 2)
+    web_hyp = np.sqrt(1 + web_slope**2)
     web_horiz = t_w * web_slope / web_hyp
     x_fillet = w_nom / 2 - d_fillet * 1 / web_hyp
 

sectionproperties/tests/test_rectangle.py

@@ -30,72 +30,72 @@ def test_rectangular_section_geometric():
     check.almost_equal(rectangle_section.section_props.qx, 100 * 50 * 50, rel=tol)
     check.almost_equal(rectangle_section.section_props.qy, 100 * 50 * 25, rel=tol)
     check.almost_equal(
-        rectangle_section.section_props.ixx_g, 50 * 100 ** 3 / 3, rel=tol
+        rectangle_section.section_props.ixx_g, 50 * 100**3 / 3, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.iyy_g, 100 * 50 ** 3 / 3, rel=tol
+        rectangle_section.section_props.iyy_g, 100 * 50**3 / 3, rel=tol
     )
     check.almost_equal(
         rectangle_section.section_props.ixy_g, 100 * 50 * 50 * 25, rel=tol
     )
     check.almost_equal(rectangle_section.section_props.cx, 50 / 2, rel=tol)
     check.almost_equal(rectangle_section.section_props.cy, 100 / 2, rel=tol)
     check.almost_equal(
-        rectangle_section.section_props.ixx_c, 50 * 100 ** 3 / 12, rel=tol
+        rectangle_section.section_props.ixx_c, 50 * 100**3 / 12, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.iyy_c, 100 * 50 ** 3 / 12, rel=tol
+        rectangle_section.section_props.iyy_c, 100 * 50**3 / 12, rel=tol
     )
     check.almost_equal(rectangle_section.section_props.ixy_c, 0, abs=tol)
     check.almost_equal(
-        rectangle_section.section_props.zxx_plus, 50 * 100 ** 2 / 6, rel=tol
+        rectangle_section.section_props.zxx_plus, 50 * 100**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.zxx_minus, 50 * 100 ** 2 / 6, rel=tol
+        rectangle_section.section_props.zxx_minus, 50 * 100**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.zyy_plus, 100 * 50 ** 2 / 6, rel=tol
+        rectangle_section.section_props.zyy_plus, 100 * 50**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.zyy_minus, 100 * 50 ** 2 / 6, rel=tol
+        rectangle_section.section_props.zyy_minus, 100 * 50**2 / 6, rel=tol
     )
     check.almost_equal(
         rectangle_section.section_props.rx_c,
-        (50 * 100 ** 3 / 12 / 100 / 50) ** 0.5,
+        (50 * 100**3 / 12 / 100 / 50) ** 0.5,
         rel=tol,
     )
     check.almost_equal(
         rectangle_section.section_props.ry_c,
-        (100 * 50 ** 3 / 12 / 100 / 50) ** 0.5,
+        (100 * 50**3 / 12 / 100 / 50) ** 0.5,
         rel=tol,
     )
     check.almost_equal(
-        rectangle_section.section_props.i11_c, (50 * 100 ** 3 / 12), rel=tol
+        rectangle_section.section_props.i11_c, (50 * 100**3 / 12), rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.i22_c, (100 * 50 ** 3 / 12), rel=tol
+        rectangle_section.section_props.i22_c, (100 * 50**3 / 12), rel=tol
     )
     check.almost_equal(rectangle_section.section_props.phi, 0, rel=tol)
     check.almost_equal(
-        rectangle_section.section_props.z11_plus, 50 * 100 ** 2 / 6, rel=tol
+        rectangle_section.section_props.z11_plus, 50 * 100**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.z11_minus, 50 * 100 ** 2 / 6, rel=tol
+        rectangle_section.section_props.z11_minus, 50 * 100**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.z22_plus, 100 * 50 ** 2 / 6, rel=tol
+        rectangle_section.section_props.z22_plus, 100 * 50**2 / 6, rel=tol
     )
     check.almost_equal(
-        rectangle_section.section_props.z22_minus, 100 * 50 ** 2 / 6, rel=tol
+        rectangle_section.section_props.z22_minus, 100 * 50**2 / 6, rel=tol
     )
     check.almost_equal(
         rectangle_section.section_props.r11_c,
-        (50 * 100 ** 3 / 12 / 100 / 50) ** 0.5,
+        (50 * 100**3 / 12 / 100 / 50) ** 0.5,
         rel=tol,
     )
     check.almost_equal(
         rectangle_section.section_props.r22_c,
-        (100 * 50 ** 3 / 12 / 100 / 50) ** 0.5,
+        (100 * 50**3 / 12 / 100 / 50) ** 0.5,
         rel=tol,
     )
 
@@ -104,10 +104,10 @@ def test_rectangular_section_plastic():
     check.almost_equal(rectangle_section.get_pc(), (50 / 2, 100 / 2))
     check.almost_equal(rectangle_section.get_pc_p(), (50 / 2, 100 / 2))
     check.almost_equal(
-        rectangle_section.get_s(), (50 * 100 ** 2 / 4, 100 * 50 ** 2 / 4)
+        rectangle_section.get_s(), (50 * 100**2 / 4, 100 * 50**2 / 4)
     )
     check.almost_equal(
-        rectangle_section.get_sp(), (50 * 100 ** 2 / 4, 100 * 50 ** 2 / 4)
+        rectangle_section.get_sp(), (50 * 100**2 / 4, 100 * 50**2 / 4)
     )
     check.almost_equal(rectangle_section.get_sf(), (1.5, 1.5, 1.5, 1.5))
     check.almost_equal(rectangle_section.get_sf_p(), (1.5, 1.5, 1.5, 1.5))