Skip to content

Format Python code with psf/black push #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Format Python code with psf/black push #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 44 additions & 38 deletions src/ospgrid/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ def add_load(
the_node = self.get_node(node)
the_node.set_load(Fz, Mx, My)

def add_support(
self, node: "Node | str | int", support: "Support | str" = None
):
def add_support(self, node: "Node | str | int", support: "Support | str" = None):
"""
Add a support to a node in the grid.

Expand Down Expand Up @@ -491,7 +489,7 @@ def analyze(self) -> osp:
# Steel values are used here to keep the derived I and J numerically
# well-conditioned for the linear solver.
E = 200e9 # nominal (Pa); value does not affect results (see above)
G = 80e9 # nominal (Pa); value does not affect results (see above)
G = 80e9 # nominal (Pa); value does not affect results (see above)

# define materials
osp.uniaxialMaterial("Elastic", 1, E)
Expand All @@ -503,12 +501,12 @@ def analyze(self) -> osp:
# define elements
# tag *[ndI ndJ] A E G Jx Iy Iz transfTag
for m in self.members:
I = m.EI / E # second moment of area derived from EI
J = m.GJ / G # torsion constant derived from GJ
I = m.EI / E # second moment of area derived from EI
J = m.GJ / G # torsion constant derived from GJ
# A and Iz do not affect the grid solution (no axial/in-plane bending);
# nominal values are used only to satisfy the OpenSeesPy API.
A = I / 1e6 # nominal cross-sectional area
Iz = 0.1 * I # nominal weak-axis second moment of area
A = I / 1e6 # nominal cross-sectional area
Iz = 0.1 * I # nominal weak-axis second moment of area
osp.element(
"elasticBeamColumn",
m.idx,
Expand Down Expand Up @@ -801,8 +799,7 @@ def plot_grid(
if figsize is None:
figsize = self.FIGSIZE

ospv.plot_model(fig_wi_he=figsize,
node_supports=False)
ospv.plot_model(fig_wi_he=figsize, node_supports=False)
fig = plt.gcf()
fig.set_figwidth(figsize[0])
fig.set_figheight(figsize[1])
Expand All @@ -819,11 +816,13 @@ def _plot_model(self, ax):
Plots the background model for the section force diagrams.
"""

ospv.plot_model(ax=ax,
node_labels=False,
element_labels=False,
node_supports=False,
local_axes=False)
ospv.plot_model(
ax=ax,
node_labels=False,
element_labels=False,
node_supports=False,
local_axes=False,
)

