@theerapat-s28/ts-structural-eng-tools 1.3.0 → 1.5.0

package/dist/strengthening/rc-beam-side-plate-shear.js

@@ -0,0 +1,420 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareSidePlateShearCapacity = exports.sidePlateShearCapacityByTensionTie = exports.sidePlateShearCapacityByWebYielding = void 0;
+const rc_design_error_1 = require("../core/errors/rc-design.error");
+const MyMath = __importStar(require("../utils/math"));
+const RCConstants = __importStar(require("../core/constants/rc.constant"));
+const rc_beam_design_1 = require("../rc/rc-beam-design");
+const rc_beam_plate_interface_bolts_1 = require("./rc-beam-plate-interface-bolts");
+const plate_jacketing_type_1 = require("../core/types/plate-jacketing.type");
+const resolveSidePlateGeometry = (plates) => {
+    const sides = plates.sides ?? RCConstants.DEFAULT_SIDE_PLATE_SIDES;
+    const Es = plates.Es ?? RCConstants.DEFAULT_PLATE_ELASTIC_MODULUS;
+    const strips = plates.configuration === "strips";
+    // A continuous plate is the limiting case of strips with wp = s, so it carries
+    // a coverage ratio of 1 and the vertical orientation the model assumes.
+    const wp = strips ? (plates.width ?? 0) : null;
+    const s = strips ? (plates.spacing ?? 0) : null;
+    const angle = strips
+        ? (plates.angle ?? RCConstants.DEFAULT_SIDE_PLATE_ANGLE)
+        : RCConstants.DEFAULT_SIDE_PLATE_ANGLE;
+    return {
+        sides,
+        tp: plates.thickness,
+        dp: plates.depth,
+        wp,
+        s,
+        coverageRatio: strips && s !== null && s > 0 ? wp / s : 1,
+        angleRad: (angle * Math.PI) / 180,
+        Es,
+        fy: plates.fy,
+        configuration: plates.configuration,
+    };
+};
+const validateSidePlateGeometry = (section, plates, geo) => {
+    if (!(0, plate_jacketing_type_1.hasSidePlate)(plates) ||
+        geo.fy <= 0 ||
+        geo.Es <= 0 ||
+        (geo.sides !== 1 && geo.sides !== 2) ||
+        section.bw <= 0 ||
+        section.d <= 0 ||
+        geo.dp > section.d) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.SIDE_PLATE_GEOMETRY_INVALID);
+    }
+    if (geo.configuration === "strips") {
+        const wp = geo.wp ?? 0;
+        const s = geo.s ?? 0;
+        // A strip wider than its pitch is a continuous plate described wrongly, and
+        // an inclination outside (0, 90] has no meaning in the tie model.
+        if (wp <= 0 || s <= 0 || wp > s || geo.angleRad <= 0 || geo.angleRad > Math.PI / 2) {
+            throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.SIDE_PLATE_GEOMETRY_INVALID);
+        }
+    }
+    if (plates.anchorage !== undefined) {
+        const { boltsPerRow, rowSpacing } = plates.anchorage;
+        if (boltsPerRow <= 0 || rowSpacing <= 0) {
+            throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.SIDE_PLATE_GEOMETRY_INVALID);
+        }
+    }
+};
+/**
+ * Shear capacity of the section before strengthening: φVc + φVs.
+ *
+ * A section with no stirrups (`Av <= 0` or `s <= 0`) contributes φVs = 0 rather
+ * than dividing by a zero spacing.
+ *
+ * An existing Vs beyond the ACI 318-19 22.5.1.2 maximum reaches `stirrupShearCapacity`
+ * as error 105 ("section too small for shear"). In the strengthening context the
+ * useful diagnosis is the more specific one — the web is already at its ceiling, so
+ * no added plate force can be developed — so it is re-thrown as 206.
+ */
+const baselineShearCapacity = (section) => {
+    const concrete = (0, rc_beam_design_1.concreteShearCapacity)(section);
+    const hasStirrups = section.Av > 0 && section.s > 0;
+    let stirrups;
+    if (hasStirrups) {
+        try {
+            stirrups = (0, rc_beam_design_1.stirrupShearCapacity)(section);
+        }
+        catch (error) {
+            if (error instanceof rc_design_error_1.RCDesignError && error.code === rc_design_error_1.Errors.SHEAR_STRENGTH_EXCEEDS_MAX.code) {
+                throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.STRENGTHENED_SHEAR_NO_HEADROOM);
+            }
+            throw error;
+        }
+    }
+    else {
+        stirrups = { phiVs: 0, calculationDetails: { Vs: 0 }, warnings: [] };
+    }
+    return {
+        phiVn: MyMath.roundToDecimalPlaces(concrete.phiVc + stirrups.phiVs, 2),
+        phiVc: concrete.phiVc,
+        phiVs: stirrups.phiVs,
+        Vc: concrete.calculationDetails.Vc,
+        Vs: stirrups.calculationDetails.Vs,
+        warnings: [...concrete.warnings, ...stirrups.warnings],
+    };
+};
+/**
+ * Design strength the bolt group can drag into the concrete across a 45° crack.
+ *
+ * The crack's horizontal projection is taken as `dp`, so the rows anchoring the
+ * plate beyond it number `floor(dp / rowSpacing)`, at least one — the same
+ * `dfv / sf` counting ACI 440.2R uses for bonded shear reinforcement.
+ *
+ * The returned value already carries the anchor φ of 0.65 from `boltShearCapacity`,
+ * so it is compared against the plate's φVp on a design-strength basis.
+ */
+const anchorageCapacity = (anchorage, geo, warnings) => {
+    const boltResult = (0, rc_beam_plate_interface_bolts_1.boltShearCapacity)(anchorage.bolt);
+    warnings.push(...boltResult.warnings);
+    const exactRows = geo.dp / anchorage.rowSpacing;
+    const rows = Math.max(1, Math.floor(exactRows));
+    if (exactRows < 1) {
+        warnings.push({
+            message: `Bolt row spacing (${anchorage.rowSpacing} mm) exceeds the engaged plate depth (${geo.dp} mm); only one row was taken as crossing the assumed 45 degree crack.`,
+        });
+    }
+    // Same minimum anchor spacing `plateInterfaceBoltRequirement` checks, so the two
+    // strengthening paths hold bolt layouts to one rule.
+    if (anchorage.bolt.diameter !== undefined) {
+        const minSpacing = RCConstants.MIN_ANCHOR_SPACING_DIAMETER_FACTOR * anchorage.bolt.diameter;
+        if (anchorage.rowSpacing < minSpacing) {
+            warnings.push({
+                reference: "ACI318-19, 17.9.2",
+                message: `Bolt row spacing (${anchorage.rowSpacing} mm) is below the minimum anchor spacing of 4*da (${minSpacing} mm); use a larger pitch, a smaller bolt, or fewer rows.`,
+            });
+        }
+    }
+    return {
+        phiVanchorage: MyMath.roundToDecimalPlaces(geo.sides * rows * anchorage.boltsPerRow * boltResult.phiVbolt, 2),
+        rows,
+        phiVbolt: boltResult.phiVbolt,
+        boltsPerRow: anchorage.boltsPerRow,
+    };
+};
+/** Detailing and modelling warnings shared by both capacity models. */
+const collectCommonWarnings = (section, plates, geo, warnings) => {
+    warnings.push({
+        message: "ACI 318-19 contains no provisions for steel side plates in shear; this capacity is an engineering model, not a code-sanctioned calculation, and must be confirmed against test data or a specialist review.",
+    });
+    if (geo.dp < section.d) {
+        warnings.push({
+            message: `Engaged plate depth dp (${geo.dp} mm) is less than the effective depth d (${section.d} mm); only the plated depth was taken as resisting shear.`,
+        });
+    }
+    // Strip pitch is checked against ACI 318-19 9.7.6.2.2 alone, in `assembleResult`
+    // where Vp is known. ACI 440.2R-17 11.4.2 defers to the ACI 318 limits for internal
+    // steel shear reinforcement rather than imposing its own, so that one check
+    // satisfies both documents. (The `wf + d/4` rule of ACI 440.2R-08 did not survive
+    // into the 2017 edition and is deliberately not applied.)
+    if (geo.sides === 1) {
+        warnings.push({
+            message: "A plate on one face only loads the section eccentrically; the resulting torsion and out-of-plane twist are not captured by this in-plane shear model and must be assessed separately.",
+        });
+    }
+    if (plates.anchorage === undefined) {
+        warnings.push({
+            message: "No anchorage was supplied, so the reported capacity assumes the plate is fully developed; the bolt group or bond must be checked separately.",
+        });
+    }
+};
+/**
+ * Applies the ACI 318-19 22.5.1.2 web crushing cap and the anchorage limit, then
+ * assembles the `before`/`after` result both models return.
+ *
+ * The cap `Vs + Vp <= 0.66 sqrt(fc') bw d` — mirrored for bonded shear
+ * strengthening by ACI 440.2R-17 11.4.3, Eq. (11.4.3) — is a property of the concrete web, so
+ * it limits the plate force the web can host rather than invalidating the design:
+ * the plate contribution is truncated to the remaining headroom and a warning
+ * says so. Only a section whose existing Vs already exhausts the cap throws,
+ * because there no strengthening at all can be developed.
+ *
+ * @param VpNominal - Plate nominal shear contribution in N, before φ and before
+ *   any model-specific reduction factor
+ * @param reductionFactor - Model-specific factor applied to the plate term only
+ *   (1.0 for web yielding, psi_f for the tension tie)
+ */
+const assembleResult = (section, plates, geo, VpNominal, reductionFactor, method, modelDetails, warnings) => {
+    const before = baselineShearCapacity(section);
+    const baseWarnings = [...before.warnings, ...warnings];
+    const VpModelKN = VpNominal * reductionFactor * 0.001;
+    const maxVsKN = RCConstants.MAX_VS_COEFFICIENT * Math.sqrt(section.fc_) * section.bw * section.d * 0.001;
+    const headroomKN = maxVsKN - before.Vs;
+    if (headroomKN <= 0) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.STRENGTHENED_SHEAR_NO_HEADROOM);
+    }
+    const VpEffectiveKN = Math.min(VpModelKN, headroomKN);
+    const webCrushingGoverns = VpEffectiveKN < VpModelKN;
+    if (webCrushingGoverns) {
+        baseWarnings.push({
+            reference: "ACI318-19, 22.5.1.2",
+            message: `Plate contribution of ${MyMath.roundToDecimalPlaces(VpModelKN, 2)} kN truncated to the remaining web capacity of ${MyMath.roundToDecimalPlaces(headroomKN, 2)} kN, so that Vs + Vp stays within 0.66*sqrt(fc')*bw*d (${MyMath.roundToDecimalPlaces(maxVsKN, 2)} kN); a thinner or shallower plate carries the section just as far.`,
+        });
+    }
+    // ACI 318-19 9.7.6.2.2 halves the permitted spacing once the shear reinforcement
+    // carries more than 0.33*sqrt(fc')*bw*d. The plate is what usually pushes a section
+    // over that threshold, so the limit is keyed off Vs + Vp rather than Vs alone.
+    if (geo.configuration === "strips" && geo.s !== null) {
+        const sqrtFc = Math.sqrt(section.fc_);
+        const vsThresholdKN = RCConstants.VS_SPACING_THRESHOLD_COEFFICIENT * sqrtFc * section.bw * section.d * 0.001;
+        const highShear = before.Vs + VpEffectiveKN > vsThresholdKN;
+        const maxSpacing = highShear
+            ? Math.min(RCConstants.MAX_STIRRUP_SPACING_HIGH_VS_DEPTH_FACTOR * section.d, RCConstants.MAX_STIRRUP_SPACING_HIGH_VS)
+            : Math.min(RCConstants.MAX_STIRRUP_SPACING_LOW_VS_DEPTH_FACTOR * section.d, RCConstants.MAX_STIRRUP_SPACING_LOW_VS);
+        if (geo.s > maxSpacing) {
+            baseWarnings.push({
+                reference: "ACI318-19, 9.7.6.2.2",
+                message: `Strip pitch (${geo.s} mm) exceeds the maximum shear reinforcement spacing of ${MyMath.roundToDecimalPlaces(maxSpacing, 2)} mm${highShear ? `, tightened because Vs + Vp (${MyMath.roundToDecimalPlaces(before.Vs + VpEffectiveKN, 2)} kN) exceeds 0.33*sqrt(fc')*bw*d (${MyMath.roundToDecimalPlaces(vsThresholdKN, 2)} kN)` : ""}; a diagonal crack can pass between strips without crossing one.`,
+            });
+        }
+    }
+    const phiVpPlate = MyMath.roundToDecimalPlaces(RCConstants.SHEAR_STRENGTH_REDUCTION_FACTOR * VpEffectiveKN, 2);
+    const anchorage = plates.anchorage !== undefined ? anchorageCapacity(plates.anchorage, geo, baseWarnings) : null;
+    const anchorageGoverns = anchorage !== null && anchorage.phiVanchorage < phiVpPlate;
+    const phiVp = anchorageGoverns
+        ? anchorage.phiVanchorage
+        : phiVpPlate;
+    let governedBy = "plateCapacity";
+    if (anchorageGoverns) {
+        governedBy = "anchorage";
+    }
+    else if (webCrushingGoverns) {
+        governedBy = "webCrushing";
+    }
+    return {
+        method,
+        before: {
+            phiVn: before.phiVn,
+            calculationDetails: {
+                phiVc: before.phiVc,
+                phiVs: before.phiVs,
+                Vc: before.Vc,
+                Vs: before.Vs,
+            },
+            unit: "kN",
+            warnings: before.warnings,
+        },
+        after: {
+            phiVn: MyMath.roundToDecimalPlaces(before.phiVn + phiVp, 2),
+            phiVp: MyMath.roundToDecimalPlaces(phiVp, 2),
+            governedBy,
+            calculationDetails: {
+                phiVc: before.phiVc,
+                phiVs: before.phiVs,
+                Vp: MyMath.roundToDecimalPlaces(VpModelKN, 2),
+                VpEffective: MyMath.roundToDecimalPlaces(VpEffectiveKN, 2),
+                maxVs: MyMath.roundToDecimalPlaces(maxVsKN, 2),
+                headroom: MyMath.roundToDecimalPlaces(headroomKN, 2),
+                phiVpPlate,
+                phiVanchorage: anchorage !== null ? anchorage.phiVanchorage : null,
+                anchorageRows: anchorage !== null ? anchorage.rows : null,
+                phiVbolt: anchorage !== null ? anchorage.phiVbolt : null,
+                sides: geo.sides,
+                coverageRatio: MyMath.roundToDecimalPlaces(geo.coverageRatio, 4),
+                ...modelDetails,
+            },
+            unit: "kN",
+            warnings: baseWarnings,
+        },
+    };
+};
+/**
+ * Shear capacity of a beam strengthened with bolted steel side plates, treating
+ * each plate as a supplementary web that resists in-plane shear.
+ *
+ * The plate reaches the von Mises shear yield stress of 0.6 fy (AISC 360 G2.1):
+ *
+ * - continuous: `Vp = nSides · 0.6 fy · tp · dp`
+ * - strips: `Vp = nSides · 0.6 fy · tp · dp · wp / s`
+ *
+ * Strips are handled as the fraction `wp / s` of a continuous web, which is an
+ * approximation — a discrete strip works more as a tension tie than as a web
+ * panel, which is what `sidePlateShearCapacityByTensionTie` models. Run both and
+ * take the lower value, or call `compareSidePlateShearCapacity`.
+ *
+ * ACI 318-19 has no provisions for steel side plates in shear; a warning always
+ * says so.
+ *
+ * @param section - Original beam shear properties (fc_, bw, d, Av, fyt, s, optional lambda)
+ * @param plates - Side plate geometry, strength, layout, and optional anchorage
+ * @returns `before` and `after` results, each with `phiVn` (kN), `calculationDetails`,
+ *   `unit`, and `warnings`; `after` also carries `phiVp` and `governedBy`
+ * @throws {RCDesignError} 205 if the plate geometry is inconsistent, 206 if the
+ *   existing Vs leaves no headroom under the ACI 318-19 22.5.1.2 maximum, 202 if
+ *   the supplied bolt capacity is invalid
+ */
+const sidePlateShearCapacityByWebYielding = (section, plates) => {
+    const warnings = [];
+    const geo = resolveSidePlateGeometry(plates);
+    validateSidePlateGeometry(section, plates, geo);
+    collectCommonWarnings(section, plates, geo, warnings);
+    const tauY = RCConstants.PLATE_SHEAR_YIELD_COEFFICIENT * geo.fy; // MPa
+    const VpNominal = geo.sides * tauY * geo.tp * geo.dp * geo.coverageRatio; // N
+    // AISC 360 G2.1(a): beyond this slenderness the panel buckles in shear before it
+    // yields. The concrete restrains the inner face, so this is a warning, not a limit.
+    const slenderness = geo.dp / geo.tp;
+    const slendernessLimit = RCConstants.PLATE_SHEAR_SLENDERNESS_COEFFICIENT * Math.sqrt(geo.Es / geo.fy);
+    if (slenderness > slendernessLimit) {
+        warnings.push({
+            reference: "AISC360-22, G2.1",
+            message: `Plate slenderness dp/tp (${MyMath.roundToDecimalPlaces(slenderness, 1)}) exceeds 2.24*sqrt(Es/fy) (${MyMath.roundToDecimalPlaces(slendernessLimit, 1)}); shear buckling may precede yielding unless the plate is stiffened or continuously restrained by the concrete.`,
+        });
+    }
+    return assembleResult(section, plates, geo, VpNominal, 1.0, "webYielding", {
+        tauY: MyMath.roundToDecimalPlaces(tauY, 2),
+        slenderness: MyMath.roundToDecimalPlaces(slenderness, 1),
+        slendernessLimit: MyMath.roundToDecimalPlaces(slendernessLimit, 1),
+    }, warnings);
+};
+exports.sidePlateShearCapacityByWebYielding = sidePlateShearCapacityByWebYielding;
+/**
+ * Shear capacity of a beam strengthened with bolted steel side plates, treating
+ * each plate as a tension tie crossing the diagonal crack, following the bonded
+ * shear reinforcement model of ACI 440.2R-17 §11.4 with steel in place of FRP:
+ *
+ * `Vp = nSides · tp · wp · ffe · (sin α + cos α) · dp / s`
+ *
+ * with `ffe = min(fy, Es · 0.004)` — the 0.004 strain cap of 440.2R §11.4, which
+ * keeps the crack tight enough for aggregate interlock — and the additional
+ * reduction factor `psi_f = 0.85` for two-sided bonded strengthening. A continuous
+ * plate is the case `wp = s`, `α = 90°`.
+ *
+ * Note that for structural steel `Es · 0.004 = 800 MPa` sits above any normal `fy`,
+ * so the strain cap does not bind and the tie reaches yield; this model therefore
+ * usually returns a higher capacity than `sidePlateShearCapacityByWebYielding` for
+ * a continuous plate. Neither is code-sanctioned for steel side plates — a warning
+ * always says so.
+ *
+ * @param section - Original beam shear properties (fc_, bw, d, Av, fyt, s, optional lambda)
+ * @param plates - Side plate geometry, strength, layout, and optional anchorage
+ * @returns `before` and `after` results, each with `phiVn` (kN), `calculationDetails`,
+ *   `unit`, and `warnings`; `after` also carries `phiVp` and `governedBy`
+ * @throws {RCDesignError} 205 if the plate geometry is inconsistent, 206 if the
+ *   existing Vs leaves no headroom under the ACI 318-19 22.5.1.2 maximum, 202 if
+ *   the supplied bolt capacity is invalid
+ */
+const sidePlateShearCapacityByTensionTie = (section, plates) => {
+    const warnings = [];
+    const geo = resolveSidePlateGeometry(plates);
+    validateSidePlateGeometry(section, plates, geo);
+    collectCommonWarnings(section, plates, geo, warnings);
+    const strainLimitedStress = geo.Es * RCConstants.SIDE_PLATE_EFFECTIVE_STRAIN_LIMIT; // MPa
+    const ffe = Math.min(geo.fy, strainLimitedStress);
+    if (ffe < geo.fy) {
+        warnings.push({
+            reference: "ACI440.2R-17, 11.4",
+            message: `Effective plate stress limited to ${MyMath.roundToDecimalPlaces(ffe, 2)} MPa by the 0.004 strain cap, below fy (${geo.fy} MPa); the plate does not reach yield.`,
+        });
+    }
+    const orientation = Math.sin(geo.angleRad) + Math.cos(geo.angleRad);
+    const VpNominal = geo.sides * geo.tp * ffe * geo.dp * geo.coverageRatio * orientation; // N
+    return assembleResult(section, plates, geo, VpNominal, RCConstants.SIDE_PLATE_REDUCTION_FACTOR_PSI, "tensionTie", {
+        ffe: MyMath.roundToDecimalPlaces(ffe, 2),
+        strainLimitedStress: MyMath.roundToDecimalPlaces(strainLimitedStress, 2),
+        orientation: MyMath.roundToDecimalPlaces(orientation, 4),
+        psi: RCConstants.SIDE_PLATE_REDUCTION_FACTOR_PSI,
+    }, warnings);
+};
+exports.sidePlateShearCapacityByTensionTie = sidePlateShearCapacityByTensionTie;
+/**
+ * Runs both side plate shear models on the same section and reports the lower
+ * result as governing, which is the intended entry point when selecting a
+ * conservative design capacity.
+ *
+ * @param section - Original beam shear properties (fc_, bw, d, Av, fyt, s, optional lambda)
+ * @param plates - Side plate geometry, strength, layout, and optional anchorage
+ * @returns `webYielding` and `tensionTie` results plus `governing`, holding the
+ *   lower `phiVn`, its `phiVp`, and the `method` that produced it
+ * @throws {RCDesignError} Whatever either model throws — see their documentation
+ */
+const compareSidePlateShearCapacity = (section, plates) => {
+    const webYielding = (0, exports.sidePlateShearCapacityByWebYielding)(section, plates);
+    const tensionTie = (0, exports.sidePlateShearCapacityByTensionTie)(section, plates);
+    const governing = tensionTie.after.phiVn < webYielding.after.phiVn ? tensionTie : webYielding;
+    return {
+        webYielding,
+        tensionTie,
+        governing: {
+            method: governing.method,
+            phiVn: governing.after.phiVn,
+            phiVp: governing.after.phiVp,
+            governedBy: governing.after.governedBy,
+        },
+    };
+};
+exports.compareSidePlateShearCapacity = compareSidePlateShearCapacity;
+//# sourceMappingURL=rc-beam-side-plate-shear.js.map

