smill/otko
Watch
1
0
Fork
You've already forked otko
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: adopt remaining local development state

Browse source 
Catch-all for the intermixed residue of the unpushed otko-development
work ported into this tree: combinations/console-dock/quick-guide wiring
across commands, core, services, views and tests; repo-wide ruff-format
normalization; README/CONTRIBUTING updates; and the toolbar default
(both toolbars now open in the top area, quick guide text updated).

Splitting this further would require hunk-level surgery with low
confidence; the preceding commits in this branch isolate the
self-contained features.
This commit is contained in:
smillmorel 2026-09-16 12:03:22 -04:00
commit ba783718d4
152 changed files with 3394 additions and 1651 deletions
Download patch file Download diff file Expand all files Collapse all files

96
tests/unit/test_phase8c.py
View file

@ -27,7 +27,8 @@ from otko.services.spectrum import (
# ── ResponseSpectrum schema ──────────────────────────────────────────
def test_response_spectrum_basic() -> None:
s = ResponseSpectrum(
id=1, name="EC8 type 1",
id=1,
name="EC8 type 1",
periods=[0.0001, 0.1, 0.4, 1.0, 4.0],
accelerations=[0.5, 1.0, 2.5, 1.0, 0.25],
damping_ratio=0.05,
@ -39,7 +40,8 @@ def test_response_spectrum_basic() -> None:
def test_response_spectrum_rejects_unsorted_periods() -> None:
with pytest.raises(ValueError, match="strictly increasing"):
ResponseSpectrum(
id=1, periods=[0.1, 0.5, 0.4], # 0.5 then 0.4 = not increasing
id=1,
periods=[0.1, 0.5, 0.4], # 0.5 then 0.4 = not increasing
accelerations=[1.0, 2.0, 1.5],
)
@ -47,7 +49,8 @@ def test_response_spectrum_rejects_unsorted_periods() -> None:
def test_response_spectrum_rejects_length_mismatch() -> None:
with pytest.raises(ValueError, match="length mismatch"):
ResponseSpectrum(
id=1, periods=[0.1, 0.5, 1.0],
id=1,
periods=[0.1, 0.5, 1.0],
accelerations=[1.0, 2.0],
)
@ -55,7 +58,8 @@ def test_response_spectrum_rejects_length_mismatch() -> None:
def test_response_spectrum_rejects_zero_period() -> None:
with pytest.raises(ValueError):
ResponseSpectrum(
id=1, periods=[0.0, 0.5],
id=1,
periods=[0.0, 0.5],
accelerations=[1.0, 2.0],
)
@ -63,16 +67,18 @@ def test_response_spectrum_rejects_zero_period() -> None:
# ── interp_sa ────────────────────────────────────────────────────────
def test_interp_sa_clamps_outside_table() -> None:
s = ResponseSpectrum(
id=1, periods=[0.1, 1.0],
id=1,
periods=[0.1, 1.0],
accelerations=[0.5, 0.2],
)
assert interp_sa(s, 0.05) == 0.5 # below: clamp to first
assert interp_sa(s, 5.0) == 0.2 # above: clamp to last
assert interp_sa(s, 0.05) == 0.5 # below: clamp to first
assert interp_sa(s, 5.0) == 0.2 # above: clamp to last
def test_interp_sa_linear_in_table() -> None:
s = ResponseSpectrum(
id=1, periods=[0.1, 1.1],
id=1,
periods=[0.1, 1.1],
accelerations=[1.0, 0.0],
)
# midpoint linearly = 0.5
@ -88,29 +94,26 @@ def _two_dof_modal(masses: list[float]) -> tuple[Project, ModalResults]:
"""
p = Project(
meta=ProjectMeta(name="2dof", units=UnitSystem.SI_M_N),
ndm=3, ndf=6,
ndm=3,
ndf=6,
nodes=[
Node(id=1, coords=(0, 0, 0), restraint=(True,) * 6),
Node(id=2, coords=(0, 0, 1.0),
mass=(masses[0], 0, 0, 0, 0, 0)),
Node(id=3, coords=(0, 0, 2.0),
mass=(masses[1], 0, 0, 0, 0, 0)),
Node(id=2, coords=(0, 0, 1.0), mass=(masses[0], 0, 0, 0, 0, 0)),
Node(id=3, coords=(0, 0, 2.0), mass=(masses[1], 0, 0, 0, 0, 0)),
],
sections=[ElasticSection(id=1, E=2e11, A=0.01,
Iz=1e-5, Iy=1e-5, G=8e10, J=1e-6)],
sections=[ElasticSection(id=1, E=2e11, A=0.01, Iz=1e-5, Iy=1e-5, G=8e10, J=1e-6)],
elements=[
ElasticBeamColumn(id=1, nodes=(1, 2), section_id=1),
ElasticBeamColumn(id=2, nodes=(2, 3), section_id=1),
],
)
modal = ModalResults(
case_id=1, case_name="Modal",
case_id=1,
case_name="Modal",
eigenvalues=np.array([100.0, 400.0]),
mode_shapes={
1: {2: np.array([1.0, 0, 0, 0, 0, 0]),
3: np.array([1.0, 0, 0, 0, 0, 0])},
2: {2: np.array([1.0, 0, 0, 0, 0, 0]),
3: np.array([-1.0, 0, 0, 0, 0, 0])},
1: {2: np.array([1.0, 0, 0, 0, 0, 0]), 3: np.array([1.0, 0, 0, 0, 0, 0])},
2: {2: np.array([1.0, 0, 0, 0, 0, 0]), 3: np.array([-1.0, 0, 0, 0, 0, 0])},
},
)
return p, modal
@ -124,7 +127,7 @@ def test_mass_participation_two_dof_equal_mass() -> None:
# Mode 1 (φ = (1, 1)): Γ = (1·1 + 1·1) / (1·1 + 1·1) = 1; M_eff = 1²·2 = 2
assert modes[0].participation_factor == pytest.approx(1.0)
assert modes[0].effective_mass == pytest.approx(2.0)
assert modes[0].mass_ratio == pytest.approx(1.0) # 100% of total mass
assert modes[0].mass_ratio == pytest.approx(1.0) # 100% of total mass
# Mode 2 (φ = (1, -1)): Γ = (1·1 + 1·-1) / (1 + 1) = 0; M_eff = 0
assert modes[1].participation_factor == pytest.approx(0.0)
@ -144,10 +147,8 @@ def test_srss_recovers_single_mode_when_only_one_active() -> None:
p, modal = _two_dof_modal([1.0, 1.0])
modes = mass_participation(p, modal, direction=1)
# Spectrum: constant 1.0 m/s² so Sa(T) = 1 for any T.
s = ResponseSpectrum(id=1, periods=[0.01, 100.0],
accelerations=[1.0, 1.0])
combined, _ = combine_modal_response(modes, s, modal,
direction=1, method="SRSS")
s = ResponseSpectrum(id=1, periods=[0.01, 100.0], accelerations=[1.0, 1.0])
combined, _ = combine_modal_response(modes, s, modal, direction=1, method="SRSS")
# Mode 1 only contributes (Γ_2 = 0). u_2 = Γ_1·φ_1·Sa/ω_1² = 1·1·1/100 = 0.01
assert combined[2][0] == pytest.approx(0.01)
assert combined[3][0] == pytest.approx(0.01)
@ -157,12 +158,9 @@ def test_cqc_equals_srss_for_well_separated_modes() -> None:
"""When modes are well-separated (ω₂/ω₁ = 2), CQC ≈ SRSS."""
p, modal = _two_dof_modal([1.0, 1.0])
modes = mass_participation(p, modal, direction=1)
s = ResponseSpectrum(id=1, periods=[0.01, 100.0],
accelerations=[1.0, 1.0])
srss, _ = combine_modal_response(modes, s, modal, direction=1,
method="SRSS")
cqc, _ = combine_modal_response(modes, s, modal, direction=1,
method="CQC")
s = ResponseSpectrum(id=1, periods=[0.01, 100.0], accelerations=[1.0, 1.0])
srss, _ = combine_modal_response(modes, s, modal, direction=1, method="SRSS")
cqc, _ = combine_modal_response(modes, s, modal, direction=1, method="CQC")
# Mode 2 is silent (Γ=0) so both should give identical answers.
np.testing.assert_array_almost_equal(srss[2], cqc[2], decimal=10)
@ -171,21 +169,29 @@ def test_cqc_equals_srss_for_well_separated_modes() -> None:
def test_response_spectrum_case_round_trip(tmp_path) -> None: # type: ignore[no-untyped-def]
p = Project(
meta=ProjectMeta(name="rs", units=UnitSystem.SI_M_N),
ndm=3, ndf=6,
nodes=[Node(id=1, coords=(0, 0, 0), restraint=(True,) * 6),
Node(id=2, coords=(0, 0, 3))],
sections=[ElasticSection(id=1, E=2e11, A=0.01, Iz=1e-5,
Iy=1e-5, G=8e10, J=1e-6)],
ndm=3,
ndf=6,
nodes=[Node(id=1, coords=(0, 0, 0), restraint=(True,) * 6), Node(id=2, coords=(0, 0, 3))],
sections=[ElasticSection(id=1, E=2e11, A=0.01, Iz=1e-5, Iy=1e-5, G=8e10, J=1e-6)],
elements=[ElasticBeamColumn(id=1, nodes=(1, 2), section_id=1)],
spectra=[ResponseSpectrum(
id=1, name="Demo",
periods=[0.1, 0.5, 2.0],
accelerations=[2.5, 2.5, 0.5],
)],
analyses=[ResponseSpectrumCase(
id=1, modal_case_id=2, spectrum_id=1,
direction=1, combination="CQC", damping_ratio=0.03,
)],
spectra=[
ResponseSpectrum(
id=1,
name="Demo",
periods=[0.1, 0.5, 2.0],
accelerations=[2.5, 2.5, 0.5],
)
],
analyses=[
ResponseSpectrumCase(
id=1,
modal_case_id=2,
spectrum_id=1,
direction=1,
combination="CQC",
damping_ratio=0.03,
)
],
)
path = tmp_path / "rs.osmodel"
save_project(p, path)