Skip to content

fix: change condition order to match functionality #13

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

Merged
connorferster merged 1 commit into from
Jan 19, 2026
Merged

fix: change condition order to match functionality #13

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
38 changes: 20 additions & 18 deletions src/loadbearing_wall/wall_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,17 @@ def spread_loads(self) -> None:
for load_case, dist_loads in load_cases.items():
proj[load_dir].setdefault(load_case, [])
for dist_load in dist_loads:
if should_apply_spread_angle:
if self.distribute_loads_full_length:
w0_value = dist_load[w0]
w1_value = dist_load[w1]
x0_value = dist_load[x0]
x1_value = dist_load[x1]
total_load = (w0_value + w1_value) / 2 * (x1_value - x0_value)
w_full = total_load / self.length
proj[load_dir][load_case].append(
{w0: w_full, w1: w_full, x0: 0.0, x1: self.length}
)
elif should_apply_spread_angle:
projected_load = geom.apply_spread_angle(
self.height,
self.length,
Expand All @@ -192,16 +202,6 @@ def spread_loads(self) -> None:
x1: projected_load[3],
}
)
elif self.distribute_loads_full_length:
w0_value = dist_load[w0]
w1_value = dist_load[w1]
x0_value = dist_load[x0]
x1_value = dist_load[x1]
total_load = (w0_value + w1_value) / 2 * (x1_value - x0_value)
w_full = total_load / self.length
proj[load_dir][load_case].append(
{w0: w_full, w1: w_full, x0: 0.0, x1: self.length}
)
else:
proj[load_dir][load_case].append(dist_load)

Expand All @@ -219,7 +219,14 @@ def spread_loads(self) -> None:
for load_case, point_loads in load_cases.items():
proj[load_dir].setdefault(load_case, [])
for point_load in point_loads:
if should_apply_spread_angle:
if self.distribute_loads_full_length:
total_load = point_load[p]
w_full = total_load / self.length
proj[load_dir][load_case].append(
{w0: w_full, w1: w_full, x0: 0.0, x1: self.length}
)

elif should_apply_spread_angle:
projected_load = geom.apply_spread_angle(
self.height,
self.length,
Expand All @@ -235,12 +242,7 @@ def spread_loads(self) -> None:
x1: projected_load[3],
}
)
elif self.distribute_loads_full_length:
total_load = point_load[p]
w_full = total_load / self.length
proj[load_dir][load_case].append(
{w0: w_full, w1: w_full, x0: 0.0, x1: self.length}
)

else:
projected_load = geom.apply_minimum_width(
point_load[p],
Expand Down