def plot_dsd(
self,
Expand Down Expand Up @@ -872,14 +871,15 @@ def plot_dsd(
scale_factor = round(10 * sf / mag) * mag / 10

fig = plt.figure()
ax = fig.add_subplot(111, projection='3d')
ax = fig.add_subplot(111, projection="3d")
self._plot_model(ax)
ospv.plot_defo(sfac=scale_factor,
unDefoFlag=False,
ax=ax,
endDispFlag=False,
node_supports=False
)
ospv.plot_defo(
sfac=scale_factor,
unDefoFlag=False,
ax=ax,
endDispFlag=False,
node_supports=False,
)
fig = plt.gcf()
fig.set_figwidth(figsize[0])
fig.set_figheight(figsize[1])
Expand Down Expand Up @@ -922,11 +922,13 @@ def plot_bmd(
if figsize is None:
figsize = self.FIGSIZE

_, _, ax = ospv.section_force_diagram_3d("My",
sfac=scale_factor,
end_max_values=values,
node_supports=False,
alt_model_plot=2)
_, _, ax = ospv.section_force_diagram_3d(
"My",
sfac=scale_factor,
end_max_values=values,
node_supports=False,
alt_model_plot=2,
)
self._plot_model(ax)
fig = plt.gcf()
fig.set_figwidth(figsize[0])
Expand Down Expand Up @@ -973,11 +975,13 @@ def plot_sfd(
if figsize is None:
figsize = self.FIGSIZE

_, _, ax = ospv.section_force_diagram_3d("Vz",
sfac=-scale_factor,
end_max_values=values,
node_supports=False,
alt_model_plot=2)
_, _, ax = ospv.section_force_diagram_3d(
"Vz",
sfac=-scale_factor,
end_max_values=values,
node_supports=False,
alt_model_plot=2,
)
self._plot_model(ax)
fig = plt.gcf()
fig.set_figwidth(figsize[0])
Expand Down Expand Up @@ -1024,12 +1028,14 @@ def plot_tmd(
if figsize is None:
figsize = self.FIGSIZE

_, _, ax = ospv.section_force_diagram_3d("T",
sfac=-scale_factor,
dir_plt=2,
end_max_values=values,
node_supports=False,
alt_model_plot=2)
_, _, ax = ospv.section_force_diagram_3d(
"T",
sfac=-scale_factor,
dir_plt=2,
end_max_values=values,
node_supports=False,
alt_model_plot=2,
)
self._plot_model(ax)
fig = plt.gcf()
fig.set_figwidth(figsize[0])
Expand Down
103 changes: 57 additions & 46 deletions tests/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@
# Shared helpers
# ---------------------------------------------------------------------------


def grid_params():
"""Return parameters for the standard 4-member star grid test case."""
Lae = 2.0 # m
Lbe = 4.75 # m
Lce = 4.0 # m
Lde = 4.0 # m
EI = 25e3 # kNm²
GJ = 15e3 # kNm²
P = -50 # kN
Mx = 25 # kNm
My = 15 # kNm
Lae = 2.0 # m
Lbe = 4.75 # m
Lce = 4.0 # m
Lde = 4.0 # m
EI = 25e3 # kNm²
GJ = 15e3 # kNm²
P = -50 # kN
Mx = 25 # kNm
My = 15 # kNm
return [Lae, Lbe, Lce, Lde, EI, GJ, P, Mx, My]


Expand All @@ -46,9 +47,7 @@ def sysK():
k32 = 0
k33 = 4 * EI / Lce + GJ / Lbe + GJ / Lde

return np.array([[k11, k12, k13],
[k21, k22, k23],
[k31, k32, k33]])
return np.array([[k11, k12, k13], [k21, k22, k23], [k31, k32, k33]])


def getF():
Expand All @@ -62,11 +61,11 @@ def do_ospg_analysis():
Lae, Lbe, Lce, Lde, EI, GJ, P, Mx, My = grid_params()

grid = ospg.Grid()
grid.add_node("A", -Lae, 0.0)
grid.add_node("B", 0.0, Lbe)
grid.add_node("C", Lce, 0.0)
grid.add_node("D", 0.0, -Lde)
grid.add_node("E", 0.0, 0.0)
grid.add_node("A", -Lae, 0.0)
grid.add_node("B", 0.0, Lbe)
grid.add_node("C", Lce, 0.0)
grid.add_node("D", 0.0, -Lde)
grid.add_node("E", 0.0, 0.0)

grid.add_member("A", "E", EI, GJ)
grid.add_member("B", "E", EI, GJ)
Expand All @@ -87,6 +86,7 @@ def do_ospg_analysis():
# Numerical correctness
# ---------------------------------------------------------------------------


def test_basic_grid():
"""
Analyse a 4-member star grid and verify node-E displacements match the
Expand All @@ -100,7 +100,7 @@ def test_basic_grid():

delta_E = grid.get_displacement("E", 3)
theta_E = grid.get_displacement("E", 4)
phi_E = grid.get_displacement("E", 5)
phi_E = grid.get_displacement("E", 5)

K = sysK()
F = getF()
Expand Down Expand Up @@ -143,7 +143,7 @@ def test_member_forces_equilibrium():
Mx_sum += f[9]
My_sum += f[10]

assert Fz_sum == pytest.approx(P, rel=1e-5)
assert Fz_sum == pytest.approx(P, rel=1e-5)
assert Mx_sum == pytest.approx(Mx, rel=1e-5)
assert My_sum == pytest.approx(My, rel=1e-5)

Expand All @@ -166,24 +166,25 @@ def test_system_stiffness_shape_and_symmetry():
# Member object methods
# ---------------------------------------------------------------------------


def test_member_local_stiffness():
"""Local stiffness matrix entries match the grid beam-element formula."""
EI = 25e3 # kNm²
GJ = 15e3 # kNm²
L = 4.0 # m
EI = 25e3 # kNm²
GJ = 15e3 # kNm²
L = 4.0 # m

grid = ospg.Grid()
grid.add_node("i", 0.0, 0.0)
grid.add_node("j", L, 0.0) # member along x-axis
grid.add_node("j", L, 0.0) # member along x-axis
m = grid.add_member("i", "j", EI, GJ)

k = m.get_local_stiffness()

assert k[0, 0] == pytest.approx(12 * EI / L**3)
assert k[1, 1] == pytest.approx(GJ / L)
assert k[2, 2] == pytest.approx(4 * EI / L)
assert k[2, 5] == pytest.approx(2 * EI / L)
assert k[0, 2] == pytest.approx(6 * EI / L**2)
assert k[2, 2] == pytest.approx(4 * EI / L)
assert k[2, 5] == pytest.approx(2 * EI / L)
assert k[0, 2] == pytest.approx(6 * EI / L**2)

# Matrix must be symmetric
assert k == pytest.approx(k.T)
Expand All @@ -208,21 +209,19 @@ def test_member_transformation_matrix_skewed():
m = grid.add_member("i", "j", 1.0, 1.0)

c = s = 1.0 / np.sqrt(2)
T_expected = np.kron(np.eye(2), np.array([[1, 0, 0],
[0, c, s],
[0, -s, c]]))
T_expected = np.kron(np.eye(2), np.array([[1, 0, 0], [0, c, s], [0, -s, c]]))
assert m.get_transformation_matrix() == pytest.approx(T_expected)


def test_member_global_stiffness_aligned():
"""For an axis-aligned member, global stiffness equals local stiffness."""
EI = 10e3
GJ = 5e3
L = 3.0
L = 3.0

grid = ospg.Grid()
grid.add_node("i", 0.0, 0.0)
grid.add_node("j", L, 0.0)
grid.add_node("j", L, 0.0)
m = grid.add_member("i", "j", EI, GJ)

assert m.get_global_stiffness() == pytest.approx(m.get_local_stiffness())
Expand All @@ -232,12 +231,13 @@ def test_member_global_stiffness_aligned():
# Grid helper methods
# ---------------------------------------------------------------------------


def test_get_member_by_tuple():
"""get_member accepts a (label, label) tuple independent of order."""
grid = do_ospg_analysis()

m_ae = grid.get_member(("A", "E"))
m_ea = grid.get_member(("E", "A"))
m_ae = grid.get_member(("A", "E"))
m_ea = grid.get_member(("E", "A"))
assert m_ae is m_ea
assert {m_ae.node_i.label, m_ae.node_j.label} == {"A", "E"}

Expand All @@ -259,7 +259,7 @@ def test_get_member_not_found():
"""get_member raises ValueError when no matching member exists."""
grid = do_ospg_analysis()
with pytest.raises(ValueError):
grid.get_member(("A", "C")) # no direct member between A and C
grid.get_member(("A", "C")) # no direct member between A and C


def test_get_node_errors():
Expand Down Expand Up @@ -300,13 +300,17 @@ def test_get_system_force_not_implemented():
# Support string shortcuts
# ---------------------------------------------------------------------------

@pytest.mark.parametrize("char,enum_val", [
("F", ospg.Support.FIXED),
("X", ospg.Support.PINNED_X),
("Y", ospg.Support.PINNED_Y),
("P", ospg.Support.PROP),
("V", ospg.Support.FIXED_V_ROLLER),
])

@pytest.mark.parametrize(
"char,enum_val",
[
("F", ospg.Support.FIXED),
("X", ospg.Support.PINNED_X),
("Y", ospg.Support.PINNED_Y),
("P", ospg.Support.PROP),
("V", ospg.Support.FIXED_V_ROLLER),
],
)
def test_support_string_shortcuts(char, enum_val):
"""Single-character support strings map to the correct Support enum value."""
grid = ospg.Grid()
Expand All @@ -319,12 +323,13 @@ def test_support_string_shortcuts(char, enum_val):
# make_grid (post.py)
# ---------------------------------------------------------------------------


def test_make_grid_topology():
"""make_grid parses node positions, supports, loads, and connectivity."""
grid_str = "AF-5:0,BX0:-5,CN0:0,DY2:0_C0:-50:-50_AC,CD,BC"
grid = ospg.make_grid(grid_str)

assert len(grid.nodes) == 4
assert len(grid.nodes) == 4
assert len(grid.members) == 3

node_A = grid.get_node("A")
Expand All @@ -345,19 +350,20 @@ def test_make_grid_analyzable():
"""A grid built via make_grid can be analysed without error."""
grid_str = "AF-5:0,BX0:-5,CN0:0,DY2:0_C0:-50:-50_AC,CD,BC"
grid = ospg.make_grid(grid_str)
grid.analyze() # must not raise
grid.analyze() # must not raise


def test_make_grid_invalid_member():
"""make_grid raises ValueError when a member references an undefined node."""
with pytest.raises(ValueError):
ospg.make_grid("AF0:0,BX1:0_A0:0:0_AZ") # Z is not defined
ospg.make_grid("AF0:0,BX1:0_A0:0:0_AZ") # Z is not defined


# ---------------------------------------------------------------------------
# Plotting
# ---------------------------------------------------------------------------


def test_plotting(monkeypatch):
"""plot_results completes without error (plt.show suppressed)."""
grid = do_ospg_analysis()
Expand All @@ -371,8 +377,13 @@ def test_individual_plot_methods(monkeypatch):
grid = do_ospg_analysis()
monkeypatch.setattr(plt, "show", lambda: None)

for method in (grid.plot_grid, grid.plot_dsd,
grid.plot_bmd, grid.plot_sfd, grid.plot_tmd):
for method in (
grid.plot_grid,
grid.plot_dsd,
grid.plot_bmd,
grid.plot_sfd,
grid.plot_tmd,
):
method()
plt.close("all")

Expand Down