improve lint problems

Author: PetrKryslUCSD

examples/alt_stiffness_3d.py

@@ -6,14 +6,12 @@
 Matrix Structural Analysis: Second Edition 2nd Edition
 by William McGuire, Richard H. Gallagher, Ronald D. Ziemian 
 """
-from context import pystran
-from pystran import model
-from pystran import property
-from pystran import geometry
-from pystran import plots
+from math import sqrt
 from numpy import zeros, dot
 from numpy.linalg import norm
-from math import sqrt
+from context import pystran
+from pystran import model
+from pystran import section
 
 m = model.create(3)
 
@@ -24,29 +22,29 @@
 # Default orientation
 # model.add_joint(m, 1, [0.0, 0.0, 0.0])
 # model.add_joint(m, 2, [10.0, 0.0, 0.0])
-h = norm(m['joints'][1]['coordinates'] - m['joints'][2]['coordinates'])
+h = norm(m["joints"][1]["coordinates"] - m["joints"][2]["coordinates"])
 
 E = 2.0e6
 G = E / (2 * (1 + 0.3))
 H = 0.13
 B = 0.5
 A = H * B
-Iy = H*B**3/12
-Iz = H**3*B/12
+Iy = H * B**3 / 12
+Iz = H**3 * B / 12
 Ix = Iy + Iz
 J = Ix
 xz_vector = [0, 0, 1]
-p1 = property.beam_property('property_1', E, G, A, Ix, Iy, Iz, J, xz_vector)
+p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
 model.add_beam_member(m, 1, [1, 2], p1)
 
 model.number_dofs(m)
 
-nt, nf = m['ntotaldof'], m['nfreedof']
-    # Assemble global stiffness matrix
+nt, nf = m["ntotaldof"], m["nfreedof"]
+# Assemble global stiffness matrix
 K = zeros((nt, nt))
-for member in m['beam_members'].values():
-    connectivity = member['connectivity']
-    i, j = m['joints'][connectivity[0]], m['joints'][connectivity[1]]
+for member in m["beam_members"].values():
+    connectivity = member["connectivity"]
+    i, j = m["joints"][connectivity[0]], m["joints"][connectivity[1]]
     pystran.beam.assemble_stiffness(K, member, i, j)
 
 K1 = K.copy()
@@ -98,7 +96,7 @@
 K[8, 10] = 6 * E * Iy / h**2
 
 
-i, j = m['joints'][connectivity[0]], m['joints'][connectivity[1]]
+i, j = m["joints"][connectivity[0]], m["joints"][connectivity[1]]
 e_x, e_y, e_z, h = pystran.beam.beam_3d_member_geometry(i, j, xz_vector)
 
 # Transformation matrix
@@ -124,4 +122,3 @@
 # # ax = plots.plot_shear_forces(m, scale=0.50e-3)
 # # ax.set_title('Shear forces')
 # plots.show(m)
-    

examples/cantil_3d_a.py

@@ -6,45 +6,43 @@
 Matrix Structural Analysis: Second Edition 2nd Edition
 by William McGuire, Richard H. Gallagher, Ronald D. Ziemian 
 """
-from context import pystran
-from pystran import model
-from pystran import property
-from pystran import geometry
-from pystran import plots
+from math import sqrt
 from numpy import array, dot
 from numpy import linalg
 from numpy.linalg import cross
-from math import sqrt
+from context import pystran
+from pystran import model
+from pystran import section
 
 h = 8.0
 E = 2.0e6
 G = E / (2 * (1 + 0.3))
 H = 0.13
 B = 0.5
 A = H * B
-Iy = H*B**3/12
-Iz = H**3*B/12
+Iy = H * B**3 / 12
+Iz = H**3 * B / 12
 Ix = Iy + Iz
 J = Ix
-    
+
+
 def test(e_x, e_y, e_z, F, refdefl, refslope):
     m = model.create(3)
     model.add_joint(m, 1, [0.0, 0.0, 0.0])
-    model.add_joint(m, 2, h*e_x)
-    clamped = m['joints'][1]
-    freeend = m['joints'][2]
-    
+    model.add_joint(m, 2, h * e_x)
+    clamped = m["joints"][1]
+    freeend = m["joints"][2]
+
     model.add_support(clamped, model.U1)
     model.add_support(clamped, model.U2)
     model.add_support(clamped, model.U3)
     model.add_support(clamped, model.UR1)
     model.add_support(clamped, model.UR2)
     model.add_support(clamped, model.UR3)
-    
-    
-    p1 = property.beam_property('property_1', E, G, A, Ix, Iy, Iz, J, e_z)
+
+    p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, e_z)
     model.add_beam_member(m, 1, [1, 2], p1)
-    
+
     model.add_load(freeend, model.U1, F[0])
     model.add_load(freeend, model.U2, F[1])
     model.add_load(freeend, model.U3, F[2])
@@ -63,47 +61,48 @@ def test(e_x, e_y, e_z, F, refdefl, refslope):
     # print(m['K'][0:m['nfreedof'], 0:m['nfreedof']])
 
     # print(m['U'][0:m['nfreedof']])
-    
+
     rot = cross(e_x, F)
-    defl = dot(F, freeend['displacements'][0:3]) 
-    slope = dot(rot, freeend['displacements'][3:6]) 
+    defl = dot(F, freeend["displacements"][0:3])
+    slope = dot(rot, freeend["displacements"][3:6])
 
-    print('Reference deflection: ', refdefl, ' Computed deflection: ', defl)
-    print('Reference slope: ', refslope, ' Computed slope: ', slope)
-    
-    if abs(defl - refdefl) > 1.e-3 * abs(refdefl):
-        raise ValueError('Displacement calculation error')
+    print("Reference deflection: ", refdefl, " Computed deflection: ", defl)
+    print("Reference slope: ", refslope, " Computed slope: ", slope)
 
