@theerapat-s28/ts-structural-eng-tools 3.0.0 → 3.2.0

package/dist/fea/{frame/solver/frame-system.js → analysis/solver/analysis-system.js}

@@ -1,33 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareFrameSystem = void 0;
+exports.prepareAnalysisSystem = void 0;
 const frame_constant_1 = require("../../../core/constants/frame.constant");
-const frame_analysis_error_1 = require("../../../core/errors/frame-analysis.error");
+const fea_error_1 = require("../../../core/errors/fea.error");
+const member_assembly_1 = require("../../frame/solver/member-assembly");
+const system_member_1 = require("../../frame/solver/system-member");
+const auto_restraint_1 = require("../../shared/solver/auto-restraint");
+const boundary_conditions_1 = require("../../shared/solver/boundary-conditions");
+const global_assembly_1 = require("../../shared/solver/global-assembly");
+const issues_1 = require("../../shared/validation/issues");
+const system_shell_1 = require("../../shell/solver/system-shell");
 const skyline_1 = require("../../../utils/skyline");
-const beam_3d_stiffness_1 = require("../elements/beam-3d-stiffness");
-const end_releases_1 = require("../elements/end-releases");
-const flat_shell_1 = require("../elements/shell/flat-shell");
-const quad_geometry_1 = require("../elements/shell/quad-geometry");
-const static_condensation_1 = require("../elements/static-condensation");
-const coordinate_transform_1 = require("../transformation/coordinate-transform");
-const validate_model_1 = require("../validation/validate-model");
-const auto_restraint_1 = require("./auto-restraint");
-const boundary_conditions_1 = require("./boundary-conditions");
-const global_assembly_1 = require("./global-assembly");
 const DOF_NAMES = ["ux", "uy", "uz", "rx", "ry", "rz"];
 /**
- * Builds the member and shell matrices of a model that passed `validateFrameModel`, assembles
+ * Builds the member and shell matrices of a model that passed `validateModel`, assembles
  * the free stiffness in skyline storage with nodes in reverse Cuthill–McKee order, and
  * factorises it once for all load cases. Joint rotations that nothing resists (e.g. at truss
  * joints) are held by a spring along each null direction, which carries no force.
  *
- * @throws {FrameAnalysisError} 328 if a node connected only to shells has a translation that
+ * @throws {FeaError} 328 if a node connected only to shells has a translation that
  *   nothing resists (a membrane's out-of-plane or a plate's in-plane direction), with `nodeId`,
  *   `shellId` and `dof`; 304 if the structure is a mechanism; `details` names a node and a DOF
  *   involved in it
  */
