Skip to content

Commit

Permalink
minor formatting adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricyteach committed Oct 27, 2021
1 parent e654727 commit 0aaf0c3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions asce7/v2016/chapter29.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from types import SimpleNamespace
from asce7.common import Log
from asce7.interp import interp_dict
from ceng.interp import interp_dict


_FIG29P4D7_GCrn_nom__STR = """
Expand All @@ -24,15 +24,15 @@
FIG29P4D7_GCrn_nom_NS.GCrn_nom = ([[1.5, 0.35, 0.10],
[1.5, 0.35, 0.10],
[2.0, 0.56, 0.30],
[2.0, 0.56, 0.30],],
[2.0, 0.56, 0.30], ],
[[2.0, 0.45, 0.15],
[2.0, 0.45, 0.15],
[2.9, 0.65, 0.40],
[2.9, 0.65, 0.40],],
[2.9, 0.65, 0.40], ],
[[2.3, 0.50, 0.15],
[2.3, 0.50, 0.15],
[3.5, 0.80, 0.50],
[3.5, 0.80, 0.50],],
[3.5, 0.80, 0.50], ],
)

FIG29P4D7_GCrn_nom_DICT = interp_dict(
Expand All @@ -47,6 +47,6 @@ def fig29p4d7_GCrn_nom(zone, tilt, area):
"""Figure 29.4-7: Design Wind Loads (All Heights): Rooftop Solar Panels for Enclosed and Partially Enclosed
Buildings, Roof θ≤7°
Nominal Net Pressure Coefficients (Gcrn)nom
Nominal Net Pressure Coefficients (GCrn)nom
"""
return FIG29P4D7_GCrn_nom_DICT[zone](tilt, Log(area))
2 changes: 1 addition & 1 deletion tests/test_chapter29.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def FIG29P4D7_GCrn_nom_Zone_1_data():
[1.5, 0.35, 0.10],
[2.0, 0.56, 0.30],
[2.0, 0.56, 0.30]]
return (x_arr, y_arr, z_arr)
return x_arr, y_arr, z_arr


@pytest.fixture(scope="session", params=[
Expand Down
2 changes: 1 addition & 1 deletion tests/test_chapter7.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def FIG7P4D1_Cs_data():
[0, 15, 70, 90]]
y_arr = [1.0, 1.1, 1.2]
z_arr = [1.0, 1.0, 0, 0]
return (x_arr, y_arr, z_arr)
return x_arr, y_arr, z_arr


@pytest.fixture(scope="session", params=[
Expand Down
3 changes: 2 additions & 1 deletion tests/test_v2016.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import pytest
import asce7.v2016 as asce7


def test_Is(all_risk):
assert asce7.I_s(all_risk)


def test_Ie(all_risk):
assert asce7.I_e(all_risk)

0 comments on commit 0aaf0c3

Please sign in to comment.