package/dist/strengthening/rc-beam-side-plate-shear.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rc-beam-side-plate-shear.js","sourceRoot":"","sources":["../../src/strengthening/rc-beam-side-plate-shear.ts"],"names":[],"mappings":"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"}

package/dist/strengthening/rc-beam-steel-plate-jacketing.d.ts

@@ -7,20 +7,49 @@ import { Warnings } from "../core/types/output-message.type";
  * Converts steel plate areas into equivalent rebar areas, adjusts the effective depth,
  * and delegates to `rectBeamMomentCapacity` for the actual capacity calculation.
  *
+ * The bottom plate is added to the tension steel and the top plate to the
+ * compression steel — including on an originally singly reinforced section,
+ * which a top plate turns into a doubly reinforced one.
+ *
  * @param section - Original beam cross-section properties
  * @param jacketedProperties - Steel plate dimensions, modulus, and yield strength
- * @returns Object containing `phiMn` (kN·m), `calculationDetails`, `unit`, and `warnings`
+ * @returns `before` and `after` results, each with `phiMn` (kN·m), `calculationDetails`,
+ *   `unit`, and `warnings`
+ * @throws {RCDesignError} 102 if either section is not tension controlled — the
+ *   added plate steel can push a jacketed section out of the tension-controlled region
  */
 export declare const calculateSteelJacketedBeamMomentCapacity: (section: RectBeamSection, jacketedProperties: SteelJacketedProps) => {
     before: {
         phiMn: number;
-        calculationDetails: any;
+        calculationDetails: {
+            c: number;
+            a: number;
+            beta1: number;
+            d: number;
+            As: number;
+            ro: number;
+            d_?: number;
+            As_?: number;
+            fs_?: number;
+            ro_?: number;
+        };
         unit: string;
         warnings: Warnings;
     };
     after: {
         phiMn: number;
-        calculationDetails: any;
+        calculationDetails: {
+            c: number;
+            a: number;
+            beta1: number;
+            d: number;
+            As: number;
+            ro: number;
+            d_?: number;
+            As_?: number;
+            fs_?: number;
+            ro_?: number;
+        };
         unit: string;
         warnings: Warnings;
     };

package/dist/strengthening/rc-beam-steel-plate-jacketing.js

@@ -12,9 +12,16 @@ const merge_warning_1 = require("../utils/merge-warning");
  * Converts steel plate areas into equivalent rebar areas, adjusts the effective depth,
  * and delegates to `rectBeamMomentCapacity` for the actual capacity calculation.
  *
+ * The bottom plate is added to the tension steel and the top plate to the
+ * compression steel — including on an originally singly reinforced section,
+ * which a top plate turns into a doubly reinforced one.
+ *
  * @param section - Original beam cross-section properties
  * @param jacketedProperties - Steel plate dimensions, modulus, and yield strength
- * @returns Object containing `phiMn` (kN·m), `calculationDetails`, `unit`, and `warnings`
+ * @returns `before` and `after` results, each with `phiMn` (kN·m), `calculationDetails`,
+ *   `unit`, and `warnings`
+ * @throws {RCDesignError} 102 if either section is not tension controlled — the
+ *   added plate steel can push a jacketed section out of the tension-controlled region
  */
 const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) => {
     const warnings = [];
@@ -37,14 +44,22 @@ const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) =
     const plateBottomSteelArea = (0, plate_jacketing_type_1.hasBottomPlate)(jacketedProperties)
         ? n * jacketedProperties.bottomSteelWidth * bottomSteelThickness
         : 0;
