@theerapat-s28/ts-structural-eng-tools 3.2.0 → 3.3.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 +16 -1
- package/README.md +12 -7
- package/dist/core/constants/frame.constant.d.ts +8 -0
- package/dist/core/constants/frame.constant.js +9 -1
- package/dist/core/constants/frame.constant.js.map +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.js +3 -1
- package/dist/core/index.js.map +1 -1
- package/dist/esm/core/constants/frame.constant.js +8 -0
- package/dist/esm/core/constants/frame.constant.js.map +1 -1
- package/dist/esm/core/index.js +1 -1
- 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 +26 -43
- package/dist/esm/fea/analysis/mesh/expand-model.js.map +1 -1
- package/dist/esm/fea/analysis/mesh/member-connectivity.js +66 -0
- package/dist/esm/fea/analysis/mesh/member-connectivity.js.map +1 -0
- package/dist/esm/fea/analysis/post/present-state.js +2 -2
- package/dist/esm/fea/analysis/post/present-state.js.map +1 -1
- package/dist/esm/fea/analysis/solver/analyze.js +8 -0
- package/dist/esm/fea/analysis/solver/analyze.js.map +1 -1
- package/dist/esm/fea/frame/post/member-diagram.js +4 -4
- 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/validation/validate-members.js +6 -2
- package/dist/esm/fea/frame/validation/validate-members.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/fea/analysis/index.d.ts +2 -0
- 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 +26 -43
- 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 +71 -0
- package/dist/fea/analysis/mesh/member-connectivity.js.map +1 -0
- package/dist/fea/analysis/post/present-state.d.ts +1 -1
- package/dist/fea/analysis/post/present-state.js +2 -2
- package/dist/fea/analysis/post/present-state.js.map +1 -1
- package/dist/fea/analysis/solver/analysis-system.d.ts +1 -1
- package/dist/fea/analysis/solver/analyze.d.ts +6 -0
- package/dist/fea/analysis/solver/analyze.js +8 -0
- package/dist/fea/analysis/solver/analyze.js.map +1 -1
- package/dist/fea/analysis/types/results.type.d.ts +11 -1
- package/dist/fea/frame/index.d.ts +1 -1
- package/dist/fea/frame/post/member-diagram.d.ts +5 -5
- package/dist/fea/frame/post/member-diagram.js +4 -4
- 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/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/index.d.ts +3 -3
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -352,10 +352,10 @@ export const memberDiagram = (member, startForce, endDisplacements, loads, stati
|
|
|
352
352
|
return { memberId: member.id, length: L, stations, extremes };
|
|
353
353
|
};
|
|
354
354
|
/**
|
|
355
|
-
* The diagram of a member analysed as several pieces (split where shell-mesh nodes lie
|
|
356
|
-
* it), stitched along its full length. The evenly spaced stations are taken along the
|
|
357
|
-
* member and each is evaluated in the piece it falls in; at a piece end where
|
|
358
|
-
* deliver a force, both sides are reported, as at a point load. Extremes are the extremes of
|
|
355
|
+
* The diagram of a member analysed as several pieces (split where model or shell-mesh nodes lie
|
|
356
|
+
* inside it), stitched along its full length. The evenly spaced stations are taken along the
|
|
357
|
+
* whole member and each is evaluated in the piece it falls in; at a piece end where a framing
|
|
358
|
+
* member, a support or the shells deliver a force, both sides are reported, as at a point load. Extremes are the extremes of
|
|
359
359
|
* the pieces.
|
|
360
360
|
*
|
|
361
361
|
* @param id - The member's id
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { AREA_GEOMETRY_TOLERANCE } from "../../../core/constants/frame.constant.js";
|
|
2
|
+
/** First index of the sorted `values` that is not below `v`. */
|
|
3
|
+
const lowerBound = (values, v) => {
|
|
4
|
+
let lo = 0;
|
|
5
|
+
let hi = values.length;
|
|
6
|
+
while (lo < hi) {
|
|
7
|
+
const mid = (lo + hi) >> 1;
|
|
8
|
+
if (values[mid] < v)
|
|
9
|
+
lo = mid + 1;
|
|
10
|
+
else
|
|
11
|
+
hi = mid;
|
|
12
|
+
}
|
|
13
|
+
return lo;
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* For each member, the candidate nodes lying within `reach` of its axis whose projection falls
|
|
17
|
+
* strictly between its ends (more than the on-member tolerance from either end), in order from
|
|
18
|
+
* its start. A member's own end nodes are skipped.
|
|
19
|
+
*
|
|
20
|
+
* The candidates are sorted once along each global axis; each member scans only the candidates
|
|
21
|
+
* inside its bounding box (grown by its reach) along the axis where that box is thinnest, so
|
|
22
|
+
* the search stays fast for models with many nodes.
|
|
23
|
+
*
|
|
24
|
+
* @param members - Members with valid geometry (non-zero length)
|
|
25
|
+
* @param position - Coordinates (mm) of every member end node
|
|
26
|
+
* @param candidates - The nodes to look for
|
|
27
|
+
* @param reach - Largest distance (mm) from the axis to report for a member of the given length,
|
|
28
|
+
* or null to skip the member
|
|
29
|
+
* @returns One list per member, in member order
|
|
30
|
+
*/
|
|
31
|
+
export const nodesAlongMembers = (members, position, candidates, reach) => {
|
|
32
|
+
const coordinate = (n, k) => (k === 0 ? n.x : k === 1 ? n.y : n.z);
|
|
33
|
+
const order = [0, 1, 2].map((k) => candidates
|
|
34
|
+
.map((_, i) => i)
|
|
35
|
+
.sort((a, b) => coordinate(candidates[a], k) - coordinate(candidates[b], k)));
|
|
36
|
+
const sorted = order.map((o, k) => Float64Array.from(o, (i) => coordinate(candidates[i], k)));
|
|
37
|
+
return members.map((member) => {
|
|
38
|
+
const P = position(member.startNodeId);
|
|
39
|
+
const Q = position(member.endNodeId);
|
|
40
|
+
const d = [Q[0] - P[0], Q[1] - P[1], Q[2] - P[2]];
|
|
41
|
+
const L2 = d[0] * d[0] + d[1] * d[1] + d[2] * d[2];
|
|
42
|
+
const L = Math.sqrt(L2);
|
|
43
|
+
const r = reach(member, L);
|
|
44
|
+
if (r === null || !(L > 0) || candidates.length === 0)
|
|
45
|
+
return [];
|
|
46
|
+
const tolerance = AREA_GEOMETRY_TOLERANCE * L;
|
|
47
|
+
const lo = [0, 1, 2].map((k) => Math.min(P[k], Q[k]) - r);
|
|
48
|
+
const hi = [0, 1, 2].map((k) => Math.max(P[k], Q[k]) + r);
|
|
49
|
+
const axis = [0, 1, 2].reduce((best, k) => (hi[k] - lo[k] < hi[best] - lo[best] ? k : best), 0);
|
|
50
|
+
const found = [];
|
|
51
|
+
for (let j = lowerBound(sorted[axis], lo[axis]); j < candidates.length; j++) {
|
|
52
|
+
if (sorted[axis][j] > hi[axis])
|
|
53
|
+
break;
|
|
54
|
+
const node = candidates[order[axis][j]];
|
|
55
|
+
if (node.id === member.startNodeId || node.id === member.endNodeId)
|
|
56
|
+
continue;
|
|
57
|
+
const X = [node.x, node.y, node.z];
|
|
58
|
+
if (X.some((v, k) => v < lo[k] || v > hi[k]))
|
|
59
|
+
continue;
|
|
60
|
+
const w = [X[0] - P[0], X[1] - P[1], X[2] - P[2]];
|
|
61
|
+
const t = (w[0] * d[0] + w[1] * d[1] + w[2] * d[2]) / L2;
|
|
62
|
+
const x = t * L;
|
|
63
|
+
if (x <= tolerance || x >= L - tolerance)
|
|
64
|
+
continue;
|
|
65
|
+
const distance = Math.hypot(w[0] - t * d[0], w[1] - t * d[1], w[2] - t * d[2]);
|
|
66
|
+
if (distance > r)
|
|
67
|
+
continue;
|
|
68
|
+
found.push({ nodeId: node.id, x, distance, on: distance <= tolerance });
|
|
69
|
+
}
|
|
70
|
+
return found.sort((a, b) => a.x - b.x);
|
|
71
|
+
});
|
|
72
|
+
};
|
|
73
|
+
//# sourceMappingURL=nodes-along-members.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodes-along-members.js","sourceRoot":"","sources":["../../../../../src/fea/frame/solver/nodes-along-members.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,10 @@ import { memberAxes, transformationMatrix } from "../transformation/coordinate-t
|
|
|
5
5
|
/**
|
|
6
6
|
* Builds the pieces of every member of a model that passed `validateModel`: local axes,
|
|
7
7
|
* transformation and local stiffness condensed for the end releases, which apply only at the
|
|
8
|
-
* member's own ends. A member is one piece unless
|
|
8
|
+
* member's own ends. A member is one piece unless nodes lie inside it.
|
|
9
9
|
*
|
|
10
|
-
* @param members - Members, in model order; after `expandModel` each lists the
|
|
11
|
-
* it passes through, in order from its start
|
|
10
|
+
* @param members - Members, in model order; after `expandModel` each lists the model and
|
|
11
|
+
* generated nodes it passes through, in order from its start
|
|
12
12
|
* @param nodes - The analysed nodes, generated mesh nodes included
|
|
13
13
|
* @param nodeIndex - Map from node id to index into `nodes`
|
|
14
14
|
* @returns `pieces` to assemble, and one `group` per member indexing its pieces
|
|
@@ -20,7 +20,7 @@ export const prepareSystemMembers = (members, nodes, nodeIndex) => {
|
|
|
20
20
|
};
|
|
21
21
|
const systemMembers = [];
|
|
22
22
|
const memberGroups = members.map((member) => {
|
|
23
|
-
// pieces between the member's ends and the
|
|
23
|
+
// pieces between the member's ends and the nodes inside it (see `expandModel`)
|
|
24
24
|
const chain = [member.startNodeId, ...(member.through ?? []), member.endNodeId];
|
|
25
25
|
const whole = memberAxes(point(member.startNodeId), point(member.endNodeId), member.angle ?? 0);
|
|
26
26
|
const { E, G, A, I22, I33, J } = member.section;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-member.js","sourceRoot":"","sources":["../../../../../src/fea/frame/solver/system-member.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAwB,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"system-member.js","sourceRoot":"","sources":["../../../../../src/fea/frame/solver/system-member.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ const SECTION_KEYS = ["E", "G", "A", "I22", "I33", "J"];
|
|
|
7
7
|
const DIRECTIONS = new Set(["1", "2", "3", "X", "Y", "Z"]);
|
|
8
8
|
const GLOBAL_DIRECTIONS = new Set(["X", "Y", "Z"]);
|
|
9
9
|
/**
|
|
10
|
-
* Checks each member on its own: its end nodes, section, `angle`
|
|
11
|
-
* non-zero length, and end releases that leave it stable. Ends at nodes with invalid
|
|
10
|
+
* Checks each member on its own: its end nodes, section, `angle`, `connectIntermediateNodes`
|
|
11
|
+
* and release values, a non-zero length, and end releases that leave it stable. Ends at nodes with invalid
|
|
12
12
|
* coordinates are not checked further; those are reported on the node.
|
|
13
13
|
*
|
|
14
14
|
* @param members - The model's members
|
|
@@ -49,6 +49,10 @@ export const validateMembers = (members, nodeById, validNode) => {
|
|
|
49
49
|
if (member.angle !== undefined && !isFiniteNumber(member.angle)) {
|
|
50
50
|
add(FeaErrors.INVALID_INPUT_VALUE, { ...at, field: "angle" });
|
|
51
51
|
}
|
|
52
|
+
if (member.connectIntermediateNodes !== undefined &&
|
|
53
|
+
typeof member.connectIntermediateNodes !== "boolean") {
|
|
54
|
+
add(FeaErrors.INVALID_INPUT_VALUE, { ...at, field: "connectIntermediateNodes" });
|
|
55
|
+
}
|
|
52
56
|
// each release value: true/false, or a spring stiffness ≥ 0 (0 = full release)
|
|
53
57
|
let releasesOk = true;
|
|
54
58
|
for (const end of ["start", "end"]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-members.js","sourceRoot":"","sources":["../../../../../src/fea/frame/validation/validate-members.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validate-members.js","sourceRoot":"","sources":["../../../../../src/fea/frame/validation/validate-members.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// RC Beam Design
|
|
2
2
|
export { rectBeamMomentCapacity, rectBeamBarLayout, concreteShearCapacity, stirrupShearCapacity, checkStirrupRequirement, concreteBeta, concreteElasticModulus, psiToMpa, rectBeamToSectionProperties, } from "./rc/index.js";
|
|
3
3
|
// FEA — frame and shell analysis
|
|
4
|
-
export { analyze, createAnalysis, validateModel, distributeAreaLoads, beam3dLocalStiffness, beam3dLocalStiffnessRightHanded, memberAxes, memberDemandEnvelope, } from "./fea/index.js";
|
|
4
|
+
export { analyze, createAnalysis, validateModel, distributeAreaLoads, beam3dLocalStiffness, beam3dLocalStiffnessRightHanded, memberAxes, memberDemandEnvelope, memberConnectivity, } from "./fea/index.js";
|
|
5
5
|
// Deprecated FEA names, removed in 4.0.0
|
|
6
6
|
export { analyzeFrame, createFrameAnalysis, validateFrameModel } from "./fea/index.js";
|
|
7
7
|
// Strengthening
|
|
8
8
|
export { calculateSteelJacketedBeamMomentCapacity, plateInterfaceShearFlow, boltShearCapacity, plateInterfaceBoltRequirement, sidePlateShearCapacityByWebYielding, sidePlateShearCapacityByTensionTie, compareSidePlateShearCapacity, } from "./strengthening/index.js";
|
|
9
|
-
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, AREA_GEOMETRY_TOLERANCE, SHELL_WARPING_LIMIT, RCDesignError, Errors, FeaError, FeaErrors, FrameAnalysisError, FrameErrors, } from "./core/index.js";
|
|
9
|
+
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, AREA_GEOMETRY_TOLERANCE, SHELL_WARPING_LIMIT, NODE_NEAR_MEMBER_RATIO, NODE_NEAR_MEMBER_MAX_DISTANCE, RCDesignError, Errors, FeaError, FeaErrors, FrameAnalysisError, FrameErrors, } from "./core/index.js";
|
|
10
10
|
// Utilities
|
|
11
11
|
export { solveQuadratic, roundToDecimalPlaces, mergeWarnings, zeros, identity, transpose, matMul, matVec, choleskyFactor, choleskySolveFactored, choleskySolve, solveLinearSystem, createSkyline, skylineAdd, skylineGet, skylineSize, skylineFactor, skylineSolve, reverseCuthillMcKee, } from "./utils/index.js";
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +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,iCAAiC;AACjC,OAAO,EACL,OAAO,EACP,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,+BAA+B,EAC/B,UAAU,EACV,oBAAoB,
|
|
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,iCAAiC;AACjC,OAAO,EACL,OAAO,EACP,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,+BAA+B,EAC/B,UAAU,EACV,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,OAAO,CAAC;AA4Df,yCAAyC;AACzC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAa9E,gBAAgB;AAChB,OAAO,EACL,wCAAwC,EACxC,uBAAuB,EACvB,iBAAiB,EACjB,6BAA6B,EAC7B,mCAAmC,EACnC,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,iBAAiB,CAAC;AA8BzB,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,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,6BAA6B,EAC7B,aAAa,EACb,MAAM,EACN,QAAQ,EACR,SAAS,EACT,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"}
|
|
@@ -3,6 +3,8 @@ export type { AnalyzeOptions, Analysis } from "./solver/analyze";
|
|
|
3
3
|
export { validateModel } from "./validation/validate-model";
|
|
4
4
|
export { distributeAreaLoads } from "./solver/distribute-area-loads";
|
|
5
5
|
export { memberDemandEnvelope } from "./post/demand-envelope";
|
|
6
|
+
export { memberConnectivity } from "./mesh/member-connectivity";
|
|
7
|
+
export type { MemberConnectivity } from "./mesh/member-connectivity";
|
|
6
8
|
export type { MemberDemandEnvelope, DemandEnvelopeOptions } from "./post/demand-envelope";
|
|
7
9
|
export type { LineRestraint, NodalLoad, LoadCaseType, LoadCase, CombinationTerm, LoadCombination, FeaModel, } from "./types/model.type";
|
|
8
10
|
export type { NodalDisplacement, NodalReaction, AutoRestrainedDof, GoverningValue, GoverningExtremeValue, Bound, FeaCaseResult, FeaEnvelope, FeaResult, } from "./types/results.type";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.memberDemandEnvelope = exports.distributeAreaLoads = exports.validateModel = exports.createAnalysis = exports.analyze = void 0;
|
|
3
|
+
exports.memberConnectivity = exports.memberDemandEnvelope = exports.distributeAreaLoads = exports.validateModel = exports.createAnalysis = exports.analyze = void 0;
|
|
4
4
|
// Analysis of the whole model: members and shells together
|
|
5
5
|
var analyze_1 = require("./solver/analyze");
|
|
6
6
|
Object.defineProperty(exports, "analyze", { enumerable: true, get: function () { return analyze_1.analyze; } });
|
|
@@ -11,4 +11,6 @@ var distribute_area_loads_1 = require("./solver/distribute-area-loads");
|
|
|
11
11
|
Object.defineProperty(exports, "distributeAreaLoads", { enumerable: true, get: function () { return distribute_area_loads_1.distributeAreaLoads; } });
|
|
12
12
|
var demand_envelope_1 = require("./post/demand-envelope");
|
|
13
13
|
Object.defineProperty(exports, "memberDemandEnvelope", { enumerable: true, get: function () { return demand_envelope_1.memberDemandEnvelope; } });
|
|
14
|
+
var member_connectivity_1 = require("./mesh/member-connectivity");
|
|
15
|
+
Object.defineProperty(exports, "memberConnectivity", { enumerable: true, get: function () { return member_connectivity_1.memberConnectivity; } });
|
|
14
16
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fea/analysis/index.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,4CAA2D;AAAlD,kGAAA,OAAO,OAAA;AAAE,yGAAA,cAAc,OAAA;AAEhC,8DAA4D;AAAnD,+GAAA,aAAa,OAAA;AACtB,wEAAqE;AAA5D,4HAAA,mBAAmB,OAAA;AAC5B,0DAA8D;AAArD,uHAAA,oBAAoB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fea/analysis/index.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,4CAA2D;AAAlD,kGAAA,OAAO,OAAA;AAAE,yGAAA,cAAc,OAAA;AAEhC,8DAA4D;AAAnD,+GAAA,aAAa,OAAA;AACtB,wEAAqE;AAA5D,4HAAA,mBAAmB,OAAA;AAC5B,0DAA8D;AAArD,uHAAA,oBAAoB,OAAA;AAC7B,kEAAgE;AAAvD,yHAAA,kBAAkB,OAAA"}
|
|
@@ -4,16 +4,17 @@ import type { FeaId } from "../../shared/types/model.type";
|
|
|
4
4
|
import { type ShellElement } from "../../shell/mesh/mesh-shells";
|
|
5
5
|
import type { FeaMesh } from "../../shell/types/results.type";
|
|
6
6
|
import type { FeaModel } from "../types/model.type";
|
|
7
|
-
|
|
7
|
+
import { type MemberConnectivity } from "./member-connectivity";
|
|
8
|
+
/** A member with the nodes lying inside it, where the solver splits it. */
|
|
8
9
|
export interface SplitMember extends Member {
|
|
9
|
-
/**
|
|
10
|
+
/** Model and generated node ids strictly between its ends, in order from the start. */
|
|
10
11
|
through?: FeaId[];
|
|
11
12
|
}
|
|
12
13
|
/** The model the solver analyses: shells meshed, line restraints spread to their nodes. */
|
|
13
14
|
export interface ExpandedModel {
|
|
14
15
|
/**
|
|
15
|
-
* Nodes include the generated ones; `shells` are the elements; members list the
|
|
16
|
-
*
|
|
16
|
+
* Nodes include the generated ones; `shells` are the elements; members list the nodes they
|
|
17
|
+
* pass through; restraints include the lines.
|
|
17
18
|
*/
|
|
18
19
|
model: FeaModel & {
|
|
19
20
|
shells: ShellElement[];
|
|
@@ -21,11 +22,13 @@ export interface ExpandedModel {
|
|
|
21
22
|
};
|
|
22
23
|
/** The shell mesh for the result; undefined without shells. */
|
|
23
24
|
mesh: FeaMesh | undefined;
|
|
25
|
+
/** Model nodes connected to members, and those that just miss one (see `memberConnectivity`). */
|
|
26
|
+
connectivity: MemberConnectivity;
|
|
24
27
|
warnings: Warnings;
|
|
25
28
|
}
|
|
26
29
|
/**
|
|
27
|
-
* Meshes a valid model's shell areas, spreads its line restraints and marks
|
|
28
|
-
* generated nodes
|
|
29
|
-
*
|
|
30
|
+
* Meshes a valid model's shell areas, spreads its line restraints and marks where each member
|
|
31
|
+
* is split: at the generated mesh nodes and at the model nodes on it (see `meshShells` and
|
|
32
|
+
* `splitMembers`).
|
|
30
33
|
*/
|
|
31
34
|
export declare const expandModel: (model: FeaModel) => ExpandedModel;
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.expandModel = void 0;
|
|
4
4
|
const frame_constant_1 = require("../../../core/constants/frame.constant");
|
|
5
|
+
const nodes_along_members_1 = require("../../frame/solver/nodes-along-members");
|
|
5
6
|
const shell_axes_1 = require("../../shell/elements/shell-axes");
|
|
6
7
|
const mesh_shells_1 = require("../../shell/mesh/mesh-shells");
|
|
8
|
+
const member_connectivity_1 = require("./member-connectivity");
|
|
7
9
|
const DOF_KEYS = ["ux", "uy", "uz", "rx", "ry", "rz"];
|
|
8
10
|
/**
|
|
9
11
|
* Restraints of every node on each line restraint's segment (ends included), merged with the
|
|
@@ -71,68 +73,49 @@ const disconnectedNodes = (model, meshNodes) => {
|
|
|
71
73
|
return warnings;
|
|
72
74
|
};
|
|
73
75
|
/**
|
|
74
|
-
* The
|
|
75
|
-
*
|
|
76
|
+
* The nodes lying strictly inside each member, where the solver splits it: the generated mesh
|
|
77
|
+
* nodes (a beam along a meshed edge, so it shares them with the shells) and the model nodes it
|
|
78
|
+
* connects to (see `findMemberConnectivity`).
|
|
76
79
|
*/
|
|
77
80
|
const splitMembers = (model, generated) => {
|
|
78
81
|
const members = model.members ?? [];
|
|
79
|
-
|
|
80
|
-
return members;
|
|
82
|
+
const { connected, connectivity } = (0, member_connectivity_1.findMemberConnectivity)(model);
|
|
81
83
|
const position = new Map(model.nodes.map((n) => [n.id, [n.x, n.y, n.z]]));
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
const slack = frame_constant_1.AREA_GEOMETRY_TOLERANCE * Math.hypot(Q[0] - P[0], Q[1] - P[1], Q[2] - P[2]);
|
|
87
|
-
const through = [];
|
|
88
|
-
for (const node of generated) {
|
|
89
|
-
const x = [node.x, node.y, node.z];
|
|
90
|
-
if (x.some((v, k) => v < lo[k] - slack || v > hi[k] + slack))
|
|
91
|
-
continue;
|
|
92
|
-
const t = (0, mesh_shells_1.pointOnSegment)(x, P, Q);
|
|
93
|
-
if (t !== null)
|
|
94
|
-
through.push({ id: node.id, t });
|
|
95
|
-
}
|
|
96
|
-
return through.length === 0
|
|
97
|
-
? member
|
|
98
|
-
: { ...member, through: through.sort((a, b) => a.t - b.t).map((h) => h.id) };
|
|
84
|
+
const meshed = (0, nodes_along_members_1.nodesAlongMembers)(members, (id) => position.get(id), generated, (_, L) => frame_constant_1.AREA_GEOMETRY_TOLERANCE * L);
|
|
85
|
+
const split = members.map((member, i) => {
|
|
86
|
+
const through = [...connected[i], ...meshed[i]].sort((a, b) => a.x - b.x).map((h) => h.nodeId);
|
|
87
|
+
return through.length === 0 ? member : { ...member, through };
|
|
99
88
|
});
|
|
89
|
+
return { members: split, connectivity };
|
|
100
90
|
};
|
|
101
91
|
/**
|
|
102
|
-
* Meshes a valid model's shell areas, spreads its line restraints and marks
|
|
103
|
-
* generated nodes
|
|
104
|
-
*
|
|
92
|
+
* Meshes a valid model's shell areas, spreads its line restraints and marks where each member
|
|
93
|
+
* is split: at the generated mesh nodes and at the model nodes on it (see `meshShells` and
|
|
94
|
+
* `splitMembers`).
|
|
105
95
|
*/
|
|
106
96
|
const expandModel = (model) => {
|
|
107
97
|
const shells = model.shells ?? [];
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
members: model.members ?? [],
|
|
113
|
-
shells: [],
|
|
114
|
-
restraints: spreadLineRestraints(model, model.nodes),
|
|
115
|
-
},
|
|
116
|
-
mesh: undefined,
|
|
117
|
-
warnings: [],
|
|
118
|
-
};
|
|
119
|
-
}
|
|
120
|
-
const meshed = (0, mesh_shells_1.meshShells)(model.nodes, shells);
|
|
121
|
-
const nodes = [...model.nodes, ...meshed.nodes];
|
|
122
|
-
const meshNodes = new Set(meshed.elements.flatMap((e) => e.nodeIds));
|
|
98
|
+
const meshed = shells.length > 0 ? (0, mesh_shells_1.meshShells)(model.nodes, shells) : undefined;
|
|
99
|
+
const nodes = meshed ? [...model.nodes, ...meshed.nodes] : model.nodes;
|
|
100
|
+
const split = splitMembers(model, meshed?.nodes ?? []);
|
|
101
|
+
const meshNodes = new Set(meshed?.elements.flatMap((e) => e.nodeIds));
|
|
123
102
|
return {
|
|
124
103
|
model: {
|
|
125
104
|
...model,
|
|
126
105
|
nodes,
|
|
127
|
-
members:
|
|
128
|
-
shells: meshed
|
|
106
|
+
members: split.members,
|
|
107
|
+
shells: meshed?.elements ?? [],
|
|
129
108
|
restraints: spreadLineRestraints(model, nodes),
|
|
130
109
|
},
|
|
131
|
-
mesh: {
|
|
110
|
+
mesh: meshed && {
|
|
132
111
|
nodes: meshed.nodes,
|
|
133
112
|
shells: meshed.elements.map(({ id, areaId, nodeIds }) => ({ id, areaId, nodeIds })),
|
|
134
113
|
},
|
|
135
|
-
|
|
114
|
+
connectivity: split.connectivity,
|
|
115
|
+
warnings: [
|
|
116
|
+
...split.connectivity.warnings,
|
|
117
|
+
...(meshed ? disconnectedNodes(model, meshNodes) : []),
|
|
118
|
+
],
|
|
136
119
|
};
|
|
137
120
|
};
|
|
138
121
|
exports.expandModel = expandModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expand-model.js","sourceRoot":"","sources":["../../../../src/fea/analysis/mesh/expand-model.ts"],"names":[],"mappings":";;;AAAA,uEAA6E;
|
|
1
|
+
{"version":3,"file":"expand-model.js","sourceRoot":"","sources":["../../../../src/fea/analysis/mesh/expand-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { Warnings } from "../../../core/types/output-message.type";
|
|
2
|
+
import { type NodeAlongMember } from "../../frame/solver/nodes-along-members";
|
|
3
|
+
import type { MemberIntermediateNode, MemberNearMissNode } from "../../frame/types/results.type";
|
|
4
|
+
import type { FeaModel } from "../types/model.type";
|
|
5
|
+
/** How the members of a model connect to the model nodes lying on or near them. */
|
|
6
|
+
export interface MemberConnectivity {
|
|
7
|
+
/** Model nodes on a member between its ends, connected to it; member by member from its start. */
|
|
8
|
+
intermediateNodes: MemberIntermediateNode[];
|
|
9
|
+
/** Model nodes close to a member but not on it, so not connected; in the same order. */
|
|
10
|
+
nearMissNodes: MemberNearMissNode[];
|
|
11
|
+
/** One "Member connectivity" warning per near miss. */
|
|
12
|
+
warnings: Warnings;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* The connectivity of a model's members, and for each member the model nodes it connects to
|
|
16
|
+
* (unrounded, in order from its start), which is where the solver splits it. Members with an
|
|
17
|
+
* unknown or invalid end node or zero length, and nodes with invalid coordinates, are skipped,
|
|
18
|
+
* so a model that is still being edited can be checked.
|
|
19
|
+
*/
|
|
20
|
+
export declare const findMemberConnectivity: (model: FeaModel) => {
|
|
21
|
+
connected: NodeAlongMember[][];
|
|
22
|
+
connectivity: MemberConnectivity;
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* Finds how a model's members connect to the model nodes lying on or near them, without
|
|
26
|
+
* analysing it: the same check `analyze` makes, cheap enough to run on every edit so a
|
|
27
|
+
* frontend can mark the points while the user draws (`analyze` cannot report them when the
|
|
28
|
+
* model is unstable).
|
|
29
|
+
*
|
|
30
|
+
* - A model node within `AREA_GEOMETRY_TOLERANCE` × the member length of a member's axis,
|
|
31
|
+
* strictly between its ends, is connected to it: listed in `intermediateNodes`.
|
|
32
|
+
* - A model node further off, but within `NODE_NEAR_MEMBER_RATIO` × the length and at most
|
|
33
|
+
* `NODE_NEAR_MEMBER_MAX_DISTANCE`, is not connected: listed in `nearMissNodes`, with a
|
|
34
|
+
* warning.
|
|
35
|
+
*
|
|
36
|
+
* Members with `connectIntermediateNodes: false` are skipped. The model need not be valid:
|
|
37
|
+
* members with an unknown or invalid end node or zero length, and nodes with invalid
|
|
38
|
+
* coordinates, are skipped (`validateModel` reports them). Shell-mesh nodes are not included.
|
|
39
|
+
*
|
|
40
|
+
* @param model - The model; only its nodes and members are used
|
|
41
|
+
* @returns `intermediateNodes`, `nearMissNodes` (positions and distances in mm) and `warnings`
|
|
42
|
+
*/
|
|
43
|
+
export declare const memberConnectivity: (model: FeaModel) => MemberConnectivity;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.memberConnectivity = exports.findMemberConnectivity = void 0;
|
|
4
|
+
const frame_constant_1 = require("../../../core/constants/frame.constant");
|
|
5
|
+
const nodes_along_members_1 = require("../../frame/solver/nodes-along-members");
|
|
6
|
+
const issues_1 = require("../../shared/validation/issues");
|
|
7
|
+
const math_1 = require("../../../utils/math");
|
|
8
|
+
/** Near-miss distance (mm) for a member of length `L`: see `NODE_NEAR_MEMBER_RATIO`. */
|
|
9
|
+
const nearMissDistance = (L) => Math.min(frame_constant_1.NODE_NEAR_MEMBER_RATIO * L, frame_constant_1.NODE_NEAR_MEMBER_MAX_DISTANCE);
|
|
10
|
+
/** Formats a distance in mm for a warning, to three significant figures. */
|
|
11
|
+
const formatMm = (v) => String(Number(v.toPrecision(3)));
|
|
12
|
+
const NOWHERE = [Number.NaN, Number.NaN, Number.NaN];
|
|
13
|
+
/**
|
|
14
|
+
* The connectivity of a model's members, and for each member the model nodes it connects to
|
|
15
|
+
* (unrounded, in order from its start), which is where the solver splits it. Members with an
|
|
16
|
+
* unknown or invalid end node or zero length, and nodes with invalid coordinates, are skipped,
|
|
17
|
+
* so a model that is still being edited can be checked.
|
|
18
|
+
*/
|
|
19
|
+
const findMemberConnectivity = (model) => {
|
|
20
|
+
const members = model.members ?? [];
|
|
21
|
+
const nodes = (model.nodes ?? []).filter((n) => (0, issues_1.isFiniteNumber)(n.x) && (0, issues_1.isFiniteNumber)(n.y) && (0, issues_1.isFiniteNumber)(n.z));
|
|
22
|
+
const position = new Map(nodes.map((n) => [n.id, [n.x, n.y, n.z]]));
|
|
23
|
+
// an unknown end gives a NaN length, which skips the member
|
|
24
|
+
const found = (0, nodes_along_members_1.nodesAlongMembers)(members, (id) => position.get(id) ?? NOWHERE, nodes, (member, L) => member.connectIntermediateNodes === false
|
|
25
|
+
? null
|
|
26
|
+
: Math.max(frame_constant_1.AREA_GEOMETRY_TOLERANCE * L, nearMissDistance(L)));
|
|
27
|
+
const intermediateNodes = [];
|
|
28
|
+
const nearMissNodes = [];
|
|
29
|
+
const warnings = [];
|
|
30
|
+
members.forEach((member, i) => {
|
|
31
|
+
for (const h of found[i]) {
|
|
32
|
+
const at = { memberId: member.id, nodeId: h.nodeId, x: (0, math_1.roundToDecimalPlaces)(h.x, 3) };
|
|
33
|
+
if (h.on) {
|
|
34
|
+
intermediateNodes.push(at);
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
nearMissNodes.push({ ...at, distance: (0, math_1.roundToDecimalPlaces)(h.distance, 3) });
|
|
38
|
+
warnings.push({
|
|
39
|
+
reference: "Member connectivity",
|
|
40
|
+
message: `Node "${String(h.nodeId)}" is ${formatMm(h.distance)} mm from member "${String(member.id)}" (${formatMm(h.x)} mm from its start) but not on it, so it is not connected to the member; move the node onto the member if they should be connected.`,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
return {
|
|
45
|
+
connected: found.map((hits) => hits.filter((h) => h.on)),
|
|
46
|
+
connectivity: { intermediateNodes, nearMissNodes, warnings },
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
exports.findMemberConnectivity = findMemberConnectivity;
|
|
50
|
+
/**
|
|
51
|
+
* Finds how a model's members connect to the model nodes lying on or near them, without
|
|
52
|
+
* analysing it: the same check `analyze` makes, cheap enough to run on every edit so a
|
|
53
|
+
* frontend can mark the points while the user draws (`analyze` cannot report them when the
|
|
54
|
+
* model is unstable).
|
|
55
|
+
*
|
|
56
|
+
* - A model node within `AREA_GEOMETRY_TOLERANCE` × the member length of a member's axis,
|
|
57
|
+
* strictly between its ends, is connected to it: listed in `intermediateNodes`.
|
|
58
|
+
* - A model node further off, but within `NODE_NEAR_MEMBER_RATIO` × the length and at most
|
|
59
|
+
* `NODE_NEAR_MEMBER_MAX_DISTANCE`, is not connected: listed in `nearMissNodes`, with a
|
|
60
|
+
* warning.
|
|
61
|
+
*
|
|
62
|
+
* Members with `connectIntermediateNodes: false` are skipped. The model need not be valid:
|
|
63
|
+
* members with an unknown or invalid end node or zero length, and nodes with invalid
|
|
64
|
+
* coordinates, are skipped (`validateModel` reports them). Shell-mesh nodes are not included.
|
|
65
|
+
*
|
|
66
|
+
* @param model - The model; only its nodes and members are used
|
|
67
|
+
* @returns `intermediateNodes`, `nearMissNodes` (positions and distances in mm) and `warnings`
|
|
68
|
+
*/
|
|
69
|
+
const memberConnectivity = (model) => (0, exports.findMemberConnectivity)(model).connectivity;
|
|
70
|
+
exports.memberConnectivity = memberConnectivity;
|
|
71
|
+
//# sourceMappingURL=member-connectivity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"member-connectivity.js","sourceRoot":"","sources":["../../../../src/fea/analysis/mesh/member-connectivity.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { RawState } from "../solver/load-case-solver";
|
|
|
4
4
|
import type { FeaCaseResult } from "../types/results.type";
|
|
5
5
|
/**
|
|
6
6
|
* The presented diagram of model member `g` (an index into `system.memberGroups`) in a raw
|
|
7
|
-
* state, stitched from its pieces when
|
|
7
|
+
* state, stitched from its pieces when nodes inside it split it.
|
|
8
8
|
*
|
|
9
9
|
* @param stations - Evenly spaced stations
|
|
10
10
|
* @param withStations - false keeps only the extremes (empty `stations`)
|
|
@@ -73,7 +73,7 @@ const equilibrium = (system, state) => {
|
|
|
73
73
|
};
|
|
74
74
|
/**
|
|
75
75
|
* The presented diagram of model member `g` (an index into `system.memberGroups`) in a raw
|
|
76
|
-
* state, stitched from its pieces when
|
|
76
|
+
* state, stitched from its pieces when nodes inside it split it.
|
|
77
77
|
*
|
|
78
78
|
* @param stations - Evenly spaced stations
|
|
79
79
|
* @param withStations - false keeps only the extremes (empty `stations`)
|
|
@@ -128,7 +128,7 @@ const presentState = (system, state, meta, diagram = {}) => {
|
|
|
128
128
|
my: roundForce(R[6 * n + 4], 1e-6),
|
|
129
129
|
mz: roundForce(R[6 * n + 5], 1e-6),
|
|
130
130
|
})),
|
|
131
|
-
// a member split
|
|
131
|
+
// a member split at nodes inside it: its start is its first piece's, its end its last's
|
|
132
132
|
memberEndForces: system.memberGroups.map(({ id, pieces }) => ({
|
|
133
133
|
memberId: id,
|
|
134
134
|
start: endForce(state.memberForces[pieces[0]].slice(0, 6)),
|