improve names

PetrKryslUCSD · PetrKryslUCSD · commit 1aa0a34dbf8c · 2025-01-18T07:48:29.000-08:00
diff --git a/examples/alt_stiffness_3d.py b/examples/alt_stiffness_3d.py
@@ -6,7 +6,7 @@
 Matrix Structural Analysis: Second Edition 2nd Edition
 by William McGuire, Richard H. Gallagher, Ronald D. Ziemian 
 """
-from math import sqrt
+
 from numpy import zeros, dot
 from numpy.linalg import norm
 from context import pystran
@@ -34,8 +34,8 @@
 Ix = Iy + Iz
 J = Ix
 xz_vector = [0, 0, 1]
-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)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [1, 2], s1)
 
 model.number_dofs(m)
 
diff --git a/examples/cantil_3d_a.py b/examples/cantil_3d_a.py
@@ -40,8 +40,8 @@ def test(e_x, e_y, e_z, F, refdefl, refslope):
     model.add_support(clamped, model.UR2)
     model.add_support(clamped, model.UR3)
 
-    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)
+    s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, e_z)
+    model.add_beam_member(m, 1, [1, 2], s1)
 
     model.add_load(freeend, model.U1, F[0])
     model.add_load(freeend, model.U2, F[1])
diff --git a/examples/cantilever_3d.py b/examples/cantilever_3d.py
@@ -39,8 +39,8 @@
 Ix = Iy / 5
 J = 300e3 / 10**12
 xz_vector = [0, 0, 1]
-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)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [1, 2], s1)
 
 d = m["joints"][2]
 F = 10e3
diff --git a/examples/continuous_beam_2_spans.py b/examples/continuous_beam_2_spans.py
@@ -27,13 +27,13 @@
 E = 3e10
 A = 0.001
 I = 1.44e-5
-p1 = section.beam_2d_section("material_1", E, A, I)
-model.add_beam_member(m, 1, [2, 1], p1)
+s1 = section.beam_2d_section("material_1", E, A, I)
+model.add_beam_member(m, 1, [2, 1], s1)
 E = 2.06e11
 A = 0.001
 I = 1.152e-5
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 2, [2, 3], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 2, [2, 3], s2)
 
 model.add_load(m["joints"][1], 2, -15e3)
 model.add_load(m["joints"][2], 2, -25e3)
diff --git a/examples/continuous_beam_2_spans_alt.py b/examples/continuous_beam_2_spans_alt.py
@@ -27,13 +27,13 @@
 E = 3e10
 A = 0.001
 I = 1.44e-5
-p1 = section.beam_2d_section("material_1", E, A, I)
-model.add_beam_member(m, 1, [2, 1], p1)
+s1 = section.beam_2d_section("material_1", E, A, I)
+model.add_beam_member(m, 1, [2, 1], s1)
 E = 2.06e11
 A = 0.001
 I = 1.152e-5
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 2, [3, 2], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 2, [3, 2], s2)
 
 model.add_load(m["joints"][1], 2, -15e3)
 model.add_load(m["joints"][2], 2, -25e3)
diff --git a/examples/continuous_beam_2_spans_consist.py b/examples/continuous_beam_2_spans_consist.py
@@ -27,13 +27,13 @@
 E = 3e10
 A = 0.001
 I = 1.44e-5
-p1 = section.beam_2d_section("material_1", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p1)
+s1 = section.beam_2d_section("material_1", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s1)
 E = 2.06e11
 A = 0.001
 I = 1.152e-5
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 2, [2, 3], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 2, [2, 3], s2)
 
 model.add_load(m["joints"][1], 2, -15e3)
 model.add_load(m["joints"][2], 2, -25e3)
diff --git a/examples/frame_4_12.py b/examples/frame_4_12.py
@@ -41,26 +41,26 @@
 I1 = I2 / 2
 J = 300e3 / 10**12
 xz_vector = [0, 0, 1]
-p1 = section.beam_3d_section("property_1", E, G, A, I1, I2, I3, J, xz_vector)
-model.add_beam_member(m, 1, [1, 2], p1)
+s1 = section.beam_3d_section("property_1", E, G, A, I1, I2, I3, J, xz_vector)
+model.add_beam_member(m, 1, [1, 2], s1)
 E = 2.0e11
 A = 4000 / 10**6
 I2 = 50e6 / 10**12
 I3 = I2 / 2
 I1 = I2 / 2
 J = 100e3 / 10**12
 xz_vector = [0, 0, 1]
-p2 = section.beam_3d_section("property_2", E, G, A, I1, I2, I3, J, xz_vector)
-model.add_beam_member(m, 2, [3, 2], p2)
+s2 = section.beam_3d_section("property_2", E, G, A, I1, I2, I3, J, xz_vector)
+model.add_beam_member(m, 2, [3, 2], s2)
 E = 2.0e11
 A = 4000 / 10**6
 I2 = 5000e6 / 10**12
 I3 = I2 / 2
 I1 = I2 / 2
 J = 10000e3 / 10**12
 xz_vector = [0, 1, 0]
-p3 = section.beam_3d_section("property_3", E, G, A, I1, I2, I3, J, xz_vector)
-model.add_beam_member(m, 3, [4, 2], p3)
+s3 = section.beam_3d_section("property_3", E, G, A, I1, I2, I3, J, xz_vector)
+model.add_beam_member(m, 3, [4, 2], s3)
 
 d = m["joints"][4]
 model.add_load(d, model.U2, -10e3)
diff --git a/examples/frame_4_13.py b/examples/frame_4_13.py
@@ -27,13 +27,13 @@
 E = 2.0e11
 A = 6000 / 10**6
 I = 200e6 / 10**12
-p1 = section.beam_2d_section("material_1", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p1)
+s1 = section.beam_2d_section("material_1", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s1)
 E = 2.0e11
 A = 4000 / 10**6
 I = 50e6 / 10**12
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 2, [3, 2], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 2, [3, 2], s2)
 
 model.add_load(m["joints"][2], model.U1, 100e3 / sqrt(2))
 model.add_load(m["joints"][2], model.U2, -100e3 / sqrt(2))
diff --git a/examples/frame_5_8.py b/examples/frame_5_8.py
@@ -35,8 +35,8 @@
 Ix = Iy + Iz
 J = 100e3 / 1e12
 xz_vector = [0, 0, 1]
-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)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [1, 2], s1)
 E = 2.0e11
 G = E / (2 * (1 + 0.3))
 A = 6e3 / 1e6
@@ -46,8 +46,8 @@
 J = 300e3 / 1e12
 xz_vector = [0, 0, 1]
 xz_vector = [0, 0, 1]
-p2 = section.beam_3d_section("property_2", E, G, A, Ix, Iy, Iz, J, xz_vector)
-model.add_beam_member(m, 2, [2, 3], p2)
+s2 = section.beam_3d_section("property_2", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 2, [2, 3], s2)
 
 model.add_load(b, model.U3, -5e3 - 7.5e3)
 model.add_load(b, model.UR2, -6.25e3)
diff --git a/examples/overhang_beam_13_4.py b/examples/overhang_beam_13_4.py
@@ -26,9 +26,9 @@
 E = 3e10
 A = 0.001
 I = 1.44e-5
-p1 = section.beam_2d_section("material_1", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p1)
-model.add_beam_member(m, 2, [2, 3], p1)
+s1 = section.beam_2d_section("material_1", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s1)
+model.add_beam_member(m, 2, [2, 3], s1)
 
 
 model.add_load(m["joints"][1], model.U2, -6e3)
diff --git a/examples/playground.py b/examples/playground.py
@@ -13,8 +13,8 @@
 # print(m['joints'])
 # E = 200e9
 # A = 0.001
-# p1 = property.truss_section('steel', E, A)
-# model.add_truss_member(m, 1, [1, 2], p1)
+# s1 = property.truss_section('steel', E, A)
+# model.add_truss_member(m, 1, [1, 2], s1)
 # print(m['truss_members'])
 
 # import pystran
@@ -43,8 +43,8 @@
 # model.add_joint(m, 2, [1.0, 2.0])
 # E = 200e9
 # A = 0.001
-# p1 = property.truss_section('steel', E, A)
-# model.add_truss_member(m, 1, [1, 2], p1)
+# s1 = property.truss_section('steel', E, A)
+# model.add_truss_member(m, 1, [1, 2], s1)
 # i = m['truss_members'][1]['connectivity'][0]
 # j = m['truss_members'][1]['connectivity'][1]
 # d = geometry.delt(m['joints'][i]['coordinates'], m['joints'][j]['coordinates'])
@@ -70,10 +70,10 @@
 # model.add_support(m['joints'][4], 1)
 # E = 200e9
 # A = 0.001
-# p1 = property.truss_section('steel', E, A)
-# model.add_truss_member(m, 1, [1, 2], p1)
-# model.add_truss_member(m, 2, [3, 2], p1)
-# model.add_truss_member(m, 3, [4, 2], p1)
+# s1 = property.truss_section('steel', E, A)
+# model.add_truss_member(m, 1, [1, 2], s1)
+# model.add_truss_member(m, 2, [3, 2], s1)
+# model.add_truss_member(m, 3, [4, 2], s1)
 # model.number_dofs(m)
 # print(m['nfreedof'])
 # print(m['ntotaldof'])
@@ -96,8 +96,8 @@
 E = 200e9
 A = 0.001
 I = 0.001
-p1 = section.beam_2d_section("steel", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p1)
+s1 = section.beam_2d_section("steel", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s1)
 model.add_load(m["joints"][2], 2, -1000)
 model.number_dofs(m)
 print(m["nfreedof"])
diff --git a/examples/skew_bridge_24_2.py b/examples/skew_bridge_24_2.py
@@ -47,15 +47,15 @@
 model.add_support(m["joints"][I], model.CLAMPED)
 
 xz_vector = [0, 0, 1]
-p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
-model.add_beam_member(m, 1, [A, B], p1)
-model.add_beam_member(m, 2, [B, C], p1)
-model.add_beam_member(m, 3, [D, O], p1)
-model.add_beam_member(m, 4, [O, F], p1)
-model.add_beam_member(m, 5, [G, H], p1)
-model.add_beam_member(m, 6, [H, I], p1)
-model.add_beam_member(m, 7, [H, O], p1)
-model.add_beam_member(m, 8, [O, B], p1)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [A, B], s1)
+model.add_beam_member(m, 2, [B, C], s1)
+model.add_beam_member(m, 3, [D, O], s1)
+model.add_beam_member(m, 4, [O, F], s1)
+model.add_beam_member(m, 5, [G, H], s1)
+model.add_beam_member(m, 6, [H, I], s1)
+model.add_beam_member(m, 7, [H, O], s1)
+model.add_beam_member(m, 8, [O, B], s1)
 
 model.add_load(m["joints"][O], model.U3, -100e3)
 
diff --git a/examples/slanted_frame_7_3.py b/examples/slanted_frame_7_3.py
@@ -30,10 +30,10 @@
 E = 2.06e11
 A = 1.5e-2
 I = 2.813e-5
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p2)
-model.add_beam_member(m, 2, [3, 1], p2)
-model.add_beam_member(m, 3, [3, 4], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s2)
+model.add_beam_member(m, 2, [3, 1], s2)
+model.add_beam_member(m, 3, [3, 4], s2)
 
 model.add_load(m["joints"][1], model.UR3, -50e3)
 model.add_load(m["joints"][3], model.U2, -60e3)
diff --git a/examples/slanted_frame_7_3_1.py b/examples/slanted_frame_7_3_1.py
@@ -25,9 +25,9 @@
 E = 2.06e11
 A = 9.6e-3
 I = 1.152e-5
-p2 = section.beam_2d_section("material_2", E, A, I)
-model.add_beam_member(m, 1, [1, 2], p2)
-model.add_beam_member(m, 2, [4, 1], p2)
+s2 = section.beam_2d_section("material_2", E, A, I)
+model.add_beam_member(m, 1, [1, 2], s2)
+model.add_beam_member(m, 2, [4, 1], s2)
 
 model.add_load(m["joints"][1], model.UR3, -40e3)
 model.add_load(m["joints"][1], model.U2, -50e3)
diff --git a/examples/spfr_weaver_gere_1.py b/examples/spfr_weaver_gere_1.py
@@ -40,13 +40,13 @@
 model.add_support(m["joints"][jD], model.CLAMPED)
 
 xz_vector = [1, 0, 0]
-p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
-model.add_beam_member(m, 1, [jA, jB], p1)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [jA, jB], s1)
 xz_vector = [0, 1, 0]
-p2 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
-model.add_beam_member(m, 2, [jE, jB], p2)
-model.add_beam_member(m, 3, [jE, jC], p2)
-model.add_beam_member(m, 4, [jC, jD], p1)
+s2 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 2, [jE, jB], s2)
+model.add_beam_member(m, 3, [jE, jC], s2)
+model.add_beam_member(m, 4, [jC, jD], s1)
 
 model.add_load(m["joints"][jB], model.U1, 2 * P)
 model.add_load(m["joints"][jE], model.U3, 4 * P)
diff --git a/examples/spfr_weaver_gere_2.py b/examples/spfr_weaver_gere_2.py
@@ -40,11 +40,11 @@
 model.add_support(m["joints"][jD], model.CLAMPED)
 
 xz_vector = [0, 0, 1]
-p1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
-model.add_beam_member(m, 1, [jA, jB], p1)
-model.add_beam_member(m, 2, [jE, jB], p1)
-model.add_beam_member(m, 3, [jE, jC], p1)
-model.add_beam_member(m, 4, [jC, jD], p1)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [jA, jB], s1)
+model.add_beam_member(m, 2, [jE, jB], s1)
+model.add_beam_member(m, 3, [jE, jC], s1)
+model.add_beam_member(m, 4, [jC, jD], s1)
 
 model.add_load(m["joints"][jB], model.U1, 2 * P)
 model.add_load(m["joints"][jE], model.U3, 4 * P)
diff --git a/examples/t-shape-1.py b/examples/t-shape-1.py
@@ -37,10 +37,10 @@
 model.add_support(m["joints"][1], model.CLAMPED)
 
 xz_vector = [1, 0, 0]
-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.add_beam_member(m, 2, [2, 3], p1)
-model.add_beam_member(m, 3, [2, 4], p1)
+s1 = section.beam_3d_section("property_1", E, G, A, Ix, Iy, Iz, J, xz_vector)
+model.add_beam_member(m, 1, [1, 2], s1)
+model.add_beam_member(m, 2, [2, 3], s1)
+model.add_beam_member(m, 3, [2, 4], s1)
 
 model.add_load(m["joints"][3], model.U1, -P)
 
diff --git a/examples/three_bars.py b/examples/three_bars.py
@@ -32,10 +32,10 @@
 
 E = 30000000.0
 A = 0.65700000
-p1 = section.truss_section("steel", E, A)
-model.add_truss_member(m, 1, [1, 2], p1)
-model.add_truss_member(m, 2, [1, 3], p1)
-model.add_truss_member(m, 3, [1, 4], p1)
+s1 = section.truss_section("steel", E, A)
+model.add_truss_member(m, 1, [1, 2], s1)
+model.add_truss_member(m, 2, [1, 3], s1)
+model.add_truss_member(m, 3, [1, 4], s1)
 
 for i in [2, 3, 4]:
     for d in range(2):
diff --git a/examples/truss_dome.py b/examples/truss_dome.py
@@ -43,7 +43,7 @@
 
 E = 30000000.0
 A = 0.0155
-p1 = section.truss_section("steel", E, A)
+s1 = section.truss_section("steel", E, A)
 
 for id, j in enumerate(
     [
@@ -73,7 +73,7 @@
         [7, 2],
     ]
 ):
-    model.add_truss_member(m, id, j, p1)
+    model.add_truss_member(m, id, j, s1)
 
 for i in [8, 9, 10, 11, 12, 13]:
     for d in range(m["dim"]):
diff --git a/test.py b/test.py