-    let newD = ((topSteelThickness + section.d) * section.As +
-        (topSteelThickness + section.h + bottomSteelThickness / 2) * plateBottomSteelArea) /
-        (section.As + plateBottomSteelArea);
-    let newD_ = undefined;
+    // Existing compression steel, if any. A section the type guard reports as
+    // singly reinforced contributes nothing here, but a top plate still can.
+    const existingAs_ = (0, rc_beam_type_1.isSinglyReinforced)(section) ? 0 : section.As_;
+    const existingD_ = (0, rc_beam_type_1.isSinglyReinforced)(section) ? 0 : section.d_;
+    // Depths stay measured from the extreme concrete compression fibre — the top
+    // face of the concrete — so the equivalent rectangular stress block that
+    // `rectBeamMomentCapacity` lays down from that datum covers concrete only.
+    // Existing depths are therefore unchanged; the bottom plate sits below the
+    // soffit and the top plate above the datum, at a negative depth.
+    const newD = (0, math_1.roundToDecimalPlaces)((section.d * section.As + (section.h + bottomSteelThickness / 2) * plateBottomSteelArea) /
+        (section.As + plateBottomSteelArea), 3);
+    const jacketedAs_ = existingAs_ + plateTopSteelArea;
     let modifiedSection;
-    // Check if the section is singly or doubly reinforced
-    if ((0, rc_beam_type_1.isSinglyReinforced)(section)) {
-        // Singly reinforced section
+    if (jacketedAs_ <= 0) {
+        // No compression steel and no top plate — the jacketed section stays singly
+        // reinforced.
         modifiedSection = {
             ...section,
             As: section.As + plateBottomSteelArea,
@@ -52,24 +67,18 @@ const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) =
         };
     }
     else {
-        // Doubly reinforced section
-        const doublySection = section;
-        newD_ =
-            ((topSteelThickness + doublySection.d_) * doublySection.As_ +
-                (topSteelThickness / 2) * plateTopSteelArea) /
-                (doublySection.As_ + plateTopSteelArea);
+        // A top plate acts as compression steel, so a bare singly reinforced
+        // section becomes doubly reinforced once one is added. Its centroid is half
+        // a plate thickness above the concrete face, hence the negative depth.
+        const newD_ = (0, math_1.roundToDecimalPlaces)((existingD_ * existingAs_ + (-topSteelThickness / 2) * plateTopSteelArea) / jacketedAs_, 3);
         modifiedSection = {
-            ...doublySection,
-            As: doublySection.As + plateBottomSteelArea,
-            As_: doublySection.As_ + plateTopSteelArea,
+            ...section,
+            As: section.As + plateBottomSteelArea,
+            As_: jacketedAs_,
             d: newD,
             d_: newD_,
         };
     }
-    newD = (0, math_1.roundToDecimalPlaces)(newD, 3);
-    if (newD_ !== undefined) {
-        newD_ = (0, math_1.roundToDecimalPlaces)(newD_, 3);
-    }
     // Calculate the moment capacity of the modified (after strengthening) section
     let jacketedResult = (0, rc_beam_design_1.rectBeamMomentCapacity)(modifiedSection);
     jacketedResult = {

package/dist/strengthening/rc-beam-steel-plate-jacketing.js.map

@@ -1 +1 @@
-{"version":3,"file":"rc-beam-steel-plate-jacketing.js","sourceRoot":"","sources":["../../src/strengthening/rc-beam-steel-plate-jacketing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rc-beam-steel-plate-jacketing.js","sourceRoot":"","sources":["../../src/strengthening/rc-beam-steel-plate-jacketing.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theerapat-s28/ts-structural-eng-tools",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "TypeScript structural-engineering helper functions and beam design utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",