@theerapat-s28/ts-structural-eng-tools 1.5.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +57 -6
- package/dist/core/constants/frame.constant.d.ts +19 -0
- package/dist/core/constants/frame.constant.js +23 -0
- package/dist/core/constants/frame.constant.js.map +1 -0
- package/dist/core/errors/frame-analysis.error.d.ts +36 -0
- package/dist/core/errors/frame-analysis.error.js +86 -0
- package/dist/core/errors/frame-analysis.error.js.map +1 -0
- package/dist/core/index.d.ts +4 -0
- package/dist/core/index.js +13 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/types/section-properties.type.d.ts +13 -0
- package/dist/core/types/section-properties.type.js +3 -0
- package/dist/core/types/section-properties.type.js.map +1 -0
- package/dist/esm/core/constants/frame.constant.js +20 -0
- package/dist/esm/core/constants/frame.constant.js.map +1 -0
- package/dist/esm/core/constants/rc.constant.js +63 -0
- package/dist/esm/core/constants/rc.constant.js.map +1 -0
- package/dist/esm/core/errors/frame-analysis.error.js +82 -0
- package/dist/esm/core/errors/frame-analysis.error.js.map +1 -0
- package/dist/esm/core/errors/rc-design.error.js +64 -0
- package/dist/esm/core/errors/rc-design.error.js.map +1 -0
- package/dist/esm/core/index.js +9 -0
- package/dist/esm/core/index.js.map +1 -0
- package/dist/esm/core/types/output-message.type.js +2 -0
- package/dist/esm/core/types/output-message.type.js.map +1 -0
- package/dist/esm/core/types/plate-jacketing.type.js +18 -0
- package/dist/esm/core/types/plate-jacketing.type.js.map +1 -0
- package/dist/esm/core/types/rc-beam.type.js +11 -0
- package/dist/esm/core/types/rc-beam.type.js.map +1 -0
- package/dist/esm/core/types/section-properties.type.js +2 -0
- package/dist/esm/core/types/section-properties.type.js.map +1 -0
- package/dist/esm/core/types/unit.type.js +2 -0
- package/dist/esm/core/types/unit.type.js.map +1 -0
- package/dist/esm/fea/frame/area/area-geometry.js +132 -0
- package/dist/esm/fea/frame/area/area-geometry.js.map +1 -0
- package/dist/esm/fea/frame/area/distribute-area-loads.js +267 -0
- package/dist/esm/fea/frame/area/distribute-area-loads.js.map +1 -0
- package/dist/esm/fea/frame/area/edge-members.js +62 -0
- package/dist/esm/fea/frame/area/edge-members.js.map +1 -0
- package/dist/esm/fea/frame/elements/beam-3d-stiffness.js +84 -0
- package/dist/esm/fea/frame/elements/beam-3d-stiffness.js.map +1 -0
- package/dist/esm/fea/frame/elements/fixed-end-forces.js +88 -0
- package/dist/esm/fea/frame/elements/fixed-end-forces.js.map +1 -0
- package/dist/esm/fea/frame/elements/static-condensation.js +55 -0
- package/dist/esm/fea/frame/elements/static-condensation.js.map +1 -0
- package/dist/esm/fea/frame/index.js +7 -0
- package/dist/esm/fea/frame/index.js.map +1 -0
- package/dist/esm/fea/frame/post/demand-envelope.js +97 -0
- package/dist/esm/fea/frame/post/demand-envelope.js.map +1 -0
- package/dist/esm/fea/frame/post/envelope.js +59 -0
- package/dist/esm/fea/frame/post/envelope.js.map +1 -0
- package/dist/esm/fea/frame/post/member-diagram.js +375 -0
- package/dist/esm/fea/frame/post/member-diagram.js.map +1 -0
- package/dist/esm/fea/frame/post/present-state.js +106 -0
- package/dist/esm/fea/frame/post/present-state.js.map +1 -0
- package/dist/esm/fea/frame/solver/analyze-frame.js +131 -0
- package/dist/esm/fea/frame/solver/analyze-frame.js.map +1 -0
- package/dist/esm/fea/frame/solver/boundary-conditions.js +33 -0
- package/dist/esm/fea/frame/solver/boundary-conditions.js.map +1 -0
- package/dist/esm/fea/frame/solver/combinations.js +69 -0
- package/dist/esm/fea/frame/solver/combinations.js.map +1 -0
- package/dist/esm/fea/frame/solver/frame-system.js +122 -0
- package/dist/esm/fea/frame/solver/frame-system.js.map +1 -0
- package/dist/esm/fea/frame/solver/global-assembly.js +27 -0
- package/dist/esm/fea/frame/solver/global-assembly.js.map +1 -0
- package/dist/esm/fea/frame/solver/load-case-solver.js +133 -0
- package/dist/esm/fea/frame/solver/load-case-solver.js.map +1 -0
- package/dist/esm/fea/frame/transformation/coordinate-transform.js +71 -0
- package/dist/esm/fea/frame/transformation/coordinate-transform.js.map +1 -0
- package/dist/esm/fea/frame/types/model.type.js +2 -0
- package/dist/esm/fea/frame/types/model.type.js.map +1 -0
- package/dist/esm/fea/frame/types/results.type.js +2 -0
- package/dist/esm/fea/frame/types/results.type.js.map +1 -0
- package/dist/esm/fea/frame/validation/validate-model.js +389 -0
- package/dist/esm/fea/frame/validation/validate-model.js.map +1 -0
- package/dist/esm/fea/index.js +3 -0
- package/dist/esm/fea/index.js.map +1 -0
- package/dist/esm/index.js +10 -0
- package/dist/esm/index.js.map +1 -0
- package/dist/esm/package.json +1 -0
- package/dist/esm/rc/general.js +32 -0
- package/dist/esm/rc/general.js.map +1 -0
- package/dist/esm/rc/index.js +5 -0
- package/dist/esm/rc/index.js.map +1 -0
- package/dist/esm/rc/rc-bar-layout.js +89 -0
- package/dist/esm/rc/rc-bar-layout.js.map +1 -0
- package/dist/esm/rc/rc-beam-design.js +320 -0
- package/dist/esm/rc/rc-beam-design.js.map +1 -0
- package/dist/esm/rc/rc-section-properties.js +55 -0
- package/dist/esm/rc/rc-section-properties.js.map +1 -0
- package/dist/esm/strengthening/index.js +4 -0
- package/dist/esm/strengthening/index.js.map +1 -0
- package/dist/esm/strengthening/rc-beam-plate-interface-bolts.js +338 -0
- package/dist/esm/strengthening/rc-beam-plate-interface-bolts.js.map +1 -0
- package/dist/esm/strengthening/rc-beam-side-plate-shear.js +381 -0
- package/dist/esm/strengthening/rc-beam-side-plate-shear.js.map +1 -0
- package/dist/esm/strengthening/rc-beam-steel-plate-jacketing.js +90 -0
- package/dist/esm/strengthening/rc-beam-steel-plate-jacketing.js.map +1 -0
- package/dist/esm/utils/index.js +5 -0
- package/dist/esm/utils/index.js.map +1 -0
- package/dist/esm/utils/math.js +30 -0
- package/dist/esm/utils/math.js.map +1 -0
- package/dist/esm/utils/matrix.js +145 -0
- package/dist/esm/utils/matrix.js.map +1 -0
- package/dist/esm/utils/merge-warning.js +11 -0
- package/dist/esm/utils/merge-warning.js.map +1 -0
- package/dist/esm/utils/skyline.js +151 -0
- package/dist/esm/utils/skyline.js.map +1 -0
- package/dist/fea/frame/area/area-geometry.d.ts +56 -0
- package/dist/fea/frame/area/area-geometry.js +142 -0
- package/dist/fea/frame/area/area-geometry.js.map +1 -0
- package/dist/fea/frame/area/distribute-area-loads.d.ts +30 -0
- package/dist/fea/frame/area/distribute-area-loads.js +272 -0
- package/dist/fea/frame/area/distribute-area-loads.js.map +1 -0
- package/dist/fea/frame/area/edge-members.d.ts +25 -0
- package/dist/fea/frame/area/edge-members.js +67 -0
- package/dist/fea/frame/area/edge-members.js.map +1 -0
- package/dist/fea/frame/elements/beam-3d-stiffness.d.ts +29 -0
- package/dist/fea/frame/elements/beam-3d-stiffness.js +90 -0
- package/dist/fea/frame/elements/beam-3d-stiffness.js.map +1 -0
- package/dist/fea/frame/elements/fixed-end-forces.d.ts +36 -0
- package/dist/fea/frame/elements/fixed-end-forces.js +93 -0
- package/dist/fea/frame/elements/fixed-end-forces.js.map +1 -0
- package/dist/fea/frame/elements/static-condensation.d.ts +19 -0
- package/dist/fea/frame/elements/static-condensation.js +59 -0
- package/dist/fea/frame/elements/static-condensation.js.map +1 -0
- package/dist/fea/frame/index.d.ts +10 -0
- package/dist/fea/frame/index.js +18 -0
- package/dist/fea/frame/index.js.map +1 -0
- package/dist/fea/frame/post/demand-envelope.d.ts +36 -0
- package/dist/fea/frame/post/demand-envelope.js +101 -0
- package/dist/fea/frame/post/demand-envelope.js.map +1 -0
- package/dist/fea/frame/post/envelope.d.ts +8 -0
- package/dist/fea/frame/post/envelope.js +63 -0
- package/dist/fea/frame/post/envelope.js.map +1 -0
- package/dist/fea/frame/post/member-diagram.d.ts +26 -0
- package/dist/fea/frame/post/member-diagram.js +379 -0
- package/dist/fea/frame/post/member-diagram.js.map +1 -0
- package/dist/fea/frame/post/present-state.d.ts +19 -0
- package/dist/fea/frame/post/present-state.js +111 -0
- package/dist/fea/frame/post/present-state.js.map +1 -0
- package/dist/fea/frame/solver/analyze-frame.d.ts +70 -0
- package/dist/fea/frame/solver/analyze-frame.js +136 -0
- package/dist/fea/frame/solver/analyze-frame.js.map +1 -0
- package/dist/fea/frame/solver/boundary-conditions.d.ts +14 -0
- package/dist/fea/frame/solver/boundary-conditions.js +37 -0
- package/dist/fea/frame/solver/boundary-conditions.js.map +1 -0
- package/dist/fea/frame/solver/combinations.d.ts +11 -0
- package/dist/fea/frame/solver/combinations.js +73 -0
- package/dist/fea/frame/solver/combinations.js.map +1 -0
- package/dist/fea/frame/solver/frame-system.d.ts +42 -0
- package/dist/fea/frame/solver/frame-system.js +126 -0
- package/dist/fea/frame/solver/frame-system.js.map +1 -0
- package/dist/fea/frame/solver/global-assembly.d.ts +17 -0
- package/dist/fea/frame/solver/global-assembly.js +33 -0
- package/dist/fea/frame/solver/global-assembly.js.map +1 -0
- package/dist/fea/frame/solver/load-case-solver.d.ts +34 -0
- package/dist/fea/frame/solver/load-case-solver.js +138 -0
- package/dist/fea/frame/solver/load-case-solver.js.map +1 -0
- package/dist/fea/frame/transformation/coordinate-transform.d.ts +21 -0
- package/dist/fea/frame/transformation/coordinate-transform.js +76 -0
- package/dist/fea/frame/transformation/coordinate-transform.js.map +1 -0
- package/dist/fea/frame/types/model.type.d.ts +170 -0
- package/dist/fea/frame/types/model.type.js +3 -0
- package/dist/fea/frame/types/model.type.js.map +1 -0
- package/dist/fea/frame/types/results.type.d.ts +134 -0
- package/dist/fea/frame/types/results.type.js +3 -0
- package/dist/fea/frame/types/results.type.js.map +1 -0
- package/dist/fea/frame/validation/validate-model.d.ts +18 -0
- package/dist/fea/frame/validation/validate-model.js +395 -0
- package/dist/fea/frame/validation/validate-model.js.map +1 -0
- package/dist/fea/index.d.ts +1 -0
- package/dist/fea/index.js +19 -0
- package/dist/fea/index.js.map +1 -0
- package/dist/index.d.ts +8 -4
- package/dist/index.js +37 -1
- package/dist/index.js.map +1 -1
- package/dist/rc/index.d.ts +2 -0
- package/dist/rc/index.js +3 -1
- package/dist/rc/index.js.map +1 -1
- package/dist/rc/rc-section-properties.d.ts +35 -0
- package/dist/rc/rc-section-properties.js +59 -0
- package/dist/rc/rc-section-properties.js.map +1 -0
- package/dist/utils/index.d.ts +4 -0
- package/dist/utils/index.js +19 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/matrix.d.ts +45 -0
- package/dist/utils/matrix.js +157 -0
- package/dist/utils/matrix.js.map +1 -0
- package/dist/utils/skyline.d.ts +49 -0
- package/dist/utils/skyline.js +161 -0
- package/dist/utils/skyline.js.map +1 -0
- package/package.json +28 -4
|
@@ -0,0 +1,389 @@
|
|
|
1
|
+
import { FrameAnalysisError, FrameErrors, } from "../../../core/errors/frame-analysis.error.js";
|
|
2
|
+
import { AREA_GEOMETRY_TOLERANCE } from "../../../core/constants/frame.constant.js";
|
|
3
|
+
import { areaPlane, edgeDirection, isRectangle, resolveAreaSupports, } from "../area/area-geometry.js";
|
|
4
|
+
import { edgeMemberChain, memberAdjacency } from "../area/edge-members.js";
|
|
5
|
+
import { beam3dLocalStiffnessRightHanded } from "../elements/beam-3d-stiffness.js";
|
|
6
|
+
import { condenseMember } from "../elements/static-condensation.js";
|
|
7
|
+
import { resolveCombinations } from "../solver/combinations.js";
|
|
8
|
+
const DOF_KEYS = ["ux", "uy", "uz", "rx", "ry", "rz"];
|
|
9
|
+
const NODAL_LOAD_KEYS = ["fx", "fy", "fz", "mx", "my", "mz"];
|
|
10
|
+
const SECTION_KEYS = ["E", "G", "A", "I22", "I33", "J"];
|
|
11
|
+
const RELEASE_KEYS = ["u1", "u2", "u3", "r1", "r2", "r3"];
|
|
12
|
+
const DIRECTIONS = new Set(["1", "2", "3", "X", "Y", "Z"]);
|
|
13
|
+
const AREA_DIRECTIONS = {
|
|
14
|
+
"3": "normal",
|
|
15
|
+
X: [1, 0, 0],
|
|
16
|
+
Y: [0, 1, 0],
|
|
17
|
+
Z: [0, 0, 1],
|
|
18
|
+
};
|
|
19
|
+
const AREA_DISTRIBUTIONS = new Set(["twoWay", "oneWay", "cantilever"]);
|
|
20
|
+
const LOAD_CASE_TYPES = new Set([
|
|
21
|
+
"dead",
|
|
22
|
+
"superDead",
|
|
23
|
+
"live",
|
|
24
|
+
"roofLive",
|
|
25
|
+
"snow",
|
|
26
|
+
"wind",
|
|
27
|
+
"seismic",
|
|
28
|
+
"other",
|
|
29
|
+
]);
|
|
30
|
+
const isFiniteNumber = (v) => typeof v === "number" && Number.isFinite(v);
|
|
31
|
+
const describe = (d) => {
|
|
32
|
+
const parts = [];
|
|
33
|
+
if (d.nodeId !== undefined)
|
|
34
|
+
parts.push(`node "${String(d.nodeId)}"`);
|
|
35
|
+
if (d.memberId !== undefined)
|
|
36
|
+
parts.push(`member "${String(d.memberId)}"`);
|
|
37
|
+
if (d.areaId !== undefined)
|
|
38
|
+
parts.push(`area "${String(d.areaId)}"`);
|
|
39
|
+
if (d.edge !== undefined)
|
|
40
|
+
parts.push(`edge ${d.edge}`);
|
|
41
|
+
if (d.loadCaseId !== undefined)
|
|
42
|
+
parts.push(`load case "${d.loadCaseId}"`);
|
|
43
|
+
if (d.combinationId !== undefined)
|
|
44
|
+
parts.push(`combination "${d.combinationId}"`);
|
|
45
|
+
if (d.field !== undefined)
|
|
46
|
+
parts.push(`field "${d.field}"`);
|
|
47
|
+
if (d.dof !== undefined)
|
|
48
|
+
parts.push(`DOF ${d.dof}`);
|
|
49
|
+
return parts.length > 0 ? ` [${parts.join(", ")}]` : "";
|
|
50
|
+
};
|
|
51
|
+
/** Builds an issue whose message names where the problem is. */
|
|
52
|
+
export const frameIssue = (std, details = {}) => ({ code: std.code, message: std.message + describe(details), details });
|
|
53
|
+
/** Throws the first issue as a `FrameAnalysisError` carrying all of them. */
|
|
54
|
+
export const throwIssues = (issues) => {
|
|
55
|
+
const first = issues[0];
|
|
56
|
+
throw new FrameAnalysisError({ code: first.code, message: first.message }, first.details, issues);
|
|
57
|
+
};
|
|
58
|
+
const releasedIndices = (release, offset) => RELEASE_KEYS.flatMap((key, k) => (release?.[key] ? [offset + k] : []));
|
|
59
|
+
/**
|
|
60
|
+
* Checks a frame model without analysing it and returns every problem found, each with the
|
|
61
|
+
* node, member, load case, combination and field it concerns. An empty array means the
|
|
62
|
+
* model can be analysed, apart from an unstable structure (304), which only the solve detects.
|
|
63
|
+
*
|
|
64
|
+
* @param model - The model to check
|
|
65
|
+
* @returns Every problem found (codes 301–303 and 305–317), in model order
|
|
66
|
+
*/
|
|
67
|
+
export const validateFrameModel = (model) => {
|
|
68
|
+
const issues = [];
|
|
69
|
+
const add = (std, details = {}) => issues.push(frameIssue(std, details));
|
|
70
|
+
const nodes = Array.isArray(model.nodes) ? model.nodes : [];
|
|
71
|
+
const members = Array.isArray(model.members) ? model.members : [];
|
|
72
|
+
const restraints = Array.isArray(model.restraints) ? model.restraints : [];
|
|
73
|
+
const loadCases = Array.isArray(model.loadCases) ? model.loadCases : [];
|
|
74
|
+
const combinations = Array.isArray(model.combinations) ? model.combinations : [];
|
|
75
|
+
const nodalLoads = Array.isArray(model.nodalLoads) ? model.nodalLoads : [];
|
|
76
|
+
const memberLoads = Array.isArray(model.memberLoads) ? model.memberLoads : [];
|
|
77
|
+
const areas = Array.isArray(model.areas) ? model.areas : [];
|
|
78
|
+
const areaLoads = Array.isArray(model.areaLoads) ? model.areaLoads : [];
|
|
79
|
+
// ---- Ids -------------------------------------------------------------------------
|
|
80
|
+
const duplicates = (ids) => ids.filter((id, i) => ids.indexOf(id) !== i);
|
|
81
|
+
for (const nodeId of new Set(duplicates(nodes.map((n) => n.id)))) {
|
|
82
|
+
add(FrameErrors.DUPLICATE_ID, { nodeId, field: "id" });
|
|
83
|
+
}
|
|
84
|
+
for (const memberId of new Set(duplicates(members.map((m) => m.id)))) {
|
|
85
|
+
add(FrameErrors.DUPLICATE_ID, { memberId, field: "id" });
|
|
86
|
+
}
|
|
87
|
+
for (const areaId of new Set(duplicates(areas.map((a) => a.id)))) {
|
|
88
|
+
add(FrameErrors.DUPLICATE_ID, { areaId, field: "id" });
|
|
89
|
+
}
|
|
90
|
+
for (const nodeId of new Set(duplicates(restraints.map((r) => r.nodeId)))) {
|
|
91
|
+
add(FrameErrors.DUPLICATE_ID, { nodeId, field: "restraints" });
|
|
92
|
+
}
|
|
93
|
+
const caseIds = new Set(loadCases.map((c) => c.id));
|
|
94
|
+
const combinationIds = new Set(combinations.map((c) => c.id));
|
|
95
|
+
for (const id of new Set(duplicates([...loadCases.map((c) => c.id), ...combinations.map((c) => c.id)]))) {
|
|
96
|
+
add(FrameErrors.DUPLICATE_ID, combinationIds.has(id) && !caseIds.has(id) ? { combinationId: id } : { loadCaseId: id });
|
|
97
|
+
}
|
|
98
|
+
// ---- Nodes -----------------------------------------------------------------------
|
|
99
|
+
const nodeById = new Map();
|
|
100
|
+
const validNode = new Set();
|
|
101
|
+
for (const node of nodes) {
|
|
102
|
+
nodeById.set(node.id, node);
|
|
103
|
+
let ok = true;
|
|
104
|
+
for (const field of ["x", "y", "z"]) {
|
|
105
|
+
if (!isFiniteNumber(node[field])) {
|
|
106
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { nodeId: node.id, field });
|
|
107
|
+
ok = false;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
if (ok)
|
|
111
|
+
validNode.add(node.id);
|
|
112
|
+
}
|
|
113
|
+
// ---- Members ---------------------------------------------------------------------
|
|
114
|
+
const memberLength = new Map(); // only for members whose geometry is valid
|
|
115
|
+
for (const member of members) {
|
|
116
|
+
const at = { memberId: member.id };
|
|
117
|
+
let geometryOk = true;
|
|
118
|
+
for (const field of ["startNodeId", "endNodeId"]) {
|
|
119
|
+
if (!nodeById.has(member[field])) {
|
|
120
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { ...at, field });
|
|
121
|
+
geometryOk = false;
|
|
122
|
+
}
|
|
123
|
+
else if (!validNode.has(member[field])) {
|
|
124
|
+
geometryOk = false; // reported on the node
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
const section = member.section ?? {};
|
|
128
|
+
let sectionOk = true;
|
|
129
|
+
for (const field of SECTION_KEYS) {
|
|
130
|
+
const v = section[field];
|
|
131
|
+
if (!isFiniteNumber(v) || v <= 0) {
|
|
132
|
+
add(FrameErrors.INVALID_SECTION_PROPERTIES, { ...at, field });
|
|
133
|
+
sectionOk = false;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
if (section.unitWeight !== undefined &&
|
|
137
|
+
(!isFiniteNumber(section.unitWeight) || section.unitWeight < 0)) {
|
|
138
|
+
add(FrameErrors.INVALID_SECTION_PROPERTIES, { ...at, field: "unitWeight" });
|
|
139
|
+
}
|
|
140
|
+
if (member.angle !== undefined && !isFiniteNumber(member.angle)) {
|
|
141
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "angle" });
|
|
142
|
+
}
|
|
143
|
+
if (!geometryOk)
|
|
144
|
+
continue;
|
|
145
|
+
const a = nodeById.get(member.startNodeId);
|
|
146
|
+
const b = nodeById.get(member.endNodeId);
|
|
147
|
+
const L = Math.hypot(b.x - a.x, b.y - a.y, b.z - a.z);
|
|
148
|
+
if (!(L > 0)) {
|
|
149
|
+
add(FrameErrors.ZERO_LENGTH_MEMBER, at);
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
memberLength.set(member.id, L);
|
|
153
|
+
const released = [
|
|
154
|
+
...releasedIndices(member.releases?.start, 0),
|
|
155
|
+
...releasedIndices(member.releases?.end, 6),
|
|
156
|
+
];
|
|
157
|
+
if (sectionOk && released.length > 0) {
|
|
158
|
+
const { E, G, A, I22, I33, J } = section;
|
|
159
|
+
try {
|
|
160
|
+
condenseMember(beam3dLocalStiffnessRightHanded(E, G, A, I22, I33, J, L), released);
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
add(FrameErrors.INVALID_RELEASE, at);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
// ---- Restraints ------------------------------------------------------------------
|
|
168
|
+
let anyRestrained = false;
|
|
169
|
+
for (const restraint of restraints) {
|
|
170
|
+
if (!nodeById.has(restraint.nodeId)) {
|
|
171
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { nodeId: restraint.nodeId, field: "restraints" });
|
|
172
|
+
}
|
|
173
|
+
for (const field of DOF_KEYS) {
|
|
174
|
+
const v = restraint[field];
|
|
175
|
+
if (v === undefined || v === false)
|
|
176
|
+
continue;
|
|
177
|
+
if (v === true) {
|
|
178
|
+
anyRestrained = true;
|
|
179
|
+
}
|
|
180
|
+
else if (isFiniteNumber(v) && v >= 0) {
|
|
181
|
+
if (v > 0)
|
|
182
|
+
anyRestrained = true;
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { nodeId: restraint.nodeId, field });
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
if (!anyRestrained)
|
|
190
|
+
add(FrameErrors.NO_RESTRAINTS);
|
|
191
|
+
// ---- Load cases ------------------------------------------------------------------
|
|
192
|
+
if (loadCases.length === 0)
|
|
193
|
+
add(FrameErrors.NO_LOAD_CASES);
|
|
194
|
+
for (const loadCase of loadCases) {
|
|
195
|
+
const at = { loadCaseId: loadCase.id };
|
|
196
|
+
if (loadCase.type !== undefined && !LOAD_CASE_TYPES.has(loadCase.type)) {
|
|
197
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "type" });
|
|
198
|
+
}
|
|
199
|
+
if (loadCase.selfWeight === undefined)
|
|
200
|
+
continue;
|
|
201
|
+
if (!isFiniteNumber(loadCase.selfWeight)) {
|
|
202
|
+
add(FrameErrors.INVALID_LOAD_FACTOR, { ...at, field: "selfWeight" });
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
if (loadCase.selfWeight !== 0) {
|
|
206
|
+
for (const member of members) {
|
|
207
|
+
if (member.section?.unitWeight === undefined) {
|
|
208
|
+
add(FrameErrors.MISSING_UNIT_WEIGHT, { ...at, memberId: member.id, field: "unitWeight" });
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
// ---- Loads -----------------------------------------------------------------------
|
|
214
|
+
for (const load of nodalLoads) {
|
|
215
|
+
const at = { loadCaseId: load.loadCase, nodeId: load.nodeId };
|
|
216
|
+
if (!caseIds.has(load.loadCase))
|
|
217
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, field: "loadCase" });
|
|
218
|
+
if (!nodeById.has(load.nodeId))
|
|
219
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { ...at, field: "nodeId" });
|
|
220
|
+
for (const field of NODAL_LOAD_KEYS) {
|
|
221
|
+
if (load[field] !== undefined && !isFiniteNumber(load[field])) {
|
|
222
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field });
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
for (const load of memberLoads) {
|
|
227
|
+
const at = { loadCaseId: load.loadCase, memberId: load.memberId };
|
|
228
|
+
if (!caseIds.has(load.loadCase))
|
|
229
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, field: "loadCase" });
|
|
230
|
+
const memberKnown = members.some((m) => m.id === load.memberId);
|
|
231
|
+
if (!memberKnown)
|
|
232
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { ...at, field: "memberId" });
|
|
233
|
+
if (load.type !== "torque" && !DIRECTIONS.has(load.direction))
|
|
234
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "direction" });
|
|
235
|
+
const L = memberLength.get(load.memberId);
|
|
236
|
+
if (load.type === "udl" || load.type === "trapezoidal" || load.type === "torque") {
|
|
237
|
+
const intensities = load.type === "udl"
|
|
238
|
+
? { w: load.w }
|
|
239
|
+
: load.type === "trapezoidal"
|
|
240
|
+
? { w1: load.w1, w2: load.w2 }
|
|
241
|
+
: { t: load.t };
|
|
242
|
+
const extent = { start: load.start, end: load.end };
|
|
243
|
+
let ok = true;
|
|
244
|
+
for (const [field, v] of [...Object.entries(intensities), ...Object.entries(extent)]) {
|
|
245
|
+
if ((field in intensities || v !== undefined) && !isFiniteNumber(v)) {
|
|
246
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field });
|
|
247
|
+
ok = false;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
if (ok && L !== undefined) {
|
|
251
|
+
const start = load.start ?? 0;
|
|
252
|
+
const end = load.end ?? L;
|
|
253
|
+
if (!(start >= 0 && end <= L && start < end))
|
|
254
|
+
add(FrameErrors.LOAD_OUTSIDE_MEMBER, at);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
else if (load.type === "point") {
|
|
258
|
+
let ok = true;
|
|
259
|
+
for (const field of ["P", "a"]) {
|
|
260
|
+
if (!isFiniteNumber(load[field])) {
|
|
261
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field });
|
|
262
|
+
ok = false;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
if (ok && L !== undefined && !(load.a >= 0 && load.a <= L)) {
|
|
266
|
+
add(FrameErrors.LOAD_OUTSIDE_MEMBER, at);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
270
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "type" });
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
// ---- Areas -----------------------------------------------------------------------
|
|
274
|
+
const adjacency = memberAdjacency(members.filter((m) => memberLength.has(m.id)));
|
|
275
|
+
const position = (id) => {
|
|
276
|
+
const node = nodeById.get(id);
|
|
277
|
+
return [node.x, node.y, node.z];
|
|
278
|
+
};
|
|
279
|
+
// only for areas whose geometry and supports are valid
|
|
280
|
+
const areaInfo = new Map();
|
|
281
|
+
for (const area of areas) {
|
|
282
|
+
const at = { areaId: area.id };
|
|
283
|
+
const distributionOk = AREA_DISTRIBUTIONS.has(area.distribution);
|
|
284
|
+
if (!distributionOk)
|
|
285
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "distribution" });
|
|
286
|
+
const ids = Array.isArray(area.nodeIds) ? area.nodeIds : [];
|
|
287
|
+
if (ids.length !== 3 && ids.length !== 4) {
|
|
288
|
+
add(FrameErrors.INVALID_AREA_GEOMETRY, { ...at, field: "nodeIds" });
|
|
289
|
+
continue;
|
|
290
|
+
}
|
|
291
|
+
if (ids.some((id) => !nodeById.has(id))) {
|
|
292
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { ...at, field: "nodeIds" });
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
if (!ids.every((id) => validNode.has(id)))
|
|
296
|
+
continue; // reported on the node
|
|
297
|
+
const plane = areaPlane(ids.map(position));
|
|
298
|
+
if ("problem" in plane) {
|
|
299
|
+
add(FrameErrors.INVALID_AREA_GEOMETRY, { ...at, field: "nodeIds" });
|
|
300
|
+
continue;
|
|
301
|
+
}
|
|
302
|
+
if (!distributionOk)
|
|
303
|
+
continue;
|
|
304
|
+
if (area.distribution === "cantilever" && !isRectangle(plane)) {
|
|
305
|
+
add(FrameErrors.INVALID_AREA_GEOMETRY, { ...at, field: "nodeIds" });
|
|
306
|
+
continue;
|
|
307
|
+
}
|
|
308
|
+
const supports = resolveAreaSupports(plane, area.distribution, area.supportEdges);
|
|
309
|
+
if (!supports) {
|
|
310
|
+
add(FrameErrors.INVALID_AREA_DISTRIBUTION, { ...at, field: "supportEdges" });
|
|
311
|
+
continue;
|
|
312
|
+
}
|
|
313
|
+
for (const edge of supports.loadedEdges) {
|
|
314
|
+
const chain = edgeMemberChain(ids[edge], ids[(edge + 1) % ids.length], position, adjacency);
|
|
315
|
+
if (!chain)
|
|
316
|
+
add(FrameErrors.AREA_EDGE_UNSUPPORTED, { ...at, edge });
|
|
317
|
+
}
|
|
318
|
+
areaInfo.set(area.id, { area, plane, supports });
|
|
319
|
+
}
|
|
320
|
+
const areaIds = new Set(areas.map((a) => a.id));
|
|
321
|
+
for (const load of areaLoads) {
|
|
322
|
+
const at = { loadCaseId: load.loadCase, areaId: load.areaId };
|
|
323
|
+
if (!caseIds.has(load.loadCase))
|
|
324
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, field: "loadCase" });
|
|
325
|
+
if (!areaIds.has(load.areaId)) {
|
|
326
|
+
add(FrameErrors.UNKNOWN_NODE_REFERENCE, { ...at, field: "areaId" });
|
|
327
|
+
}
|
|
328
|
+
const direction = Object.prototype.hasOwnProperty.call(AREA_DIRECTIONS, load.direction)
|
|
329
|
+
? AREA_DIRECTIONS[load.direction]
|
|
330
|
+
: undefined;
|
|
331
|
+
if (!direction)
|
|
332
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "direction" });
|
|
333
|
+
if (!isFiniteNumber(load.q))
|
|
334
|
+
add(FrameErrors.INVALID_INPUT_VALUE, { ...at, field: "q" });
|
|
335
|
+
// A cantilever carries its load as a line load plus a torque about the support edge; a
|
|
336
|
+
// component along that edge would also need a distributed moment about the normal.
|
|
337
|
+
const info = areaInfo.get(load.areaId);
|
|
338
|
+
if (direction && direction !== "normal" && info?.area.distribution === "cantilever") {
|
|
339
|
+
const t = edgeDirection(info.plane, info.supports.loadedEdges[0]);
|
|
340
|
+
const along = direction[0] * t[0] + direction[1] * t[1] + direction[2] * t[2];
|
|
341
|
+
if (Math.abs(along) > AREA_GEOMETRY_TOLERANCE) {
|
|
342
|
+
add(FrameErrors.INVALID_AREA_DISTRIBUTION, { ...at, field: "direction" });
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
// ---- Combinations ----------------------------------------------------------------
|
|
347
|
+
let referencesOk = true;
|
|
348
|
+
for (const combination of combinations) {
|
|
349
|
+
const at = { combinationId: combination.id };
|
|
350
|
+
if (!Array.isArray(combination.terms) || combination.terms.length === 0) {
|
|
351
|
+
add(FrameErrors.INVALID_LOAD_FACTOR, { ...at, field: "terms" });
|
|
352
|
+
referencesOk = false;
|
|
353
|
+
continue;
|
|
354
|
+
}
|
|
355
|
+
for (const term of combination.terms) {
|
|
356
|
+
if (!isFiniteNumber(term.factor)) {
|
|
357
|
+
add(FrameErrors.INVALID_LOAD_FACTOR, { ...at, field: "factor" });
|
|
358
|
+
referencesOk = false;
|
|
359
|
+
}
|
|
360
|
+
const caseRef = "case" in term ? term.case : undefined;
|
|
361
|
+
const comboRef = "combination" in term ? term.combination : undefined;
|
|
362
|
+
if ((caseRef === undefined) === (comboRef === undefined)) {
|
|
363
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, field: "terms" });
|
|
364
|
+
referencesOk = false;
|
|
365
|
+
}
|
|
366
|
+
else if (caseRef !== undefined && !caseIds.has(caseRef)) {
|
|
367
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, loadCaseId: caseRef, field: "case" });
|
|
368
|
+
referencesOk = false;
|
|
369
|
+
}
|
|
370
|
+
else if (comboRef !== undefined && !combinationIds.has(comboRef)) {
|
|
371
|
+
add(FrameErrors.UNKNOWN_LOAD_CASE, { ...at, field: "combination" });
|
|
372
|
+
referencesOk = false;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
if (referencesOk && combinations.length > 0) {
|
|
377
|
+
try {
|
|
378
|
+
resolveCombinations(combinations, caseIds);
|
|
379
|
+
}
|
|
380
|
+
catch (e) {
|
|
381
|
+
if (e instanceof FrameAnalysisError)
|
|
382
|
+
issues.push({ ...frameIssue(e, e.details) });
|
|
383
|
+
else
|
|
384
|
+
throw e;
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
return issues;
|
|
388
|
+
};
|
|
389
|
+
//# sourceMappingURL=validate-model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-model.js","sourceRoot":"","sources":["../../../../../src/fea/frame/validation/validate-model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,GAGZ,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,OAAO,EACL,SAAS,EACT,aAAa,EACb,WAAW,EACX,mBAAmB,GAIpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAU7D,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAU,CAAC;AAC/D,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAU,CAAC;AACtE,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAU,CAAC;AACjE,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAU,CAAC;AACnE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAC3D,MAAM,eAAe,GAAoC;IACvD,GAAG,EAAE,QAAQ;IACb,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACZ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACZ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CACb,CAAC;AACF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AACzF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAe;IAC5C,MAAM;IACN,WAAW;IACX,MAAM;IACN,UAAU;IACV,MAAM;IACN,MAAM;IACN,SAAS;IACT,OAAO;CACR,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,CAAU,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEhG,MAAM,QAAQ,GAAG,CAAC,CAAoB,EAAU,EAAE;IAChD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC3E,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;IAC1E,IAAI,CAAC,CAAC,aAAa,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;IAClF,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC,GAAG,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1D,CAAC,CAAC;AAEF,gEAAgE;AAChE,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,GAAsC,EACtC,UAA6B,EAAE,EACd,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAE9F,6EAA6E;AAC7E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAyB,EAAS,EAAE;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,IAAI,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACpG,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAqC,EAAE,MAAc,EAAY,EAAE,CAC1F,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAiB,EAAqB,EAAE;IACzE,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,CAAC,GAAsC,EAAE,UAA6B,EAAE,EAAE,EAAE,CACtF,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAExC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACjF,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAExE,qFAAqF;IACrF,MAAM,UAAU,GAAG,CAAI,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACjF,KAAK,MAAM,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,MAAM,QAAQ,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9D,KAAK,MAAM,EAAE,IAAI,IAAI,GAAG,CACtB,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAC9E,EAAE,CAAC;QACF,GAAG,CACD,WAAW,CAAC,YAAY,EACxB,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACxF,CAAC;IACJ,CAAC;IAED,qFAAqF;IACrF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC5D,MAAM,SAAS,GAAG,IAAI,GAAG,EAAW,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,EAAE,CAAC;YAC7C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACjE,EAAE,GAAG,KAAK,CAAC;YACb,CAAC;QACH,CAAC;QACD,IAAI,EAAE;YAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,qFAAqF;IACrF,MAAM,YAAY,GAAG,IAAI,GAAG,EAAmB,CAAC,CAAC,2CAA2C;IAC5F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QACnC,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,CAAC,aAAa,EAAE,WAAW,CAAU,EAAE,CAAC;YAC1D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1D,UAAU,GAAG,KAAK,CAAC;YACrB,CAAC;iBAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACzC,UAAU,GAAG,KAAK,CAAC,CAAC,uBAAuB;YAC7C,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAK,EAA4B,CAAC;QAChE,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,WAAW,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC9D,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC;QACH,CAAC;QACD,IACE,OAAO,CAAC,UAAU,KAAK,SAAS;YAChC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC,EAC/D,CAAC;YACD,GAAG,CAAC,WAAW,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAE,CAAC;QAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACb,GAAG,CAAC,WAAW,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACxC,SAAS;QACX,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE/B,MAAM,QAAQ,GAAG;YACf,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;SAC5C,CAAC;QACF,IAAI,SAAS,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC;YACzC,IAAI,CAAC;gBACH,cAAc,CAAC,+BAA+B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrF,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK;gBAAE,SAAS;YAC7C,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,aAAa,GAAG,IAAI,CAAC;YACvB,CAAC;iBAAM,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,GAAG,CAAC;oBAAE,aAAa,GAAG,IAAI,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,CAAC,aAAa;QAAE,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAEnD,qFAAqF;IACrF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC3D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS;YAAE,SAAS;QAChD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YACrE,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,MAAM,CAAC,OAAO,EAAE,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7C,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7B,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5B,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtE,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC9D,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7B,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChE,IAAI,CAAC,WAAW;YAAE,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACxF,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YAC3D,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAEtE,MAAM,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjF,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,KAAK,KAAK;gBACjB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE;gBACf,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa;oBAC3B,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;oBAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC;YACpD,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBACrF,IAAI,CAAC,KAAK,IAAI,WAAW,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvD,EAAE,GAAG,KAAK,CAAC;gBACb,CAAC;YACH,CAAC;YACD,IAAI,EAAE,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC1B,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,GAAG,CAAC;oBAAE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,CAAU,EAAE,CAAC;gBACxC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvD,EAAE,GAAG,KAAK,CAAC;gBACb,CAAC;YACH,CAAC;YACD,IAAI,EAAE,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC3D,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,CAAC,EAAW,EAAQ,EAAE;QACrC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC;IACF,uDAAuD;IACvD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyE,CAAC;IAClG,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,cAAc;YAAE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAE5F,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,WAAW,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpE,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACxC,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACrE,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAAE,SAAS,CAAC,uBAAuB;QAC5E,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;YACvB,GAAG,CAAC,WAAW,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpE,SAAS;QACX,CAAC;QACD,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9D,GAAG,CAAC,WAAW,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpE,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAClF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,WAAW,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAC7E,SAAS;QACX,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC5F,IAAI,CAAC,KAAK;gBAAE,GAAG,CAAC,WAAW,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7B,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;YACrF,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,SAAS;YAAE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YAAE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAEzF,uFAAuF;QACvF,mFAAmF;QACnF,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,SAAS,IAAI,SAAS,KAAK,QAAQ,IAAI,IAAI,EAAE,IAAI,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;YACpF,MAAM,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAClE,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9E,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,uBAAuB,EAAE,CAAC;gBAC9C,GAAG,CAAC,WAAW,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,IAAI,YAAY,GAAG,IAAI,CAAC;IACxB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxE,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAChE,YAAY,GAAG,KAAK,CAAC;YACrB,SAAS;QACX,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACjE,YAAY,GAAG,KAAK,CAAC;YACvB,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACvD,MAAM,QAAQ,GAAG,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,EAAE,CAAC;gBACzD,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC9D,YAAY,GAAG,KAAK,CAAC;YACvB,CAAC;iBAAM,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1D,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClF,YAAY,GAAG,KAAK,CAAC;YACvB,CAAC;iBAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnE,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;gBACpE,YAAY,GAAG,KAAK,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC;YACH,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,kBAAkB;gBAAE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;;gBAC7E,MAAM,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fea/index.ts"],"names":[],"mappings":"AAAA,iBAAiB;AACjB,cAAc,SAAS,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
// RC Beam Design
|
|
2
|
+
export { rectBeamMomentCapacity, rectBeamBarLayout, concreteShearCapacity, stirrupShearCapacity, checkStirrupRequirement, concreteBeta, concreteElasticModulus, psiToMpa, rectBeamToSectionProperties, } from "./rc/index.js";
|
|
3
|
+
// FEA — frame analysis
|
|
4
|
+
export { analyzeFrame, createFrameAnalysis, validateFrameModel, beam3dLocalStiffness, beam3dLocalStiffnessRightHanded, memberAxes, memberDemandEnvelope, } from "./fea/index.js";
|
|
5
|
+
// Strengthening
|
|
6
|
+
export { calculateSteelJacketedBeamMomentCapacity, plateInterfaceShearFlow, boltShearCapacity, plateInterfaceBoltRequirement, sidePlateShearCapacityByWebYielding, sidePlateShearCapacityByTensionTie, compareSidePlateShearCapacity, } from "./strengthening/index.js";
|
|
7
|
+
export { isSinglyReinforced, hasTopPlate, hasBottomPlate, hasSidePlate, FLEXURAL_STRENGTH_REDUCTION_FACTOR, CONCRETE_ULTIMATE_STRAIN, SHEAR_STRENGTH_REDUCTION_FACTOR, ANCHOR_SHEAR_STRENGTH_REDUCTION_FACTOR, MAX_PLATE_BOLT_SPACING, PLATE_SHEAR_YIELD_COEFFICIENT, SIDE_PLATE_EFFECTIVE_STRAIN_LIMIT, SIDE_PLATE_REDUCTION_FACTOR_PSI, CONCRETE_POISSON_RATIO, CONCRETE_UNIT_WEIGHT, BEAM_INERTIA_MODIFIER, COLUMN_INERTIA_MODIFIER, VERTICAL_MEMBER_TOLERANCE, SINGULARITY_TOLERANCE, EQUILIBRIUM_TOLERANCE, RCDesignError, Errors, FrameAnalysisError, FrameErrors, } from "./core/index.js";
|
|
8
|
+
// Utilities
|
|
9
|
+
export { solveQuadratic, roundToDecimalPlaces, mergeWarnings, zeros, identity, transpose, matMul, matVec, choleskyFactor, choleskySolveFactored, choleskySolve, solveLinearSystem, createSkyline, skylineAdd, skylineGet, skylineSize, skylineFactor, skylineSolve, reverseCuthillMcKee, } from "./utils/index.js";
|
|
10
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,iBAAiB;AACjB,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,YAAY,EACZ,sBAAsB,EACtB,QAAQ,EACR,2BAA2B,GAC5B,MAAM,MAAM,CAAC;AAGd,uBAAuB;AACvB,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,+BAA+B,EAC/B,UAAU,EACV,oBAAoB,GACrB,MAAM,OAAO,CAAC;AAsCf,gBAAgB;AAChB,OAAO,EACL,wCAAwC,EACxC,uBAAuB,EACvB,iBAAiB,EACjB,6BAA6B,EAC7B,mCAAmC,EACnC,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,iBAAiB,CAAC;AA4BzB,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,YAAY,EACZ,kCAAkC,EAClC,wBAAwB,EACxB,+BAA+B,EAC/B,sCAAsC,EACtC,sBAAsB,EACtB,6BAA6B,EAC7B,iCAAiC,EACjC,+BAA+B,EAC/B,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,MAAM,EACN,kBAAkB,EAClB,WAAW,GACZ,MAAM,QAAQ,CAAC;AAEhB,YAAY;AACZ,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,QAAQ,EACR,SAAS,EACT,MAAM,EACN,MAAM,EACN,cAAc,EACd,qBAAqB,EACrB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,EACb,YAAY,EACZ,mBAAmB,GACpB,MAAM,SAAS,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"type":"module"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Returns the ACI 318 beta1 factor for the equivalent rectangular stress block.
|
|
3
|
+
*
|
|
4
|
+
* @param fc_ - Concrete compressive strength in MPa
|
|
5
|
+
* @returns Beta1 factor (clamped between 0.65 and 0.85)
|
|
6
|
+
*/
|
|
7
|
+
export const concreteBeta = (fc_) => {
|
|
8
|
+
if (fc_ <= 28) {
|
|
9
|
+
return 0.85;
|
|
10
|
+
}
|
|
11
|
+
const beta = 0.85 - 0.05 * ((fc_ - 28) / 7);
|
|
12
|
+
return Math.max(beta, 0.65);
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Estimates the modulus of elasticity of concrete per ACI 318 (Ec = 4700√f'c).
|
|
16
|
+
*
|
|
17
|
+
* @param fc_ - Concrete compressive strength in MPa
|
|
18
|
+
* @returns Elastic modulus in MPa
|
|
19
|
+
*/
|
|
20
|
+
export const concreteElasticModulus = (fc_) => {
|
|
21
|
+
return 4700 * Math.sqrt(fc_);
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* Converts a pressure value from psi to MPa.
|
|
25
|
+
*
|
|
26
|
+
* @param psi - Value in pounds per square inch
|
|
27
|
+
* @returns Equivalent value in megapascals
|
|
28
|
+
*/
|
|
29
|
+
export const psiToMpa = (psi) => {
|
|
30
|
+
return psi / 145.038;
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=general.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../src/rc/general.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAClD,IAAI,GAAG,IAAI,EAAE,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAU,EAAE;IAC5D,OAAO,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAU,EAAE;IAC9C,OAAO,GAAG,GAAG,OAAO,CAAC;AACvB,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export { rectBeamMomentCapacity, concreteShearCapacity, stirrupShearCapacity, checkStirrupRequirement, } from "./rc-beam-design.js";
|
|
2
|
+
export { concreteBeta, concreteElasticModulus, psiToMpa } from "./general.js";
|
|
3
|
+
export { rectBeamBarLayout } from "./rc-bar-layout.js";
|
|
4
|
+
export { rectBeamToSectionProperties } from "./rc-section-properties.js";
|
|
5
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { RCDesignError, Errors } from "../core/errors/rc-design.error.js";
|
|
2
|
+
import * as MyMath from "../utils/math.js";
|
|
3
|
+
import * as RCConstants from "../core/constants/rc.constant.js";
|
|
4
|
+
/**
|
|
5
|
+
* Lays out a group of same-diameter bars (top or bottom) into the minimum
|
|
6
|
+
* number of layers that fit within the section width, per ACI 318-19 25.2.1
|
|
7
|
+
* (min clear spacing within a layer) and 25.2.2 (min clear spacing between
|
|
8
|
+
* layers), then returns the centroid distance from the near face.
|
|
9
|
+
*/
|
|
10
|
+
const calculateBarGroupLayout = (group, b, cover, stirrupDiameter, maxAggregateSize) => {
|
|
11
|
+
const { count, diameter } = group;
|
|
12
|
+
if (count <= 0) {
|
|
13
|
+
return {
|
|
14
|
+
numberOfLayers: 0,
|
|
15
|
+
barsPerLayer: [],
|
|
16
|
+
distanceFromFace: 0,
|
|
17
|
+
outerExtent: 0,
|
|
18
|
+
As: 0,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
const minClearSpacing = Math.max(RCConstants.MIN_BAR_CLEAR_SPACING, diameter, RCConstants.AGGREGATE_SPACING_FACTOR * maxAggregateSize);
|
|
22
|
+
const availableWidth = b - 2 * (cover + stirrupDiameter);
|
|
23
|
+
const maxBarsPerLayer = Math.min(count, Math.floor((availableWidth + minClearSpacing) / (diameter + minClearSpacing)));
|
|
24
|
+
if (maxBarsPerLayer < 1) {
|
|
25
|
+
throw new RCDesignError(Errors.SECTION_TOO_NARROW_FOR_BAR);
|
|
26
|
+
}
|
|
27
|
+
const numberOfLayers = Math.ceil(count / maxBarsPerLayer);
|
|
28
|
+
const baseBarsPerLayer = Math.floor(count / numberOfLayers);
|
|
29
|
+
const remainder = count % numberOfLayers;
|
|
30
|
+
const barsPerLayer = Array.from({ length: numberOfLayers }, (_, i) => i < remainder ? baseBarsPerLayer + 1 : baseBarsPerLayer);
|
|
31
|
+
const layerPitch = diameter + RCConstants.MIN_LAYER_CLEAR_SPACING;
|
|
32
|
+
const firstLayerDistance = cover + stirrupDiameter + diameter / 2;
|
|
33
|
+
const weightedSum = barsPerLayer.reduce((sum, n, i) => sum + n * (firstLayerDistance + i * layerPitch), 0);
|
|
34
|
+
return {
|
|
35
|
+
numberOfLayers,
|
|
36
|
+
barsPerLayer,
|
|
37
|
+
distanceFromFace: weightedSum / count,
|
|
38
|
+
outerExtent: cover +
|
|
39
|
+
stirrupDiameter +
|
|
40
|
+
numberOfLayers * diameter +
|
|
41
|
+
(numberOfLayers - 1) * RCConstants.MIN_LAYER_CLEAR_SPACING,
|
|
42
|
+
As: count * (Math.PI / 4) * diameter ** 2,
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Lays out top and bottom rebar groups within a rectangular beam section,
|
|
47
|
+
* determining the number of layers required to satisfy ACI 318-19 minimum
|
|
48
|
+
* bar spacing (25.2.1) and layer spacing (25.2.2), and returns the resulting
|
|
49
|
+
* effective depth `d` and compression steel depth `d_`, both measured from
|
|
50
|
+
* the top (compression) face so they plug directly into
|
|
51
|
+
* {@link rectBeamMomentCapacity}'s `d` / `d_` inputs.
|
|
52
|
+
*
|
|
53
|
+
* @param input - Section dimensions, the bottom bar group, and optional
|
|
54
|
+
* `topBars` / cover / stirrup diameter / max aggregate size (the last three
|
|
55
|
+
* default to ACI 318-19 Table 20.6.1.3.1 values for cast-in-place beams not
|
|
56
|
+
* exposed to weather or in contact with ground). Omit `topBars` for a section
|
|
57
|
+
* with no top reinforcement; `d_` is then 0.
|
|
58
|
+
* @returns `d`, `d_`, per-group layer counts and areas, `unit`, and `warnings`
|
|
59
|
+
* @throws {RCDesignError} If a bar does not fit within the section width, or
|
|
60
|
+
* if the combined top/bottom layers exceed the section height
|
|
61
|
+
*/
|
|
62
|
+
export const rectBeamBarLayout = (input) => {
|
|
63
|
+
const warnings = [];
|
|
64
|
+
const cover = input.cover ?? RCConstants.DEFAULT_BEAM_COVER;
|
|
65
|
+
const stirrupDiameter = input.stirrupDiameter ?? RCConstants.DEFAULT_STIRRUP_DIAMETER;
|
|
66
|
+
const maxAggregateSize = input.maxAggregateSize ?? RCConstants.DEFAULT_MAX_AGGREGATE_SIZE;
|
|
67
|
+
const top = calculateBarGroupLayout(input.topBars ?? { count: 0, diameter: 0 }, input.b, cover, stirrupDiameter, maxAggregateSize);
|
|
68
|
+
const bottom = calculateBarGroupLayout(input.bottomBars, input.b, cover, stirrupDiameter, maxAggregateSize);
|
|
69
|
+
if (top.outerExtent + bottom.outerExtent > input.h) {
|
|
70
|
+
throw new RCDesignError(Errors.BAR_LAYOUT_EXCEEDS_SECTION_HEIGHT);
|
|
71
|
+
}
|
|
72
|
+
return {
|
|
73
|
+
d: MyMath.roundToDecimalPlaces(input.h - bottom.distanceFromFace, 1),
|
|
74
|
+
d_: MyMath.roundToDecimalPlaces(top.distanceFromFace, 1),
|
|
75
|
+
top: {
|
|
76
|
+
numberOfLayers: top.numberOfLayers,
|
|
77
|
+
barsPerLayer: top.barsPerLayer,
|
|
78
|
+
As: MyMath.roundToDecimalPlaces(top.As, 1),
|
|
79
|
+
},
|
|
80
|
+
bottom: {
|
|
81
|
+
numberOfLayers: bottom.numberOfLayers,
|
|
82
|
+
barsPerLayer: bottom.barsPerLayer,
|
|
83
|
+
As: MyMath.roundToDecimalPlaces(bottom.As, 1),
|
|
84
|
+
},
|
|
85
|
+
unit: "mm",
|
|
86
|
+
warnings: warnings,
|
|
87
|
+
};
|
|
88
|
+
};
|
|
89
|
+
//# sourceMappingURL=rc-bar-layout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rc-bar-layout.js","sourceRoot":"","sources":["../../../src/rc/rc-bar-layout.ts"],"names":[],"mappings":"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"}
|