@theerapat-s28/ts-structural-eng-tools 3.2.0 → 3.4.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/CHANGELOG.md +33 -1
- package/README.md +77 -18
- package/dist/core/constants/fea.constant.d.ts +21 -0
- package/dist/core/constants/fea.constant.js +26 -0
- package/dist/core/constants/fea.constant.js.map +1 -0
- package/dist/core/constants/frame.constant.d.ts +6 -32
- package/dist/core/constants/frame.constant.js +8 -33
- package/dist/core/constants/frame.constant.js.map +1 -1
- package/dist/core/constants/rc.constant.d.ts +8 -0
- package/dist/core/constants/rc.constant.js +10 -1
- package/dist/core/constants/rc.constant.js.map +1 -1
- package/dist/core/constants/shell.constant.d.ts +23 -0
- package/dist/core/constants/shell.constant.js +28 -0
- package/dist/core/constants/shell.constant.js.map +1 -0
- package/dist/core/errors/fea.error.d.ts +5 -0
- package/dist/core/errors/fea.error.js +9 -1
- package/dist/core/errors/fea.error.js.map +1 -1
- package/dist/core/index.d.ts +4 -2
- package/dist/core/index.js +18 -10
- package/dist/core/index.js.map +1 -1
- package/dist/esm/core/constants/fea.constant.js +23 -0
- package/dist/esm/core/constants/fea.constant.js.map +1 -0
- package/dist/esm/core/constants/frame.constant.js +7 -32
- package/dist/esm/core/constants/frame.constant.js.map +1 -1
- package/dist/esm/core/constants/rc.constant.js +9 -0
- package/dist/esm/core/constants/rc.constant.js.map +1 -1
- package/dist/esm/core/constants/shell.constant.js +25 -0
- package/dist/esm/core/constants/shell.constant.js.map +1 -0
- package/dist/esm/core/errors/fea.error.js +9 -1
- package/dist/esm/core/errors/fea.error.js.map +1 -1
- package/dist/esm/core/index.js +4 -2
- package/dist/esm/core/index.js.map +1 -1
- package/dist/esm/fea/analysis/index.js +1 -0
- package/dist/esm/fea/analysis/index.js.map +1 -1
- package/dist/esm/fea/analysis/mesh/expand-model.js +27 -44
- package/dist/esm/fea/analysis/mesh/expand-model.js.map +1 -1
- package/dist/esm/fea/analysis/mesh/member-connectivity.js +67 -0
- package/dist/esm/fea/analysis/mesh/member-connectivity.js.map +1 -0
- package/dist/esm/fea/analysis/post/envelope.js +70 -0
- package/dist/esm/fea/analysis/post/envelope.js.map +1 -1
- package/dist/esm/fea/analysis/post/present-state.js +11 -4
- package/dist/esm/fea/analysis/post/present-state.js.map +1 -1
- package/dist/esm/fea/analysis/post/wall-forces.js +299 -0
- package/dist/esm/fea/analysis/post/wall-forces.js.map +1 -0
- package/dist/esm/fea/analysis/post/wall-geometry.js +173 -0
- package/dist/esm/fea/analysis/post/wall-geometry.js.map +1 -0
- package/dist/esm/fea/analysis/solver/analysis-system.js +1 -1
- package/dist/esm/fea/analysis/solver/analysis-system.js.map +1 -1
- package/dist/esm/fea/analysis/solver/analyze.js +21 -5
- package/dist/esm/fea/analysis/solver/analyze.js.map +1 -1
- package/dist/esm/fea/analysis/solver/load-case-solver.js +4 -3
- package/dist/esm/fea/analysis/solver/load-case-solver.js.map +1 -1
- package/dist/esm/fea/analysis/validation/validate-model.js +20 -2
- package/dist/esm/fea/analysis/validation/validate-model.js.map +1 -1
- package/dist/esm/fea/analysis/validation/validate-walls.js +226 -0
- package/dist/esm/fea/analysis/validation/validate-walls.js.map +1 -0
- package/dist/esm/fea/frame/area/area-geometry.js +1 -1
- package/dist/esm/fea/frame/area/area-geometry.js.map +1 -1
- package/dist/esm/fea/frame/area/area-member-loads.js +1 -1
- package/dist/esm/fea/frame/area/area-member-loads.js.map +1 -1
- package/dist/esm/fea/frame/area/edge-members.js +1 -1
- package/dist/esm/fea/frame/area/edge-members.js.map +1 -1
- package/dist/esm/fea/frame/post/member-diagram.js +16 -4
- package/dist/esm/fea/frame/post/member-diagram.js.map +1 -1
- package/dist/esm/fea/frame/solver/nodes-along-members.js +73 -0
- package/dist/esm/fea/frame/solver/nodes-along-members.js.map +1 -0
- package/dist/esm/fea/frame/solver/system-member.js +4 -4
- package/dist/esm/fea/frame/solver/system-member.js.map +1 -1
- package/dist/esm/fea/frame/transformation/coordinate-transform.js +1 -1
- package/dist/esm/fea/frame/transformation/coordinate-transform.js.map +1 -1
- package/dist/esm/fea/frame/validation/validate-members.js +6 -2
- package/dist/esm/fea/frame/validation/validate-members.js.map +1 -1
- package/dist/esm/fea/frame/validation/validate-null-areas.js +1 -1
- package/dist/esm/fea/frame/validation/validate-null-areas.js.map +1 -1
- package/dist/esm/fea/shared/solver/auto-restraint.js +1 -1
- package/dist/esm/fea/shared/solver/auto-restraint.js.map +1 -1
- package/dist/esm/fea/shared/validation/issues.js +8 -0
- package/dist/esm/fea/shared/validation/issues.js.map +1 -1
- package/dist/esm/fea/shell/elements/membrane-quad.js +1 -1
- package/dist/esm/fea/shell/elements/shell-axes.js +2 -1
- package/dist/esm/fea/shell/elements/shell-axes.js.map +1 -1
- package/dist/esm/fea/shell/mesh/mesh-shells.js +1 -1
- package/dist/esm/fea/shell/mesh/mesh-shells.js.map +1 -1
- package/dist/esm/fea/shell/post/strip-forces.js +341 -0
- package/dist/esm/fea/shell/post/strip-forces.js.map +1 -0
- package/dist/esm/fea/shell/solver/shell-loads.js +3 -0
- package/dist/esm/fea/shell/solver/shell-loads.js.map +1 -1
- package/dist/esm/fea/shell/validation/validate-shells.js +9 -2
- package/dist/esm/fea/shell/validation/validate-shells.js.map +1 -1
- package/dist/esm/fea/shell/validation/validate-strips.js +99 -0
- package/dist/esm/fea/shell/validation/validate-strips.js.map +1 -0
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/rc/rc-section-properties.js +1 -1
- package/dist/esm/rc/rc-section-properties.js.map +1 -1
- package/dist/fea/analysis/index.d.ts +4 -2
- package/dist/fea/analysis/index.js +3 -1
- package/dist/fea/analysis/index.js.map +1 -1
- package/dist/fea/analysis/mesh/expand-model.d.ts +10 -7
- package/dist/fea/analysis/mesh/expand-model.js +28 -45
- package/dist/fea/analysis/mesh/expand-model.js.map +1 -1
- package/dist/fea/analysis/mesh/member-connectivity.d.ts +43 -0
- package/dist/fea/analysis/mesh/member-connectivity.js +72 -0
- package/dist/fea/analysis/mesh/member-connectivity.js.map +1 -0
- package/dist/fea/analysis/post/envelope.js +70 -0
- package/dist/fea/analysis/post/envelope.js.map +1 -1
- package/dist/fea/analysis/post/present-state.d.ts +8 -1
- package/dist/fea/analysis/post/present-state.js +12 -5
- package/dist/fea/analysis/post/present-state.js.map +1 -1
- package/dist/fea/analysis/post/wall-forces.d.ts +65 -0
- package/dist/fea/analysis/post/wall-forces.js +305 -0
- package/dist/fea/analysis/post/wall-forces.js.map +1 -0
- package/dist/fea/analysis/post/wall-geometry.d.ts +73 -0
- package/dist/fea/analysis/post/wall-geometry.js +188 -0
- package/dist/fea/analysis/post/wall-geometry.js.map +1 -0
- package/dist/fea/analysis/solver/analysis-system.d.ts +1 -1
- package/dist/fea/analysis/solver/analysis-system.js +2 -2
- package/dist/fea/analysis/solver/analysis-system.js.map +1 -1
- package/dist/fea/analysis/solver/analyze.d.ts +12 -3
- package/dist/fea/analysis/solver/analyze.js +21 -5
- package/dist/fea/analysis/solver/analyze.js.map +1 -1
- package/dist/fea/analysis/solver/load-case-solver.d.ts +1 -0
- package/dist/fea/analysis/solver/load-case-solver.js +5 -4
- package/dist/fea/analysis/solver/load-case-solver.js.map +1 -1
- package/dist/fea/analysis/types/model.type.d.ts +58 -1
- package/dist/fea/analysis/types/results.type.d.ts +136 -2
- package/dist/fea/analysis/validation/validate-model.d.ts +1 -1
- package/dist/fea/analysis/validation/validate-model.js +20 -2
- package/dist/fea/analysis/validation/validate-model.js.map +1 -1
- package/dist/fea/analysis/validation/validate-walls.d.ts +35 -0
- package/dist/fea/analysis/validation/validate-walls.js +230 -0
- package/dist/fea/analysis/validation/validate-walls.js.map +1 -0
- package/dist/fea/frame/area/area-geometry.js +5 -5
- package/dist/fea/frame/area/area-geometry.js.map +1 -1
- package/dist/fea/frame/area/area-member-loads.js +7 -7
- package/dist/fea/frame/area/area-member-loads.js.map +1 -1
- package/dist/fea/frame/area/edge-members.js +2 -2
- package/dist/fea/frame/area/edge-members.js.map +1 -1
- package/dist/fea/frame/index.d.ts +1 -1
- package/dist/fea/frame/post/member-diagram.d.ts +14 -5
- package/dist/fea/frame/post/member-diagram.js +18 -5
- package/dist/fea/frame/post/member-diagram.js.map +1 -1
- package/dist/fea/frame/solver/nodes-along-members.d.ts +31 -0
- package/dist/fea/frame/solver/nodes-along-members.js +77 -0
- package/dist/fea/frame/solver/nodes-along-members.js.map +1 -0
- package/dist/fea/frame/solver/system-member.d.ts +6 -5
- package/dist/fea/frame/solver/system-member.js +4 -4
- package/dist/fea/frame/solver/system-member.js.map +1 -1
- package/dist/fea/frame/transformation/coordinate-transform.js +2 -2
- package/dist/fea/frame/transformation/coordinate-transform.js.map +1 -1
- package/dist/fea/frame/types/model.type.d.ts +6 -0
- package/dist/fea/frame/types/results.type.d.ts +20 -0
- package/dist/fea/frame/validation/validate-members.d.ts +2 -2
- package/dist/fea/frame/validation/validate-members.js +6 -2
- package/dist/fea/frame/validation/validate-members.js.map +1 -1
- package/dist/fea/frame/validation/validate-null-areas.js +2 -2
- package/dist/fea/frame/validation/validate-null-areas.js.map +1 -1
- package/dist/fea/shared/solver/auto-restraint.js +3 -3
- package/dist/fea/shared/solver/auto-restraint.js.map +1 -1
- package/dist/fea/shared/validation/issues.js +8 -0
- package/dist/fea/shared/validation/issues.js.map +1 -1
- package/dist/fea/shell/elements/membrane-quad.js +2 -2
- package/dist/fea/shell/elements/shell-axes.js +6 -5
- package/dist/fea/shell/elements/shell-axes.js.map +1 -1
- package/dist/fea/shell/index.d.ts +2 -2
- package/dist/fea/shell/mesh/mesh-shells.js +2 -2
- package/dist/fea/shell/mesh/mesh-shells.js.map +1 -1
- package/dist/fea/shell/post/strip-forces.d.ts +69 -0
- package/dist/fea/shell/post/strip-forces.js +349 -0
- package/dist/fea/shell/post/strip-forces.js.map +1 -0
- package/dist/fea/shell/solver/shell-loads.d.ts +3 -1
- package/dist/fea/shell/solver/shell-loads.js +3 -0
- package/dist/fea/shell/solver/shell-loads.js.map +1 -1
- package/dist/fea/shell/types/model.type.d.ts +31 -0
- package/dist/fea/shell/types/results.type.d.ts +54 -0
- package/dist/fea/shell/validation/validate-shells.d.ts +7 -2
- package/dist/fea/shell/validation/validate-shells.js +9 -2
- package/dist/fea/shell/validation/validate-shells.js.map +1 -1
- package/dist/fea/shell/validation/validate-strips.d.ts +11 -0
- package/dist/fea/shell/validation/validate-strips.js +103 -0
- package/dist/fea/shell/validation/validate-strips.js.map +1 -0
- package/dist/index.d.ts +3 -3
- package/dist/index.js +9 -2
- package/dist/index.js.map +1 -1
- package/dist/rc/rc-section-properties.js +4 -4
- package/dist/rc/rc-section-properties.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Warnings } from "../../../core/types/output-message.type";
|
|
2
|
-
import type { MemberDiagram, MemberEndForces, MemberReleaseDeformations, StationComponent } from "../../frame/types/results.type";
|
|
2
|
+
import type { MemberDiagram, MemberEndForces, MemberIntermediateNode, MemberNearMissNode, MemberReleaseDeformations, StationComponent } from "../../frame/types/results.type";
|
|
3
3
|
import type { FeaId } from "../../shared/types/model.type";
|
|
4
|
-
import type { FeaMesh, ShellElementForces, ShellForceComponent } from "../../shell/types/results.type";
|
|
4
|
+
import type { FeaMesh, ShellElementForces, ShellForceComponent, StripForceComponent, StripForces } from "../../shell/types/results.type";
|
|
5
5
|
import type { LoadCaseType } from "./model.type";
|
|
6
6
|
export interface NodalDisplacement {
|
|
7
7
|
nodeId: FeaId;
|
|
@@ -41,6 +41,95 @@ export type Bound<T> = {
|
|
|
41
41
|
max: T;
|
|
42
42
|
min: T;
|
|
43
43
|
};
|
|
44
|
+
/**
|
|
45
|
+
* The resultant on a pier or spandrel cut, in its axes 1, 2, 3 and about the centroid of the
|
|
46
|
+
* cut section, acting on the face whose outward normal is +1 (the part below a pier cut, left
|
|
47
|
+
* of a spandrel cut) — the signs of a member's internal forces (`MemberStation`) with the same
|
|
48
|
+
* local axes:
|
|
49
|
+
*
|
|
50
|
+
* - `P` axial force along 1, positive in tension (kN)
|
|
51
|
+
* - `V2`, `V3` shear along 2 and 3 (kN)
|
|
52
|
+
* - `T` torsion about 1, `M2`, `M3` moments about 2 and 3, right-hand rule (kN·m)
|
|
53
|
+
*/
|
|
54
|
+
export interface WallResultants {
|
|
55
|
+
P: number;
|
|
56
|
+
V2: number;
|
|
57
|
+
V3: number;
|
|
58
|
+
T: number;
|
|
59
|
+
M2: number;
|
|
60
|
+
M3: number;
|
|
61
|
+
}
|
|
62
|
+
/** A pier or spandrel resultant. */
|
|
63
|
+
export type WallForceComponent = keyof WallResultants;
|
|
64
|
+
/** Where one shell area crosses a pier or spandrel cut: a straight leg of the cut section. */
|
|
65
|
+
export interface WallSectionLeg {
|
|
66
|
+
areaId: FeaId;
|
|
67
|
+
/** End points of the leg on the cut, global X, Y, Z (mm). */
|
|
68
|
+
start: [number, number, number];
|
|
69
|
+
end: [number, number, number];
|
|
70
|
+
length: number;
|
|
71
|
+
thickness: number;
|
|
72
|
+
}
|
|
73
|
+
/** Where one member crosses a pier or spandrel cut. */
|
|
74
|
+
export interface WallSectionMember {
|
|
75
|
+
memberId: FeaId;
|
|
76
|
+
/** The member's axis on the cut, global X, Y, Z (mm). */
|
|
77
|
+
point: [number, number, number];
|
|
78
|
+
A: number;
|
|
79
|
+
}
|
|
80
|
+
/** The section a pier or spandrel cut passes through. */
|
|
81
|
+
export interface WallCutSection {
|
|
82
|
+
legs: WallSectionLeg[];
|
|
83
|
+
members: WallSectionMember[];
|
|
84
|
+
/** Total length of the legs (mm). */
|
|
85
|
+
length: number;
|
|
86
|
+
/** Σ length × thickness of the legs plus Σ A of the members (mm²). */
|
|
87
|
+
area: number;
|
|
88
|
+
/** Geometric centroid of the section (legs and members by area), global X, Y, Z (mm); the point the moments are about. */
|
|
89
|
+
centroid: [number, number, number];
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Which side of a pier cut the forces come from: `"bottom"` the elements above it (the bottom
|
|
93
|
+
* of a lift), `"top"` those below it (the top of a lift), `"cut"` an extra cut, from below.
|
|
94
|
+
* A level shared by two lifts has a `"top"` and a `"bottom"` cut; they differ by what is
|
|
95
|
+
* applied at that level (a floor, nodal loads).
|
|
96
|
+
*/
|
|
97
|
+
export type PierCutFace = "bottom" | "top" | "cut";
|
|
98
|
+
/** The resultant on one pier cut. */
|
|
99
|
+
export interface PierCut extends WallResultants {
|
|
100
|
+
z: number;
|
|
101
|
+
face: PierCutFace;
|
|
102
|
+
section: WallCutSection;
|
|
103
|
+
}
|
|
104
|
+
/** Forces of one pier in one load case or combination. */
|
|
105
|
+
export interface PierForces {
|
|
106
|
+
pierId: FeaId;
|
|
107
|
+
/** Pier axes 1, 2, 3 (rows) in global components. */
|
|
108
|
+
axes: [[number, number, number], [number, number, number], [number, number, number]];
|
|
109
|
+
/** In order up the pier; at a shared level the `"top"` of the lift below comes first. */
|
|
110
|
+
cuts: PierCut[];
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Which side of a spandrel cut the forces come from: `"left"` the elements right of the left
|
|
114
|
+
* end, `"right"` those left of the right end, `"cut"` an extra cut, from the left.
|
|
115
|
+
*/
|
|
116
|
+
export type SpandrelCutFace = "left" | "right" | "cut";
|
|
117
|
+
/** The resultant on one spandrel cut. */
|
|
118
|
+
export interface SpandrelCut extends WallResultants {
|
|
119
|
+
x: number;
|
|
120
|
+
face: SpandrelCutFace;
|
|
121
|
+
section: WallCutSection;
|
|
122
|
+
}
|
|
123
|
+
/** Forces of one spandrel in one load case or combination. */
|
|
124
|
+
export interface SpandrelForces {
|
|
125
|
+
spandrelId: FeaId;
|
|
126
|
+
/** Spandrel axes 1, 2, 3 (rows) in global components. */
|
|
127
|
+
axes: [[number, number, number], [number, number, number], [number, number, number]];
|
|
128
|
+
/** Distance from the left end to the right end along axis 1 (mm). */
|
|
129
|
+
length: number;
|
|
130
|
+
/** In order from left to right. */
|
|
131
|
+
cuts: SpandrelCut[];
|
|
132
|
+
}
|
|
44
133
|
/** Results of one load case or one load combination. */
|
|
45
134
|
export interface FeaCaseResult {
|
|
46
135
|
id: string;
|
|
@@ -55,6 +144,12 @@ export interface FeaCaseResult {
|
|
|
55
144
|
memberDiagrams: MemberDiagram[];
|
|
56
145
|
/** One entry per shell element, area by area in model order (see `FeaResult.mesh`). */
|
|
57
146
|
shellForces: ShellElementForces[];
|
|
147
|
+
/** One entry per strip, in model order (see `FeaModel.strips`); empty without strips. */
|
|
148
|
+
stripForces: StripForces[];
|
|
149
|
+
/** One entry per pier, in model order (see `FeaModel.piers`); empty without piers. */
|
|
150
|
+
pierForces: PierForces[];
|
|
151
|
+
/** One entry per spandrel, in model order (see `FeaModel.spandrels`); empty without spandrels. */
|
|
152
|
+
spandrelForces: SpandrelForces[];
|
|
58
153
|
equilibriumResidual: {
|
|
59
154
|
force: number;
|
|
60
155
|
moment: number;
|
|
@@ -80,6 +175,35 @@ export interface FeaEnvelope {
|
|
|
80
175
|
nodeId: FeaId;
|
|
81
176
|
} & Record<ShellForceComponent, Bound<GoverningValue>>)[];
|
|
82
177
|
}[];
|
|
178
|
+
/**
|
|
179
|
+
* Per strip: max/min of each resultant at every station (for envelope diagrams), of its
|
|
180
|
+
* per-width value, and over the whole strip.
|
|
181
|
+
*/
|
|
182
|
+
strips: {
|
|
183
|
+
stripId: FeaId;
|
|
184
|
+
stations: ({
|
|
185
|
+
x: number;
|
|
186
|
+
segment: number;
|
|
187
|
+
perWidth: Record<StripForceComponent, Bound<GoverningValue>>;
|
|
188
|
+
} & Record<StripForceComponent, Bound<GoverningValue>>)[];
|
|
189
|
+
extremes: Record<StripForceComponent, Bound<GoverningExtremeValue>>;
|
|
190
|
+
}[];
|
|
191
|
+
/** Per pier: max/min of each resultant at every cut. */
|
|
192
|
+
piers: {
|
|
193
|
+
pierId: FeaId;
|
|
194
|
+
cuts: ({
|
|
195
|
+
z: number;
|
|
196
|
+
face: PierCutFace;
|
|
197
|
+
} & Record<WallForceComponent, Bound<GoverningValue>>)[];
|
|
198
|
+
}[];
|
|
199
|
+
/** Per spandrel: max/min of each resultant at every cut. */
|
|
200
|
+
spandrels: {
|
|
201
|
+
spandrelId: FeaId;
|
|
202
|
+
cuts: ({
|
|
203
|
+
x: number;
|
|
204
|
+
face: SpandrelCutFace;
|
|
205
|
+
} & Record<WallForceComponent, Bound<GoverningValue>>)[];
|
|
206
|
+
}[];
|
|
83
207
|
}
|
|
84
208
|
export interface FeaResult {
|
|
85
209
|
cases: Record<string, FeaCaseResult>;
|
|
@@ -99,6 +223,16 @@ export interface FeaResult {
|
|
|
99
223
|
combinationCount: number;
|
|
100
224
|
/** Joint rotations held because every member there releases them (e.g. truss joints). */
|
|
101
225
|
autoRestrainedDofs: AutoRestrainedDof[];
|
|
226
|
+
/**
|
|
227
|
+
* Model nodes lying on a member between its ends that were connected to it (see
|
|
228
|
+
* `Member.connectIntermediateNodes`), member by member from its start.
|
|
229
|
+
*/
|
|
230
|
+
intermediateNodes: MemberIntermediateNode[];
|
|
231
|
+
/**
|
|
232
|
+
* Model nodes close to a member but not on it, so not connected to it, each with a
|
|
233
|
+
* "Member connectivity" warning; same order.
|
|
234
|
+
*/
|
|
235
|
+
nearMissNodes: MemberNearMissNode[];
|
|
102
236
|
};
|
|
103
237
|
units: {
|
|
104
238
|
force: "kN";
|
|
@@ -7,6 +7,6 @@ import type { FeaModel } from "../types/model.type";
|
|
|
7
7
|
* resists at a node connected only to shells (328), which only assembling the stiffness detects.
|
|
8
8
|
*
|
|
9
9
|
* @param model - The model to check
|
|
10
|
-
* @returns Every problem found (codes 301–303, 305–317
|
|
10
|
+
* @returns Every problem found (codes 301–303, 305–317, 326–327 and 329–331), in model order
|
|
11
11
|
*/
|
|
12
12
|
export declare const validateModel: (model: FeaModel) => FeaModelIssue[];
|
|
@@ -6,7 +6,9 @@ const validate_members_1 = require("../../frame/validation/validate-members");
|
|
|
6
6
|
const validate_null_areas_1 = require("../../frame/validation/validate-null-areas");
|
|
7
7
|
const issues_1 = require("../../shared/validation/issues");
|
|
8
8
|
const validate_shells_1 = require("../../shell/validation/validate-shells");
|
|
9
|
+
const validate_strips_1 = require("../../shell/validation/validate-strips");
|
|
9
10
|
const combinations_1 = require("../solver/combinations");
|
|
11
|
+
const validate_walls_1 = require("./validate-walls");
|
|
10
12
|
const DOF_KEYS = ["ux", "uy", "uz", "rx", "ry", "rz"];
|
|
11
13
|
const NODAL_LOAD_KEYS = ["fx", "fy", "fz", "mx", "my", "mz"];
|
|
12
14
|
const GLOBAL_DIRECTIONS = new Set(["X", "Y", "Z"]);
|
|
@@ -33,7 +35,7 @@ const LOAD_CASE_TYPES = new Set([
|
|
|
33
35
|
* resists at a node connected only to shells (328), which only assembling the stiffness detects.
|
|
34
36
|
*
|
|
35
37
|
* @param model - The model to check
|
|
36
|
-
* @returns Every problem found (codes 301–303, 305–317
|
|
38
|
+
* @returns Every problem found (codes 301–303, 305–317, 326–327 and 329–331), in model order
|
|
37
39
|
*/
|
|
38
40
|
const validateModel = (model) => {
|
|
39
41
|
const issues = [];
|
|
@@ -49,6 +51,7 @@ const validateModel = (model) => {
|
|
|
49
51
|
const shells = Array.isArray(model.shells) ? model.shells : [];
|
|
50
52
|
const lineRestraints = Array.isArray(model.lineRestraints) ? model.lineRestraints : [];
|
|
51
53
|
const areaLoads = Array.isArray(model.areaLoads) ? model.areaLoads : [];
|
|
54
|
+
const strips = Array.isArray(model.strips) ? model.strips : [];
|
|
52
55
|
// ---- Ids -------------------------------------------------------------------------
|
|
53
56
|
const duplicates = (ids) => ids.filter((id, i) => ids.indexOf(id) !== i);
|
|
54
57
|
for (const nodeId of new Set(duplicates(nodes.map((n) => n.id)))) {
|
|
@@ -190,9 +193,24 @@ const validateModel = (model) => {
|
|
|
190
193
|
// the mesh, once every shell and its mesh settings are valid
|
|
191
194
|
const shellProblem = issues.some((i) => i.details.shellId !== undefined);
|
|
192
195
|
const nodeProblem = nodes.length !== validNode.size;
|
|
196
|
+
let mesh;
|
|
193
197
|
if (shells.length > 0 && !shellProblem && !nodeProblem) {
|
|
194
|
-
|
|
198
|
+
const meshed = (0, validate_shells_1.validateShellMesh)(nodes, shells);
|
|
199
|
+
issues.push(...meshed.issues);
|
|
200
|
+
if (meshed.issues.length === 0) {
|
|
201
|
+
mesh = { nodes: [...nodes, ...meshed.mesh.nodes], elements: meshed.mesh.elements };
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
else if (shells.length === 0 && !nodeProblem) {
|
|
205
|
+
mesh = { nodes, elements: [] };
|
|
206
|
+
}
|
|
207
|
+
// ---- Strips ----------------------------------------------------------------------
|
|
208
|
+
if (model.strips !== undefined && !Array.isArray(model.strips)) {
|
|
209
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { field: "strips" });
|
|
195
210
|
}
|
|
211
|
+
issues.push(...(0, validate_strips_1.validateStrips)(strips));
|
|
212
|
+
// ---- Piers and spandrels ---------------------------------------------------------
|
|
213
|
+
issues.push(...(0, validate_walls_1.validateWalls)(model, { shells, members, nodeById, memberLength, mesh }));
|
|
196
214
|
const areaIds = new Set([...areas.map((a) => a.id), ...shells.map((sh) => sh.id)]);
|
|
197
215
|
for (const load of areaLoads) {
|
|
198
216
|
const at = { loadCaseId: load.loadCase, areaId: load.areaId };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-model.js","sourceRoot":"","sources":["../../../../src/fea/analysis/validation/validate-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validate-model.js","sourceRoot":"","sources":["../../../../src/fea/analysis/validation/validate-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { type FeaModelIssue } from "../../../core/errors/fea.error";
|
|
2
|
+
import type { Member } from "../../frame/types/model.type";
|
|
3
|
+
import type { FeaId, FeaNode } from "../../shared/types/model.type";
|
|
4
|
+
import type { ShellElement } from "../../shell/mesh/mesh-shells";
|
|
5
|
+
import type { ShellArea } from "../../shell/types/model.type";
|
|
6
|
+
/** What the pier and spandrel checks need from the rest of the model. */
|
|
7
|
+
export interface WallContext {
|
|
8
|
+
shells: ShellArea[];
|
|
9
|
+
members: Member[];
|
|
10
|
+
nodeById: Map<FeaId, FeaNode>;
|
|
11
|
+
/** Length of each member whose geometry is valid (from `validateMembers`). */
|
|
12
|
+
memberLength: Map<FeaId, number>;
|
|
13
|
+
/**
|
|
14
|
+
* The meshed shell elements and every node (generated ones included), when all shells are
|
|
15
|
+
* valid and mesh; without it the geometry is not checked.
|
|
16
|
+
*/
|
|
17
|
+
mesh?: {
|
|
18
|
+
nodes: FeaNode[];
|
|
19
|
+
elements: ShellElement[];
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Checks the model's piers and spandrels: unique ids; areas and members that exist, are listed
|
|
24
|
+
* once and are in no other pier (or spandrel); finite `cuts`, `angle` and boolean `reverse`; and,
|
|
25
|
+
* once the shells mesh, the geometry: vertical pier areas and non-horizontal pier members, a
|
|
26
|
+
* spandrel's areas in one vertical plane and its members not normal to its axis 1, extra cuts
|
|
27
|
+
* reaching the group, and every cut on the mesh lines of the areas it meets.
|
|
28
|
+
*
|
|
29
|
+
* @returns Every problem found (codes 303, 314 and 331), in model order, with `pierId` or
|
|
30
|
+
* `spandrelId`
|
|
31
|
+
*/
|
|
32
|
+
export declare const validateWalls: (model: {
|
|
33
|
+
piers?: unknown;
|
|
34
|
+
spandrels?: unknown;
|
|
35
|
+
}, context: WallContext) => FeaModelIssue[];
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateWalls = void 0;
|
|
4
|
+
const fea_constant_1 = require("../../../core/constants/fea.constant");
|
|
5
|
+
const fea_error_1 = require("../../../core/errors/fea.error");
|
|
6
|
+
const issues_1 = require("../../shared/validation/issues");
|
|
7
|
+
const wall_geometry_1 = require("../post/wall-geometry");
|
|
8
|
+
const point = (node) => [node.x, node.y, node.z];
|
|
9
|
+
/**
|
|
10
|
+
* Checks the model's piers and spandrels: unique ids; areas and members that exist, are listed
|
|
11
|
+
* once and are in no other pier (or spandrel); finite `cuts`, `angle` and boolean `reverse`; and,
|
|
12
|
+
* once the shells mesh, the geometry: vertical pier areas and non-horizontal pier members, a
|
|
13
|
+
* spandrel's areas in one vertical plane and its members not normal to its axis 1, extra cuts
|
|
14
|
+
* reaching the group, and every cut on the mesh lines of the areas it meets.
|
|
15
|
+
*
|
|
16
|
+
* @returns Every problem found (codes 303, 314 and 331), in model order, with `pierId` or
|
|
17
|
+
* `spandrelId`
|
|
18
|
+
*/
|
|
19
|
+
const validateWalls = (model, context) => {
|
|
20
|
+
const issues = [];
|
|
21
|
+
const add = (std, details) => issues.push((0, issues_1.modelIssue)(std, details));
|
|
22
|
+
const shellById = new Map(context.shells.map((sh) => [sh.id, sh]));
|
|
23
|
+
const memberById = new Map(context.members.map((m) => [m.id, m]));
|
|
24
|
+
const nodeById = context.mesh
|
|
25
|
+
? new Map(context.mesh.nodes.map((n) => [n.id, n]))
|
|
26
|
+
: context.nodeById;
|
|
27
|
+
const elementsByArea = new Map();
|
|
28
|
+
for (const element of context.mesh?.elements ?? []) {
|
|
29
|
+
const corners = element.nodeIds.map((id) => point(nodeById.get(id)));
|
|
30
|
+
const list = elementsByArea.get(element.areaId);
|
|
31
|
+
if (list)
|
|
32
|
+
list.push(corners);
|
|
33
|
+
else
|
|
34
|
+
elementsByArea.set(element.areaId, [corners]);
|
|
35
|
+
}
|
|
36
|
+
const check = (kind, list) => {
|
|
37
|
+
if (list === undefined)
|
|
38
|
+
return;
|
|
39
|
+
const field = kind === "pier" ? "piers" : "spandrels";
|
|
40
|
+
if (!Array.isArray(list)) {
|
|
41
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { field });
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const groups = list;
|
|
45
|
+
const idKey = kind === "pier" ? "pierId" : "spandrelId";
|
|
46
|
+
const ids = groups.map((g) => g?.id);
|
|
47
|
+
for (const id of new Set(ids.filter((id, i) => ids.indexOf(id) !== i))) {
|
|
48
|
+
add(fea_error_1.FeaErrors.DUPLICATE_ID, { [idKey]: id, field: "id" });
|
|
49
|
+
}
|
|
50
|
+
const owner = new Map(); // "area:id" / "member:id" → group id
|
|
51
|
+
for (const group of groups) {
|
|
52
|
+
const at = { [idKey]: group?.id };
|
|
53
|
+
let ok = true;
|
|
54
|
+
const listField = (name) => {
|
|
55
|
+
const value = group?.[name];
|
|
56
|
+
if (value === undefined)
|
|
57
|
+
return [];
|
|
58
|
+
if (!Array.isArray(value)) {
|
|
59
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { ...at, field: name });
|
|
60
|
+
ok = false;
|
|
61
|
+
return [];
|
|
62
|
+
}
|
|
63
|
+
return value;
|
|
64
|
+
};
|
|
65
|
+
const areaIds = listField("areaIds");
|
|
66
|
+
const memberIds = listField("memberIds");
|
|
67
|
+
if (!ok)
|
|
68
|
+
continue;
|
|
69
|
+
if (areaIds.length === 0 && (kind === "spandrel" || memberIds.length === 0)) {
|
|
70
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, field: "areaIds" });
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const refs = [
|
|
74
|
+
...areaIds.map((id) => ({ id, type: "area" })),
|
|
75
|
+
...memberIds.map((id) => ({ id, type: "member" })),
|
|
76
|
+
];
|
|
77
|
+
for (const [i, { id, type }] of refs.entries()) {
|
|
78
|
+
const where = { ...at, ...(type === "area" ? { areaId: id } : { memberId: id }) };
|
|
79
|
+
const listName = type === "area" ? "areaIds" : "memberIds";
|
|
80
|
+
const exists = type === "area" ? shellById.has(id) : memberById.has(id);
|
|
81
|
+
if (!exists) {
|
|
82
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...where, field: listName });
|
|
83
|
+
ok = false;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
const key = `${type}:${typeof id}:${String(id)}`;
|
|
87
|
+
const twice = refs.slice(0, i).some((r) => r.type === type && r.id === id);
|
|
88
|
+
if (twice || owner.has(key)) {
|
|
89
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...where, field: listName });
|
|
90
|
+
ok = false;
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
owner.set(key, group.id);
|
|
94
|
+
}
|
|
95
|
+
const cutsValue = group.cuts;
|
|
96
|
+
let cuts = [];
|
|
97
|
+
if (cutsValue !== undefined) {
|
|
98
|
+
if (!Array.isArray(cutsValue)) {
|
|
99
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { ...at, field: "cuts" });
|
|
100
|
+
ok = false;
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
cutsValue.forEach((c, i) => {
|
|
104
|
+
if (!(0, issues_1.isFiniteNumber)(c)) {
|
|
105
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { ...at, field: `cuts[${i}]` });
|
|
106
|
+
ok = false;
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
cuts = cutsValue;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
const angle = group.angle;
|
|
113
|
+
if (kind === "pier" && angle !== undefined && !(0, issues_1.isFiniteNumber)(angle)) {
|
|
114
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { ...at, field: "angle" });
|
|
115
|
+
ok = false;
|
|
116
|
+
}
|
|
117
|
+
const reverse = group.reverse;
|
|
118
|
+
if (kind === "spandrel" && reverse !== undefined && typeof reverse !== "boolean") {
|
|
119
|
+
add(fea_error_1.FeaErrors.INVALID_INPUT_VALUE, { ...at, field: "reverse" });
|
|
120
|
+
ok = false;
|
|
121
|
+
}
|
|
122
|
+
// ---- Geometry, on the meshed model ----------------------------------------------
|
|
123
|
+
if (!ok || !context.mesh)
|
|
124
|
+
continue;
|
|
125
|
+
if (memberIds.some((id) => !context.memberLength.has(id)))
|
|
126
|
+
continue; // reported on it
|
|
127
|
+
const shape = {
|
|
128
|
+
areas: areaIds.map((areaId) => ({ areaId, elements: elementsByArea.get(areaId) ?? [] })),
|
|
129
|
+
members: memberIds.map((memberId) => {
|
|
130
|
+
const m = memberById.get(memberId);
|
|
131
|
+
return {
|
|
132
|
+
memberId,
|
|
133
|
+
pieces: [
|
|
134
|
+
[
|
|
135
|
+
point(nodeById.get(m.startNodeId)),
|
|
136
|
+
point(nodeById.get(m.endNodeId)),
|
|
137
|
+
],
|
|
138
|
+
],
|
|
139
|
+
};
|
|
140
|
+
}),
|
|
141
|
+
};
|
|
142
|
+
const before = issues.length;
|
|
143
|
+
const normals = areaIds.map((id) => {
|
|
144
|
+
const shell = shellById.get(id);
|
|
145
|
+
return (0, wall_geometry_1.polygonNormal)(shell.nodeIds.map((n) => point(nodeById.get(n))));
|
|
146
|
+
});
|
|
147
|
+
if (kind === "pier") {
|
|
148
|
+
normals.forEach((n, i) => {
|
|
149
|
+
if (Math.abs(n[2]) > fea_constant_1.WALL_VERTICAL_TOLERANCE) {
|
|
150
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, areaId: areaIds[i], field: "areaIds" });
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
for (const { memberId, pieces } of shape.members) {
|
|
154
|
+
const d = (0, wall_geometry_1.sub)(pieces[0][1], pieces[0][0]);
|
|
155
|
+
const L = context.memberLength.get(memberId);
|
|
156
|
+
if (Math.abs(d[2]) <= fea_constant_1.WALL_VERTICAL_TOLERANCE * L) {
|
|
157
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, memberId, field: "memberIds" });
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
const n0 = normals[0];
|
|
163
|
+
const origin = shape.areas[0].elements[0]?.[0];
|
|
164
|
+
const corners = shape.areas.flatMap((a) => a.elements.flat());
|
|
165
|
+
const extent = (0, wall_geometry_1.wallExtent)(shape, [1, 0, 0]);
|
|
166
|
+
const size = Math.max(extent.max - extent.min, ...[1, 2].map((k) => {
|
|
167
|
+
const s = corners.map((p) => p[k]);
|
|
168
|
+
return Math.max(...s) - Math.min(...s);
|
|
169
|
+
}), 1);
|
|
170
|
+
normals.forEach((n, i) => {
|
|
171
|
+
const parallel = Math.hypot(...(0, wall_geometry_1.cross)(n, n0)) <= fea_constant_1.WALL_VERTICAL_TOLERANCE;
|
|
172
|
+
const inPlane = shape.areas[i].elements
|
|
173
|
+
.flat()
|
|
174
|
+
.every((p) => Math.abs((0, wall_geometry_1.dot)((0, wall_geometry_1.sub)(p, origin), n0)) <= fea_constant_1.WALL_VERTICAL_TOLERANCE * size);
|
|
175
|
+
if (Math.abs(n[2]) > fea_constant_1.WALL_VERTICAL_TOLERANCE || !parallel || !inPlane) {
|
|
176
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, areaId: areaIds[i], field: "areaIds" });
|
|
177
|
+
}
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
if (issues.length > before)
|
|
181
|
+
continue;
|
|
182
|
+
const axes = (0, wall_geometry_1.wallAxes)(kind, shape, {
|
|
183
|
+
angle: angle,
|
|
184
|
+
reverse: reverse,
|
|
185
|
+
});
|
|
186
|
+
const e1 = axes[0];
|
|
187
|
+
if (kind === "spandrel") {
|
|
188
|
+
for (const { memberId, pieces } of shape.members) {
|
|
189
|
+
const d = (0, wall_geometry_1.sub)(pieces[0][1], pieces[0][0]);
|
|
190
|
+
const L = context.memberLength.get(memberId);
|
|
191
|
+
if (Math.abs((0, wall_geometry_1.dot)(d, e1)) <= fea_constant_1.WALL_VERTICAL_TOLERANCE * L) {
|
|
192
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, memberId, field: "memberIds" });
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
if (issues.length > before)
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
const extent = (0, wall_geometry_1.wallExtent)(shape, e1);
|
|
199
|
+
const tol = (0, wall_geometry_1.wallTolerance)(extent);
|
|
200
|
+
const offset = kind === "pier" ? 0 : extent.min;
|
|
201
|
+
const extra = cuts.map((c) => c + offset);
|
|
202
|
+
extra.forEach((s, i) => {
|
|
203
|
+
if (!(0, wall_geometry_1.reachesCut)(shape, e1, s, tol)) {
|
|
204
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, { ...at, field: `cuts[${i}]`, position: cuts[i] });
|
|
205
|
+
}
|
|
206
|
+
});
|
|
207
|
+
if (issues.length > before)
|
|
208
|
+
continue;
|
|
209
|
+
const positions = (0, wall_geometry_1.wallCutPositions)(kind, shape, e1, extra);
|
|
210
|
+
for (const [i, cut] of positions.entries()) {
|
|
211
|
+
if (i > 0 && positions[i - 1].s === cut.s)
|
|
212
|
+
continue; // a level's "top" and "bottom"
|
|
213
|
+
for (const areaId of (0, wall_geometry_1.areasAcrossCut)(shape, e1, cut.s, tol)) {
|
|
214
|
+
const position = cut.cut !== undefined ? cuts[cut.cut] : cut.s - offset;
|
|
215
|
+
add(fea_error_1.FeaErrors.INVALID_PIER_GEOMETRY, {
|
|
216
|
+
...at,
|
|
217
|
+
areaId,
|
|
218
|
+
field: cut.cut !== undefined ? `cuts[${cut.cut}]` : "areaIds",
|
|
219
|
+
position: Math.round(position * 1e3) / 1e3,
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
};
|
|
225
|
+
check("pier", model.piers);
|
|
226
|
+
check("spandrel", model.spandrels);
|
|
227
|
+
return issues;
|
|
228
|
+
};
|
|
229
|
+
exports.validateWalls = validateWalls;
|
|
230
|
+
//# sourceMappingURL=validate-walls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-walls.js","sourceRoot":"","sources":["../../../../src/fea/analysis/validation/validate-walls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.clipPolygon = exports.resolveAreaSupports = exports.edgeDirection = exports.isRectangle = exports.edgesParallel = exports.areaPlane = exports.edgeVector = void 0;
|
|
4
|
-
const
|
|
4
|
+
const fea_constant_1 = require("../../../core/constants/fea.constant");
|
|
5
5
|
const sub = (a, b) => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
|
|
6
6
|
const dot = (a, b) => a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
|
|
7
7
|
const cross = (a, b) => [
|
|
@@ -33,7 +33,7 @@ const areaPlane = (points) => {
|
|
|
33
33
|
return { problem: "nodeCount" };
|
|
34
34
|
const edges = points.map((p, i) => sub(points[(i + 1) % n], p));
|
|
35
35
|
const size = Math.max(...edges.map(norm));
|
|
36
|
-
const tolerance =
|
|
36
|
+
const tolerance = fea_constant_1.AREA_GEOMETRY_TOLERANCE * size;
|
|
37
37
|
if (!(size > 0) || edges.some((e) => norm(e) <= tolerance))
|
|
38
38
|
return { problem: "repeatedNode" };
|
|
39
39
|
// Newell's method: the vector area, exact for a planar polygon
|
|
@@ -57,7 +57,7 @@ const areaPlane = (points) => {
|
|
|
57
57
|
for (let i = 0; i < n; i++) {
|
|
58
58
|
const a = (0, exports.edgeVector)(corners, i);
|
|
59
59
|
const b = (0, exports.edgeVector)(corners, (i + 1) % n);
|
|
60
|
-
if (!(cross2(a, b) >
|
|
60
|
+
if (!(cross2(a, b) > fea_constant_1.AREA_GEOMETRY_TOLERANCE * Math.hypot(...a) * Math.hypot(...b))) {
|
|
61
61
|
return { problem: "nonConvex" };
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -68,7 +68,7 @@ exports.areaPlane = areaPlane;
|
|
|
68
68
|
const edgesParallel = (plane, i, j) => {
|
|
69
69
|
const a = (0, exports.edgeVector)(plane.corners, i);
|
|
70
70
|
const b = (0, exports.edgeVector)(plane.corners, j);
|
|
71
|
-
return Math.abs(cross2(a, b)) <=
|
|
71
|
+
return Math.abs(cross2(a, b)) <= fea_constant_1.AREA_GEOMETRY_TOLERANCE * Math.hypot(...a) * Math.hypot(...b);
|
|
72
72
|
};
|
|
73
73
|
exports.edgesParallel = edgesParallel;
|
|
74
74
|
/** Whether a 4-corner area is a rectangle (every corner square within the tolerance). */
|
|
@@ -76,7 +76,7 @@ const isRectangle = (plane) => plane.corners.length === 4 &&
|
|
|
76
76
|
plane.corners.every((_, i) => {
|
|
77
77
|
const a = (0, exports.edgeVector)(plane.corners, i);
|
|
78
78
|
const b = (0, exports.edgeVector)(plane.corners, (i + 1) % 4);
|
|
79
|
-
return Math.abs(dot2(a, b)) <=
|
|
79
|
+
return Math.abs(dot2(a, b)) <= fea_constant_1.AREA_GEOMETRY_TOLERANCE * Math.hypot(...a) * Math.hypot(...b);
|
|
80
80
|
});
|
|
81
81
|
exports.isRectangle = isRectangle;
|
|
82
82
|
/** Unit vector of edge i in global coordinates. */
|