-const prepareFrameSystem = (model) => {
-    const { nodes, members, restraints } = model;
+const prepareAnalysisSystem = (model) => {
+    const { nodes, members = [], restraints } = model;
     // shell elements: after `expandModel` they carry their area's id
     const shells = (model.shells ?? []);
     const nodeIndex = new Map(nodes.map((n, i) => [n.id, i]));
@@ -35,78 +32,8 @@ const prepareFrameSystem = (model) => {
     const shellIndex = new Map(shells.map((sh, i) => [sh.id, i]));
     const dofCount = 6 * nodes.length;
     const boundary = (0, boundary_conditions_1.buildBoundaryConditions)(restraints, nodeIndex, dofCount);
-    const point = (id) => {
-        const n = nodes[nodeIndex.get(id)];
-        return [n.x, n.y, n.z];
-    };
-    const systemMembers = [];
-    const memberGroups = members.map((member) => {
-        // pieces between the member's ends and the mesh nodes inside it (see `expandModel`)
-        const chain = [member.startNodeId, ...(member.through ?? []), member.endNodeId];
-        const whole = (0, coordinate_transform_1.memberAxes)(point(member.startNodeId), point(member.endNodeId), member.angle ?? 0);
-        const { E, G, A, I22, I33, J } = member.section;
-        const pieces = [];
-        let offset = 0;
-        for (let k = 0; k + 1 < chain.length; k++) {
-            const { length, lambda } = chain.length === 2
-                ? whole
-                : (0, coordinate_transform_1.memberAxes)(point(chain[k]), point(chain[k + 1]), member.angle ?? 0);
-            // releases only at the member's own ends
-            const releases = (0, end_releases_1.memberEndReleases)({
-                start: k === 0 ? member.releases?.start : undefined,
-                end: k === chain.length - 2 ? member.releases?.end : undefined,
-            });
-            const condensed = (0, static_condensation_1.condenseMember)((0, beam_3d_stiffness_1.beam3dLocalStiffnessRightHanded)(E, G, A, I22, I33, J, length), releases);
-            pieces.push(systemMembers.length);
-            systemMembers.push({
-                id: member.id,
-                offset,
-                section: member.section,
-                startIndex: nodeIndex.get(chain[k]),
-                endIndex: nodeIndex.get(chain[k + 1]),
-                T: (0, coordinate_transform_1.transformationMatrix)(lambda),
-                k: condensed.k,
-                hasReleases: releases.length > 0,
-                condenseFixedEndForces: condensed.condenseFixedEndForces,
-                memberEndDisplacements: condensed.memberEndDisplacements,
-                length,
-                lambda,
-            });
-            offset += length;
-        }
-        return {
-            id: member.id,
-            pieces,
-            section: member.section,
-            length: whole.length,
-            lambda: whole.lambda,
-        };
-    });
-    const systemShells = shells.map((shell) => {
-        const nodeIndices = shell.nodeIds.map((id) => nodeIndex.get(id));
-        const points = nodeIndices.map((n) => [nodes[n].x, nodes[n].y, nodes[n].z]);
-        const { thickness, E, nu } = shell.section;
-        const m = shell.modifiers ?? {};
-        const type = shell.type ?? "shell";
-        const element = (0, flat_shell_1.flatShellElement)(points, {
-            E,
-            nu,
-            t: thickness,
-            type,
-            membraneModifiers: [m.f11 ?? 1, m.f22 ?? 1, m.f12 ?? 1],
-            bendingModifiers: [m.m11 ?? 1, m.m22 ?? 1, m.m12 ?? 1],
-        }, shell.angle ?? 0);
-        return {
-            id: shell.id,
-            areaId: shell.areaId ?? shell.id,
-            nodeIndices,
-            type,
-            section: shell.section,
-            modifiers: m,
-            element,
-            cornerAreas: (0, quad_geometry_1.cornerAreas)(element.axes.corners),
-        };
-    });
+    const { pieces: systemMembers, groups: memberGroups } = (0, system_member_1.prepareSystemMembers)(members, nodes, nodeIndex);
+    const systemShells = (0, system_shell_1.prepareSystemShells)(shells, nodes, nodeIndex);
     const shellsByArea = new Map();
     systemShells.forEach((sh, s) => {
         const list = shellsByArea.get(sh.areaId);
@@ -118,7 +45,7 @@ const prepareFrameSystem = (model) => {
     // Everything that adds stiffness, as elements over 6 DOFs per node; members have 2 nodes
     const memberElements = systemMembers.map((m) => ({
         nodes: [m.startIndex, m.endIndex],
-        kGlobal: (0, global_assembly_1.memberGlobalStiffness)(m),
+        kGlobal: (0, member_assembly_1.memberGlobalStiffness)(m),
     }));
     const shellElements = systemShells.map((sh) => ({
         nodes: sh.nodeIndices,
@@ -131,9 +58,9 @@ const prepareFrameSystem = (model) => {
     const unresisted = (0, auto_restraint_1.findUnresistedTranslations)([...shellOnlyNodes].sort((a, b) => a - b), // issues in model order
     shellElements, boundary);
     if (unresisted.length > 0) {
-        (0, validate_model_1.throwIssues)(unresisted.map(({ node, axis }) => {
+        (0, issues_1.throwIssues)(unresisted.map(({ node, axis }) => {
             const lead = axis.reduce((best, c, i) => (Math.abs(c) > Math.abs(axis[best]) ? i : best), 0);
-            return (0, validate_model_1.frameIssue)(frame_analysis_error_1.FrameErrors.SHELL_DOF_UNSUPPORTED, {
+            return (0, issues_1.modelIssue)(fea_error_1.FeaErrors.SHELL_DOF_UNSUPPORTED, {
                 nodeId: nodes[node].id,
                 shellId: systemShells.find((sh) => sh.nodeIndices.includes(node))?.id,
                 dof: DOF_NAMES[lead],
@@ -220,8 +147,8 @@ const prepareFrameSystem = (model) => {
         const result = (0, skyline_1.skylineFactor)(K, frame_constant_1.SINGULARITY_TOLERANCE);
         if (!result.ok) {
             const dof = free[result.failedPivot];
-            (0, validate_model_1.throwIssues)([
-                (0, validate_model_1.frameIssue)(frame_analysis_error_1.FrameErrors.STRUCTURE_UNSTABLE, {
+            (0, issues_1.throwIssues)([
+                (0, issues_1.modelIssue)(fea_error_1.FeaErrors.STRUCTURE_UNSTABLE, {
                     nodeId: nodes[Math.floor(dof / 6)].id,
                     dof: DOF_NAMES[dof % 6],
                 }),
@@ -247,5 +174,5 @@ const prepareFrameSystem = (model) => {
         profileSize: factor ? (0, skyline_1.skylineSize)(factor) : 0,
     };
 };
-exports.prepareFrameSystem = prepareFrameSystem;
-//# sourceMappingURL=frame-system.js.map
+exports.prepareAnalysisSystem = prepareAnalysisSystem;
+//# sourceMappingURL=analysis-system.js.map

package/dist/fea/analysis/solver/analysis-system.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analysis-system.js","sourceRoot":"","sources":["../../../../src/fea/analysis/solver/analysis-system.ts"],"names":[],"mappings":"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"}

package/dist/fea/{frame/solver/analyze-frame.d.ts → analysis/solver/analyze.d.ts}

@@ -1,20 +1,22 @@
-import type { FrameId, FrameModel } from "../types/model.type";
-import type { FrameResult, MemberDiagram } from "../types/results.type";
-export interface AnalyzeFrameOptions {
+import type { MemberDiagram } from "../../frame/types/results.type";
+import type { FeaId } from "../../shared/types/model.type";
+import type { FeaModel } from "../types/model.type";
+import type { FeaResult } from "../types/results.type";
+export interface AnalyzeOptions {
     /** Number of evenly spaced stations per member diagram (default 21). */
     stations?: number;
     /**
      * `"full"` (default) returns every member diagram with its `stations`; `"extremes"` keeps
      * each diagram's `extremes` (so the envelope and `memberDemandEnvelope` still work) but leaves
      * `stations` empty, which makes large results far smaller. Full diagrams are then available on
-     * demand from `createFrameAnalysis(...).memberDiagram`.
+     * demand from `createAnalysis(...).memberDiagram`.
      */
     diagrams?: "full" | "extremes";
 }
 /** An analysed model whose member diagrams can be computed on demand. */
-export interface FrameAnalysis {
-    /** The same result `analyzeFrame` returns. */
-    result: FrameResult;
+export interface Analysis {
+    /** The same result `analyze` returns. */
+    result: FeaResult;
     /**
      * The full diagram (stations and extremes) of one member for one load case or combination,
      * computed from the stored solution without re-analysing.
@@ -24,27 +26,28 @@ export interface FrameAnalysis {
      * @param stations - Evenly spaced stations (default: the analysis option, else 21)
      * @throws {Error} if either id is not in the model
      */
-    memberDiagram: (resultId: string, memberId: FrameId, stations?: number) => MemberDiagram;
+    memberDiagram: (resultId: string, memberId: FeaId, stations?: number) => MemberDiagram;
 }
 /**
- * Analyses a 3D frame like `analyzeFrame` and keeps the solution, so that full member diagrams
+ * Analyses a model like `analyze` and keeps the solution, so that full member diagrams
  * can be requested later one member at a time — e.g. analyse with `diagrams: "extremes"` and
  * draw a member's diagram when the user selects it. Run it in a Web Worker for large models.
  *
- * @param model - Nodes, members, restraints, load cases, loads tagged with their load case,
- *   null areas, and combinations
+ * @param model - Nodes, members, shells, restraints, load cases, loads tagged with their load
+ *   case, null areas, and combinations
  * @param options - Diagram station count and detail
  * @returns `{ result, memberDiagram }`
- * @throws {FrameAnalysisError} 301–317, 326 and 327 for an invalid model (with `details` and
+ * @throws {FeaError} 301–317, 326 and 327 for an invalid model (with `details` and
  *   every problem in `issues`), 328 for a translation nothing resists at a node connected only
  *   to shells, 304 for an unstable structure
  */
-export declare const createFrameAnalysis: (model: FrameModel, options?: AnalyzeFrameOptions) => FrameAnalysis;
+export declare const createAnalysis: (model: FeaModel, options?: AnalyzeOptions) => Analysis;
 /**
- * Analyses a 3D frame by the direct stiffness method (linear elastic, small displacements)
- * for every load case, then forms every load combination by superposition.
+ * Analyses a 3D structure of frame members, shell areas or both by the direct stiffness method
+ * (linear elastic, small displacements) for every load case, then forms every load combination
+ * by superposition.
  *
- * The model is validated first (`validateFrameModel`). The stiffness matrix is assembled once
+ * The model is validated first (`validateModel`). The stiffness matrix is assembled once
  * in skyline storage with the nodes in reverse Cuthill–McKee order and factorised once; each
  * load case is a separate solve. A combination is the factored sum of its load cases (nested
  * combinations are expanded), and its member diagrams are rebuilt from the combined end forces
@@ -62,13 +65,13 @@ export declare const createFrameAnalysis: (model: FrameModel, options?: AnalyzeF
  *
  * Model and result are plain data (JSON-serialisable), so the analysis can run in a Web Worker.
  *
- * @param model - Nodes, members, restraints, load cases, loads tagged with their load case,
- *   null areas, and combinations
+ * @param model - Nodes, members, shells, restraints, load cases, loads tagged with their load
+ *   case, null areas, and combinations
  * @param options - Diagram station count and detail
  * @returns `cases` and `combinations` keyed by id, `envelope` over the combinations,
  *   `calculationDetails`, `units` and `warnings`
- * @throws {FrameAnalysisError} 301–317, 326 and 327 for an invalid model (with `details` and
+ * @throws {FeaError} 301–317, 326 and 327 for an invalid model (with `details` and
  *   every problem in `issues`), 328 for a translation nothing resists at a node connected only
  *   to shells, 304 for an unstable structure
  */
-export declare const analyzeFrame: (model: FrameModel, options?: AnalyzeFrameOptions) => FrameResult;
+export declare const analyze: (model: FeaModel, options?: AnalyzeOptions) => FeaResult;

package/dist/fea/{frame/solver/analyze-frame.js → analysis/solver/analyze.js}

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeFrame = exports.createFrameAnalysis = void 0;
+exports.analyze = exports.createAnalysis = void 0;
+const area_member_loads_1 = require("../../frame/area/area-member-loads");
+const issues_1 = require("../../shared/validation/issues");
 const math_1 = require("../../../utils/math");
-const distribute_area_loads_1 = require("../area/distribute-area-loads");
 const envelope_1 = require("../post/envelope");
 const present_state_1 = require("../post/present-state");
-const validate_model_1 = require("../validation/validate-model");
 const expand_model_1 = require("../mesh/expand-model");
+const validate_model_1 = require("../validation/validate-model");
 const combinations_1 = require("./combinations");
-const frame_system_1 = require("./frame-system");
+const analysis_system_1 = require("./analysis-system");
 const load_case_solver_1 = require("./load-case-solver");
 const ROTATION_DOFS = ["rx", "ry", "rz"];
 /** The presented form of the joint rotations held by the solver. */
@@ -34,28 +35,28 @@ const groupByCase = (loads = []) => {
     return groups;
 };
 /**
- * Analyses a 3D frame like `analyzeFrame` and keeps the solution, so that full member diagrams
+ * Analyses a model like `analyze` and keeps the solution, so that full member diagrams
  * can be requested later one member at a time — e.g. analyse with `diagrams: "extremes"` and
  * draw a member's diagram when the user selects it. Run it in a Web Worker for large models.
  *
- * @param model - Nodes, members, restraints, load cases, loads tagged with their load case,
- *   null areas, and combinations
+ * @param model - Nodes, members, shells, restraints, load cases, loads tagged with their load
+ *   case, null areas, and combinations
  * @param options - Diagram station count and detail
  * @returns `{ result, memberDiagram }`
- * @throws {FrameAnalysisError} 301–317, 326 and 327 for an invalid model (with `details` and
+ * @throws {FeaError} 301–317, 326 and 327 for an invalid model (with `details` and
  *   every problem in `issues`), 328 for a translation nothing resists at a node connected only
  *   to shells, 304 for an unstable structure
  */
-const createFrameAnalysis = (model, options = {}) => {
-    const issues = (0, validate_model_1.validateFrameModel)(model);
+const createAnalysis = (model, options = {}) => {
+    const issues = (0, validate_model_1.validateModel)(model);
     if (issues.length > 0)
-        (0, validate_model_1.throwIssues)(issues);
+        (0, issues_1.throwIssues)(issues);
     const expanded = (0, expand_model_1.expandModel)(model);
-    const system = (0, frame_system_1.prepareFrameSystem)(expanded.model);
+    const system = (0, analysis_system_1.prepareAnalysisSystem)(expanded.model);
     const combinations = model.combinations ?? [];
     const resolved = (0, combinations_1.resolveCombinations)(combinations, new Set(model.loadCases.map((c) => c.id)));
     const withStations = (options.diagrams ?? "full") === "full";
-    const fromAreas = (0, distribute_area_loads_1.areaMemberLoads)(model);
+    const fromAreas = (0, area_member_loads_1.areaMemberLoads)(model);
     const states = new Map();
     const cases = {};
     const nodalByCase = groupByCase(model.nodalLoads);
@@ -132,12 +133,13 @@ const createFrameAnalysis = (model, options = {}) => {
         },
     };
 };
-exports.createFrameAnalysis = createFrameAnalysis;
+exports.createAnalysis = createAnalysis;
 /**
- * Analyses a 3D frame by the direct stiffness method (linear elastic, small displacements)
- * for every load case, then forms every load combination by superposition.
+ * Analyses a 3D structure of frame members, shell areas or both by the direct stiffness method
+ * (linear elastic, small displacements) for every load case, then forms every load combination
+ * by superposition.
  *
- * The model is validated first (`validateFrameModel`). The stiffness matrix is assembled once
+ * The model is validated first (`validateModel`). The stiffness matrix is assembled once
  * in skyline storage with the nodes in reverse Cuthill–McKee order and factorised once; each
  * load case is a separate solve. A combination is the factored sum of its load cases (nested
  * combinations are expanded), and its member diagrams are rebuilt from the combined end forces
@@ -155,15 +157,15 @@ exports.createFrameAnalysis = createFrameAnalysis;
  *
  * Model and result are plain data (JSON-serialisable), so the analysis can run in a Web Worker.
  *
- * @param model - Nodes, members, restraints, load cases, loads tagged with their load case,
- *   null areas, and combinations
+ * @param model - Nodes, members, shells, restraints, load cases, loads tagged with their load
+ *   case, null areas, and combinations
  * @param options - Diagram station count and detail
  * @returns `cases` and `combinations` keyed by id, `envelope` over the combinations,
  *   `calculationDetails`, `units` and `warnings`
- * @throws {FrameAnalysisError} 301–317, 326 and 327 for an invalid model (with `details` and
+ * @throws {FeaError} 301–317, 326 and 327 for an invalid model (with `details` and
  *   every problem in `issues`), 328 for a translation nothing resists at a node connected only
  *   to shells, 304 for an unstable structure
  */
-const analyzeFrame = (model, options = {}) => (0, exports.createFrameAnalysis)(model, options).result;
-exports.analyzeFrame = analyzeFrame;
-//# sourceMappingURL=analyze-frame.js.map
+const analyze = (model, options = {}) => (0, exports.createAnalysis)(model, options).result;
+exports.analyze = analyze;
+//# sourceMappingURL=analyze.js.map

package/dist/fea/analysis/solver/analyze.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../../src/fea/analysis/solver/analyze.ts"],"names":[],"mappings":"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"}

package/dist/fea/{frame → analysis}/solver/combinations.d.ts

@@ -5,7 +5,7 @@ import type { LoadCombination } from "../types/model.type";
  * @param combinations - Model combinations
  * @param caseIds - Ids of the model's load cases
  * @returns For each combination id, the net factor on each load case it uses
- * @throws {FrameAnalysisError} 309 for an unknown or missing reference, 310 for a loop,
+ * @throws {FeaError} 309 for an unknown or missing reference, 310 for a loop,
  *   311 for a non-finite factor or an empty combination
  */
 export declare const resolveCombinations: (combinations: LoadCombination[], caseIds: Set<string>) => Map<string, Map<string, number>>;

package/dist/fea/{frame → analysis}/solver/combinations.js

@@ -1,42 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveCombinations = void 0;
-const frame_analysis_error_1 = require("../../../core/errors/frame-analysis.error");
+const fea_error_1 = require("../../../core/errors/fea.error");
 /**
  * Expands every combination into net factors on load cases, following nested combinations.
  *
  * @param combinations - Model combinations
  * @param caseIds - Ids of the model's load cases
  * @returns For each combination id, the net factor on each load case it uses
- * @throws {FrameAnalysisError} 309 for an unknown or missing reference, 310 for a loop,
+ * @throws {FeaError} 309 for an unknown or missing reference, 310 for a loop,
  *   311 for a non-finite factor or an empty combination
  */
 const resolveCombinations = (combinations, caseIds) => {
     const byId = new Map(combinations.map((c) => [c.id, c]));
     for (const combination of combinations) {
         if (!Array.isArray(combination.terms) || combination.terms.length === 0) {
-            throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.INVALID_LOAD_FACTOR, {
+            throw new fea_error_1.FeaError(fea_error_1.FeaErrors.INVALID_LOAD_FACTOR, {
                 combinationId: combination.id,
             });
         }
         for (const term of combination.terms) {
             if (!Number.isFinite(term.factor))
-                throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.INVALID_LOAD_FACTOR, {
+                throw new fea_error_1.FeaError(fea_error_1.FeaErrors.INVALID_LOAD_FACTOR, {
                     combinationId: combination.id,
                 });
             const isCase = "case" in term && term.case !== undefined;
             const isCombination = "combination" in term && term.combination !== undefined;
             if (isCase === isCombination)
-                throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.UNKNOWN_LOAD_CASE, {
+                throw new fea_error_1.FeaError(fea_error_1.FeaErrors.UNKNOWN_LOAD_CASE, {
                     combinationId: combination.id,
                 });
             if (isCase && !caseIds.has(term.case)) {
-                throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.UNKNOWN_LOAD_CASE, {
+                throw new fea_error_1.FeaError(fea_error_1.FeaErrors.UNKNOWN_LOAD_CASE, {
                     combinationId: combination.id,
                 });
             }
             if (isCombination && !byId.has(term.combination)) {
-                throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.UNKNOWN_LOAD_CASE, {
+                throw new fea_error_1.FeaError(fea_error_1.FeaErrors.UNKNOWN_LOAD_CASE, {
                     combinationId: combination.id,
                 });
             }
@@ -49,7 +49,7 @@ const resolveCombinations = (combinations, caseIds) => {
         if (done)
             return done;
         if (visiting.has(id)) {
-            throw new frame_analysis_error_1.FrameAnalysisError(frame_analysis_error_1.FrameErrors.CIRCULAR_COMBINATION, { combinationId: id });
+            throw new fea_error_1.FeaError(fea_error_1.FeaErrors.CIRCULAR_COMBINATION, { combinationId: id });
         }
         visiting.add(id);
         const factors = new Map();

package/dist/fea/analysis/solver/combinations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"combinations.js","sourceRoot":"","sources":["../../../../src/fea/analysis/solver/combinations.ts"],"names":[],"mappings":"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"}

package/dist/fea/{frame/area → analysis/solver}/distribute-area-loads.d.ts

@@ -1,18 +1,9 @@
 import type { Warnings } from "../../../core/types/output-message.type";
-import type { FrameModel, MemberLoad } from "../types/model.type";
-/**
- * Turns the area loads of a model into member loads, assuming the model is valid (as
- * `validateFrameModel` checks): each area's edge profiles are built once, then scaled for each
- * of its loads and split into global X, Y and Z trapezoidal loads (plus torques for a cantilever).
- * Everything is linear in `q`, so load-case superposition still holds.
- */
-export declare const areaMemberLoads: (model: FrameModel) => {
-    memberLoads: MemberLoad[];
-    warnings: Warnings;
-};
+import type { MemberLoad } from "../../frame/types/model.type";
+import type { FeaModel } from "../types/model.type";
 /**
  * The member loads that a model's null areas send to the members along their edges — what
- * `analyzeFrame` adds to `memberLoads` — so they can be checked or previewed.
+ * `analyze` adds to `memberLoads` — so they can be checked or previewed.
  *
  * Two-way areas send each point to the nearest edge (corner-bisector split); one-way areas
  * split strips parallel to their unsupported edges half to each end; cantilever areas send
@@ -21,11 +12,11 @@ export declare const areaMemberLoads: (model: FrameModel) => {
  * `projected` load is first converted, `q · |n · direction|`) and come out as trapezoidal loads
  * per member length in global X, Y and Z (and torques), each tagged with its load case.
  *
- * @param model - The frame model, validated first
+ * @param model - The model, validated first
  * @returns `memberLoads` and `warnings` (a one-way support edge parallel to the span)
- * @throws {FrameAnalysisError} 301–317 for an invalid model, with every problem in `issues`
+ * @throws {FeaError} 301–317 for an invalid model, with every problem in `issues`
  */
-export declare const distributeAreaLoads: (model: FrameModel) => {
+export declare const distributeAreaLoads: (model: FeaModel) => {
     memberLoads: MemberLoad[];
     warnings: Warnings;
 };

package/dist/fea/analysis/solver/distribute-area-loads.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.distributeAreaLoads = void 0;
+const area_member_loads_1 = require("../../frame/area/area-member-loads");
+const issues_1 = require("../../shared/validation/issues");
+const validate_model_1 = require("../validation/validate-model");
+/**
+ * The member loads that a model's null areas send to the members along their edges — what
+ * `analyze` adds to `memberLoads` — so they can be checked or previewed.
+ *
+ * Two-way areas send each point to the nearest edge (corner-bisector split); one-way areas
+ * split strips parallel to their unsupported edges half to each end; cantilever areas send
+ * `q · c` and a torque `q · c² / 2` per unit length to their support edge (c = depth). Edges
+ * split by intermediate nodes are cut at those nodes. Loads are per unit true area (a
+ * `projected` load is first converted, `q · |n · direction|`) and come out as trapezoidal loads
+ * per member length in global X, Y and Z (and torques), each tagged with its load case.
+ *
+ * @param model - The model, validated first
+ * @returns `memberLoads` and `warnings` (a one-way support edge parallel to the span)
+ * @throws {FeaError} 301–317 for an invalid model, with every problem in `issues`
+ */
+const distributeAreaLoads = (model) => {
+    const issues = (0, validate_model_1.validateModel)(model);
+    if (issues.length > 0)
+        (0, issues_1.throwIssues)(issues);
+    return (0, area_member_loads_1.areaMemberLoads)(model);
+};
+exports.distributeAreaLoads = distributeAreaLoads;
+//# sourceMappingURL=distribute-area-loads.js.map

package/dist/fea/analysis/solver/distribute-area-loads.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"distribute-area-loads.js","sourceRoot":"","sources":["../../../../src/fea/analysis/solver/distribute-area-loads.ts"],"names":[],"mappings":";;;AACA,6EAAwE;AAExE,8DAAgE;AAGhE,iEAA6D;AAE7D;;;;;;;;;;;;;;GAcG;AACI,MAAM,mBAAmB,GAAG,CACjC,KAAe,EACoC,EAAE;IACrD,MAAM,MAAM,GAAG,IAAA,8BAAa,EAAC,KAAK,CAAC,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,mCAAe,EAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B"}

package/dist/fea/{frame → analysis}/solver/load-case-solver.d.ts

@@ -1,6 +1,8 @@
-import { type LocalMemberLoad } from "../elements/fixed-end-forces";
-import type { AreaLoad, LoadCase, MemberLoad, NodalLoad } from "../types/model.type";
-import type { FrameSystem } from "./frame-system";
+import { type LocalMemberLoad } from "../../frame/elements/fixed-end-forces";
+import type { MemberLoad } from "../../frame/types/model.type";
+import type { AreaLoad } from "../../shared/types/model.type";
+import type { LoadCase, NodalLoad } from "../types/model.type";
+import type { AnalysisSystem } from "./analysis-system";
 /**
  * Unrounded result of one load case or combination, in N and mm. Every field is linear in the
  * loads, so combinations are formed by factoring and adding states.
@@ -16,24 +18,18 @@ export interface RawState {
 /**
  * Solves one load case against the prepared, factorised system.
  *
- * Self-weight is `selfWeight · unitWeight · A` per unit member length along global −Z.
+ * Members take their loads and self-weight as fixed-end forces (see `memberPieceLoads`); shells
+ * take their area loads and self-weight as forces at their corners (see `addShellLoads`).
  *
  * @param loadCase - The load case (id and self-weight multiplier)
- * @param loads - The nodal and member loads tagged with this load case
- *
- * Shell areas take `selfWeight · unitWeight · thickness · modifiers.weight` per unit area along
- * −Z and their `AreaLoad`s as forces at their corners, each corner the share `∫ Nᵢ dA` of the
- * element's area on its mean plane (no corner moments, so a warped element's offsets do not load
- * the rotations auto-restraint holds).
- *
  * @param loads - The nodal and member loads tagged with this load case, and its area loads on
  *   shell areas
  *
- * @throws {FrameAnalysisError} 304 if a load has a moment about a joint rotation that nothing
+ * @throws {FeaError} 304 if a load has a moment about a joint rotation that nothing
  *   resists (an auto-restrained axis), 308 for a load outside its member, 313 if self-weight is
  *   requested for a member without `unitWeight`
  */
-export declare const solveLoadCase: (system: FrameSystem, loadCase: LoadCase, loads: {
+export declare const solveLoadCase: (system: AnalysisSystem, loadCase: LoadCase, loads: {
     nodalLoads: NodalLoad[];
     memberLoads: MemberLoad[];
     shellLoads?: AreaLoad[];