-    if abs(slope - refslope) > 1.e-3 * abs(refslope):
-        raise ValueError('Slope calculation error')
+    if abs(defl - refdefl) > 1.0e-3 * abs(refdefl):
+        raise ValueError("Displacement calculation error")
+
+    if abs(slope - refslope) > 1.0e-3 * abs(refslope):
+        raise ValueError("Slope calculation error")
 
     # plots.plot_setup(m)
     # plots.plot_members(m)
     # plots.plot_deformations(m, 10.0)
     # # ax = plots.plot_shear_forces(m, scale=0.50e-3)
     # # ax.set_title('Shear forces')
     # plots.show(m)
-        
+
+
 e_x, e_y, e_z = array([1, 0, 0]), array([0, 1, 0]), array([0, 0, 1])
 F = array([0, 1, 0])
-refdefl = 1*h**3/(3*E*Iz)
-refslope = 1*h**2/(2*E*Iz)
+refdefl = 1 * h**3 / (3 * E * Iz)
+refslope = 1 * h**2 / (2 * E * Iz)
 test(e_x, e_y, e_z, F, refdefl, refslope)
 
 e_x, e_y, e_z = array([1, 0, 0]), array([0, 1, 0]), array([0, 0, 1])
 F = array([0, 0, 1])
-refdefl = 1*h**3/(3*E*Iy)
-refslope = 1*h**2/(2*E*Iy)
+refdefl = 1 * h**3 / (3 * E * Iy)
+refslope = 1 * h**2 / (2 * E * Iy)
 test(e_x, e_y, e_z, F, refdefl, refslope)
 
 e_x, e_y, e_z = array([0, 1, 0]), array([0, 0, 1]), array([1, 0, 0])
 F = array([0, 0, 1])
-refdefl = 1*h**3/(3*E*Iz)
-refslope = 1*h**2/(2*E*Iz)
+refdefl = 1 * h**3 / (3 * E * Iz)
+refslope = 1 * h**2 / (2 * E * Iz)
 test(e_x, e_y, e_z, F, refdefl, refslope)
 
 e_x, e_y, e_z = array([0, 1, 0]), array([0, 0, 1]), array([1, 0, 0])
 F = array([0, 0, -1])
-refdefl = 1*h**3/(3*E*Iz)
-refslope = 1*h**2/(2*E*Iz)
+refdefl = 1 * h**3 / (3 * E * Iz)
+refslope = 1 * h**2 / (2 * E * Iz)
 test(e_x, e_y, e_z, F, refdefl, refslope)

examples/cantilever_3d.py

@@ -8,7 +8,7 @@
 """
 from context import pystran
 from pystran import model
-from pystran import property
+from pystran import section
 from pystran import geometry
 from pystran import plots
 from math import sqrt
@@ -18,14 +18,14 @@
 h = 8.0
 model.add_joint(m, 1, [0.0, 0.0, 0.0])
 model.add_joint(m, 2, [h, 0.0, 0.0])
-a = m['joints'][1]
+a = m["joints"][1]
 model.add_support(a, model.U1)
 model.add_support(a, model.U2)
 model.add_support(a, model.U3)
 model.add_support(a, model.UR1)
 model.add_support(a, model.UR2)
 model.add_support(a, model.UR3)
-a = m['joints'][2]
+a = m["joints"][2]
 model.add_support(a, model.U1)
 model.add_support(a, model.U2)
 model.add_support(a, model.UR1)
@@ -39,37 +39,33 @@
 Ix = Iy / 5
 J = 300e3 / 10**12
 xz_vector = [0, 0, 1]
-p1 = property.beam_property('property_1', E, G, A, Ix, Iy, Iz, J, xz_vector)
+p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
 model.add_beam_member(m, 1, [1, 2], p1)
 
-d = m['joints'][2]
+d = m["joints"][2]
 F = 10e3
 model.add_load(d, model.U3, F)
 
 model.number_dofs(m)
 
-print('Number of free degrees of freedom = ', m['nfreedof'])
-print('Number of all degrees of freedom = ', m['ntotaldof'])
+print("Number of free degrees of freedom = ", m["nfreedof"])
+print("Number of all degrees of freedom = ", m["ntotaldof"])
 
-print([j['dof'] for j in m['joints'].values()])
+print([j["dof"] for j in m["joints"].values()])
 
 model.solve(m)
 
-print([j['displacements'] for j in m['joints'].values()])
+print([j["displacements"] for j in m["joints"].values()])
 
-print(m['K'][0:m['nfreedof'], 0:m['nfreedof']])
+print(m["K"][0 : m["nfreedof"], 0 : m["nfreedof"]])
 
-print(m['U'][0:m['nfreedof']])
+print(m["U"][0 : m["nfreedof"]])
 
-print('Reference: ', F*h**3/(3*E*Iy))
+print("Reference: ", F * h**3 / (3 * E * Iy))
 
 plots.plot_setup(m)
 plots.plot_members(m)
 plots.plot_deformations(m, 10.0)
 # ax = plots.plot_shear_forces(m, scale=0.50e-3)
 # ax.set_title('Shear forces')
 plots.show(m)
-    
-
-
-    

examples/context.py

@@ -1,8 +1,12 @@
+"""
+Mechanism for making python aware of the pystran package.
+"""
+
 import os
 import sys
 
 # This is an ugly hack. Jupyter notebook runs in a different path than plain python.
-sys.path.insert(0, os.path.abspath('../pystran'))
-sys.path.insert(0, os.path.abspath('../../pystran'))
+sys.path.insert(0, os.path.abspath("../pystran"))
+sys.path.insert(0, os.path.abspath("../../pystran"))
 
-import pystran
+import pystran