@theerapat-s28/ts-structural-eng-tools 1.0.1 → 1.2.0

package/dist/strengthening/rc-beam-plate-interface-bolts.js

@@ -0,0 +1,377 @@
+"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.plateInterfaceBoltRequirement = exports.boltShearCapacity = exports.plateInterfaceShearFlow = 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 general_1 = require("../rc/general");
+const rc_beam_type_1 = require("../core/types/rc-beam.type");
+const plate_jacketing_type_1 = require("../core/types/plate-jacketing.type");
+const resolveGeometry = (section, plates) => {
+    const tTop = (0, plate_jacketing_type_1.hasTopPlate)(plates) ? plates.topSteelThickness : 0;
+    const tBottom = (0, plate_jacketing_type_1.hasBottomPlate)(plates) ? plates.bottomSteelThickness : 0;
+    const ATop = (0, plate_jacketing_type_1.hasTopPlate)(plates) ? plates.topSteelWidth * tTop : 0;
+    const ABottom = (0, plate_jacketing_type_1.hasBottomPlate)(plates) ? plates.bottomSteelWidth * tBottom : 0;
+    const singly = (0, rc_beam_type_1.isSinglyReinforced)(section);
+    const doubly = section;
+    return {
+        tTop,
+        tBottom,
+        ATop,
+        ABottom,
+        yTop: tTop / 2,
+        yBottom: tTop + section.h + tBottom / 2,
+        yConcreteTop: tTop,
+        yConcreteBottom: tTop + section.h,
+        yTensionSteel: tTop + section.d,
+        yCompSteel: singly ? null : tTop + doubly.d_,
+        As_: singly ? 0 : doubly.As_,
+    };
+};
+const validateGeometry = (section, geo) => {
+    if (section.b <= 0 ||
+        section.h <= 0 ||
+        section.d <= 0 ||
+        section.d >= section.h ||
+        section.As <= 0) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.PLATE_OUTSIDE_SECTION);
+    }
+    if (geo.yCompSteel !== null && geo.yCompSteel >= geo.yTensionSteel) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.PLATE_OUTSIDE_SECTION);
+    }
+};
+/**
+ * Solves the cracked-section neutral axis depth (from the datum) by setting the
+ * first moment of the transformed areas about the neutral axis to zero.
+ *
+ * @param compSteelInCompression - Whether the compression rebar is assumed to sit
+ *   above the neutral axis, which decides between the (n-1) and n modular ratios
+ */
+const solveCrackedNeutralAxis = (section, geo, ns, np, compSteelInCompression) => {
+    const { b } = section;
+    const AsTr = ns * section.As;
+    const ATopTr = np * geo.ATop;
+    const ABottomTr = np * geo.ABottom;
+    // Compression rebar displaces concrete that is already counted in the block,
+    // so it is transformed with (n - 1); below the neutral axis it acts in tension
+    // and takes the full n.
+    const AsCompTr = compSteelInCompression ? (ns - 1) * geo.As_ : ns * geo.As_;
+    const a = b / 2;
+    const bq = -b * geo.yConcreteTop + ATopTr + AsCompTr + AsTr + ABottomTr;
+    const c = (b * geo.yConcreteTop * geo.yConcreteTop) / 2 -
+        ATopTr * geo.yTop -
+        AsCompTr * (geo.yCompSteel ?? 0) -
+        AsTr * geo.yTensionSteel -
+        ABottomTr * geo.yBottom;
+    const roots = MyMath.solveQuadratic(a, bq, c);
+    const valid = roots.filter((root) => root > geo.yConcreteTop && root < geo.yConcreteBottom);
+    return valid.length > 0 ? Math.max(...valid) : null;
+};
+/**
+ * Builds the transformed-section parts and the neutral axis depth for the
+ * requested section state.
+ */
+const buildTransformedSection = (section, geo, ns, np, sectionState, warnings) => {
+    const parts = [];
+    if (geo.ATop > 0) {
+        parts.push({
+            A: np * geo.ATop,
+            y: geo.yTop,
+            I: (np * (geo.ATop / geo.tTop) * geo.tTop ** 3) / 12,
+        });
+    }
+    if (geo.ABottom > 0) {
+        parts.push({
+            A: np * geo.ABottom,
+            y: geo.yBottom,
+            I: (np * (geo.ABottom / geo.tBottom) * geo.tBottom ** 3) / 12,
+        });
+    }
+    let ybar;
+    if (sectionState === "uncracked") {
+        parts.push({
+            A: section.b * section.h,
+            y: geo.yConcreteTop + section.h / 2,
+            I: (section.b * section.h ** 3) / 12,
+        });
+        parts.push({ A: (ns - 1) * section.As, y: geo.yTensionSteel, I: 0 });
+        if (geo.As_ > 0 && geo.yCompSteel !== null) {
+            parts.push({ A: (ns - 1) * geo.As_, y: geo.yCompSteel, I: 0 });
+        }
+        const sumA = parts.reduce((acc, part) => acc + part.A, 0);
+        ybar = parts.reduce((acc, part) => acc + part.A * part.y, 0) / sumA;
+    }
+    else {
+        let compSteelInCompression = true;
+        let na = solveCrackedNeutralAxis(section, geo, ns, np, true);
+        if (na !== null && geo.yCompSteel !== null && geo.yCompSteel > na) {
+            // The assumed compression rebar is actually below the neutral axis; re-solve
+            // with it on the tension side.
+            compSteelInCompression = false;
+            na = solveCrackedNeutralAxis(section, geo, ns, np, false);
+            warnings.push({
+                reference: "ACI318-19, 22.2.2.1",
+                message: "Compression reinforcement lies below the cracked neutral axis; it was transformed as tension steel.",
+            });
+        }
+        if (na === null) {
+            throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.CRACKED_NA_NOT_FOUND);
+        }
+        ybar = na;
+        const c = ybar - geo.yConcreteTop; // depth of the concrete compression zone
+        parts.push({
+            A: section.b * c,
+            y: geo.yConcreteTop + c / 2,
+            I: (section.b * c ** 3) / 12,
+        });
+        parts.push({ A: ns * section.As, y: geo.yTensionSteel, I: 0 });
+        if (geo.As_ > 0 && geo.yCompSteel !== null) {
+            parts.push({
+                A: compSteelInCompression ? (ns - 1) * geo.As_ : ns * geo.As_,
+                y: geo.yCompSteel,
+                I: 0,
+            });
+        }
+    }
+    const Itr = parts.reduce((acc, part) => acc + part.I + part.A * (part.y - ybar) ** 2, 0);
+    return { ybar, Itr };
+};
+/**
+ * Calculates the horizontal shear flow that must be transferred across each
+ * concrete-to-plate interface of a steel plate jacketed beam, q = V·Q/I, using an
+ * elastic transformed section.
+ *
+ * `Q` at an interface is the first moment of the area beyond that cut — the plate
+ * itself — while `ybar` and `Itr` come from one solve that includes every plate
+ * present, so adding a top plate also changes the bottom interface shear flow.
+ *
+ * @param input - Section, plate properties, factored shear V (kN), and section state
+ * @returns Object containing per-interface `top`/`bottom` shear flow (`null` when the
+ *   plate is absent), `calculationDetails`, `unit`, and `warnings`
+ * @throws {RCDesignError} If V is not positive or no plate is present (201), the
+ *   geometry is inconsistent (203), or no cracked neutral axis exists (204)
+ */
+const plateInterfaceShearFlow = (input) => {
+    const warnings = [];
+    const { section, plates, V } = input;
+    const sectionState = input.sectionState ?? "cracked";
+    if (V <= 0 || (!(0, plate_jacketing_type_1.hasTopPlate)(plates) && !(0, plate_jacketing_type_1.hasBottomPlate)(plates))) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.NON_POSITIVE_SHEAR_FLOW);
+    }
+    const geo = resolveGeometry(section, plates);
+    validateGeometry(section, geo);
+    const Ec = (0, general_1.concreteElasticModulus)(section.fc_);
+    const ns = section.Es / Ec;
+    const np = plates.Es / Ec;
+    const { ybar, Itr } = buildTransformedSection(section, geo, ns, np, sectionState, warnings);
+    const VinN = V * 1000;
+    const interfaceAt = (A, y) => {
+        const Q = np * A * Math.abs(y - ybar);
+        return {
+            q: MyMath.roundToDecimalPlaces((VinN * Q) / Itr, 2),
+            Q: MyMath.roundToDecimalPlaces(Q, 0),
+            leverArm: MyMath.roundToDecimalPlaces(Math.abs(y - ybar), 2),
+        };
+    };
+    if (geo.ATop > 0 && geo.yTop > ybar) {
+        warnings.push({
+            reference: "ACI318-19, 22.2.2.1",
+            message: "Top plate centroid lies below the neutral axis; the plate is in tension, so the assumed compression-face behaviour does not apply.",
+        });
+    }
+    return {
+        top: geo.ATop > 0 ? interfaceAt(geo.ATop, geo.yTop) : null,
+        bottom: geo.ABottom > 0 ? interfaceAt(geo.ABottom, geo.yBottom) : null,
+        calculationDetails: {
+            Ec: MyMath.roundToDecimalPlaces(Ec, 2),
+            ns: MyMath.roundToDecimalPlaces(ns, 3),
+            np: MyMath.roundToDecimalPlaces(np, 3),
+            ybar: MyMath.roundToDecimalPlaces(ybar, 2),
+            Itr: MyMath.roundToDecimalPlaces(Itr, 0),
+            sectionState,
+        },
+        unit: "N/mm",
+        warnings,
+    };
+};
+exports.plateInterfaceShearFlow = plateInterfaceShearFlow;
+/**
+ * Calculates the design shear strength of a single anchor bolt from the steel
+ * strength per ACI 318-19 17.7.1.2b, Vsa = 0.6 Ase,V futa, with φ = 0.65 from
+ * Table 17.5.3 and the futa cap of 17.6.1.2.
+ *
+ * Concrete breakout (17.7.2) and pryout (17.7.3) depend on edge distances, anchor
+ * spacing and embedment depth, and are NOT evaluated here — a warning always says so.
+ * Supply `phiVboltOverride` to use a manufacturer or ESR value instead.
+ *
+ * @param bolt - Anchor properties (Ase, futa, optional fya, diameter, shearPlanes, override)
+ * @returns Object containing `phiVbolt` (kN), `calculationDetails`, `unit`, and `warnings`
+ * @throws {RCDesignError} If the resolved capacity is not positive (202)
+ */
+const boltShearCapacity = (bolt) => {
+    const warnings = [];
+    const shearPlanes = bolt.shearPlanes ?? 1;
+    warnings.push({
+        reference: "ACI318-19, 17.7.2",
+        message: "Only anchor steel strength in shear is evaluated; concrete breakout and pryout must be checked separately.",
+    });
+    if (bolt.phiVboltOverride !== undefined) {
+        if (bolt.phiVboltOverride <= 0) {
+            throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.INVALID_BOLT_CAPACITY);
+        }
+        return {
+            phiVbolt: MyMath.roundToDecimalPlaces(bolt.phiVboltOverride, 2),
+            calculationDetails: { source: "override", shearPlanes },
+            unit: "kN",
+            warnings,
+        };
+    }
+    if (bolt.Ase <= 0 || bolt.futa <= 0 || shearPlanes <= 0) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.INVALID_BOLT_CAPACITY);
+    }
+    const cap = Math.min(bolt.fya !== undefined ? RCConstants.ANCHOR_FUTA_FYA_FACTOR * bolt.fya : Infinity, RCConstants.MAX_ANCHOR_FUTA);
+    const futaEffective = Math.min(bolt.futa, cap);
+    if (futaEffective < bolt.futa) {
+        warnings.push({
+            reference: "ACI318-19, 17.6.1.2",
+            message: `futa (${bolt.futa} MPa) exceeds the limit of min(1.9*fya, ${RCConstants.MAX_ANCHOR_FUTA} MPa); capped at ${MyMath.roundToDecimalPlaces(futaEffective, 2)} MPa.`,
+        });
+    }
+    const Vsa = RCConstants.ANCHOR_STEEL_SHEAR_COEFFICIENT * bolt.Ase * futaEffective * shearPlanes; // N
+    return {
+        phiVbolt: MyMath.roundToDecimalPlaces(RCConstants.ANCHOR_SHEAR_STRENGTH_REDUCTION_FACTOR * Vsa * 0.001, 2),
+        calculationDetails: {
+            source: "ACI318-19, 17.7.1.2b",
+            Vsa: MyMath.roundToDecimalPlaces(Vsa * 0.001, 2),
+            futaEffective: MyMath.roundToDecimalPlaces(futaEffective, 2),
+            shearPlanes,
+        },
+        unit: "kN",
+        warnings,
+    };
+};
+exports.boltShearCapacity = boltShearCapacity;
+const designInterface = (demand, plateArea, plateFy, phiVboltKN, boltsPerRow, transferLength, label, warnings) => {
+    const phiVboltN = phiVboltKN * 1000;
+    // Spacing that keeps the bolt row capacity at or above the shear flow demand
+    const spacingFromShearFlow = (boltsPerRow * phiVboltN) / demand.q; // mm
+    let requiredSpacing = spacingFromShearFlow;
+    if (requiredSpacing > RCConstants.MAX_PLATE_BOLT_SPACING) {
+        requiredSpacing = RCConstants.MAX_PLATE_BOLT_SPACING;
+        warnings.push({
+            message: `${label} plate: shear flow allows a pitch of ${MyMath.roundToDecimalPlaces(spacingFromShearFlow, 1)} mm, capped at the detailing limit of ${RCConstants.MAX_PLATE_BOLT_SPACING} mm.`,
+        });
+    }
+    const rows = Math.ceil(transferLength / requiredSpacing) + 1;
+    const boltCountFromShearFlow = rows * boltsPerRow;
+    // The plate must also develop its own yield force over the transfer length
+    const plateForce = plateArea * plateFy; // N
+    const boltCountFromPlateForce = Math.ceil(plateForce / phiVboltN);
+    const governedBy = boltCountFromPlateForce > boltCountFromShearFlow ? "plateForce" : "shearFlow";
+    const boltCount = Math.max(boltCountFromShearFlow, boltCountFromPlateForce);
+    return {
+        q: demand.q,
+        Q: demand.Q,
+        leverArm: demand.leverArm,
+        requiredSpacing: MyMath.roundToDecimalPlaces(requiredSpacing, 1),
+        boltCount,
+        governedBy,
+        calculationDetails: {
+            spacingFromShearFlow: MyMath.roundToDecimalPlaces(spacingFromShearFlow, 1),
+            rows,
+            boltCountFromShearFlow,
+            boltCountFromPlateForce,
+            plateForce: MyMath.roundToDecimalPlaces(plateForce * 0.001, 2),
+        },
+    };
+};
+/**
+ * Determines the bolts required to transfer horizontal shear across each
+ * concrete-to-plate interface of a steel plate jacketed beam.
+ *
+ * For each plate present, the required bolt pitch follows from the interface shear
+ * flow (s = n·φVbolt / q) and the bolt count is taken as the larger of that pitch
+ * over the transfer length and the count needed to develop the full plate yield
+ * force (Ap·fy / φVbolt). `governedBy` reports which one controls.
+ *
+ * @param input - Section, plates, V (kN), bolt properties, bolts per row, and transfer length (mm)
+ * @returns Object containing per-interface `top`/`bottom` results (`null` when the plate
+ *   is absent), `calculationDetails`, `unit`, and `warnings`
+ * @throws {RCDesignError} If V is not positive or no plate is present (201), the bolt
+ *   capacity is invalid (202), the geometry is inconsistent (203), or no cracked
+ *   neutral axis exists (204)
+ */
+const plateInterfaceBoltRequirement = (input) => {
+    const { plates, bolt, boltsPerRow, transferLength } = input;
+    if (boltsPerRow <= 0 || transferLength <= 0) {
+        throw new rc_design_error_1.RCDesignError(rc_design_error_1.Errors.PLATE_OUTSIDE_SECTION);
+    }
+    const flow = (0, exports.plateInterfaceShearFlow)(input);
+    const boltResult = (0, exports.boltShearCapacity)(bolt);
+    const warnings = [...flow.warnings, ...boltResult.warnings];
+    const geo = resolveGeometry(input.section, plates);
+    const top = flow.top !== null
+        ? designInterface(flow.top, geo.ATop, plates.fy, boltResult.phiVbolt, boltsPerRow, transferLength, "top", warnings)
+        : null;
+    const bottom = flow.bottom !== null
+        ? designInterface(flow.bottom, geo.ABottom, plates.fy, boltResult.phiVbolt, boltsPerRow, transferLength, "bottom", warnings)
+        : null;
+    if (bolt.diameter !== undefined) {
+        const minSpacing = RCConstants.MIN_ANCHOR_SPACING_DIAMETER_FACTOR * bolt.diameter;
+        for (const result of [top, bottom]) {
+            if (result !== null && result.requiredSpacing < minSpacing) {
+                warnings.push({
+                    reference: "ACI318-19, 17.9.2",
+                    message: `Required pitch (${result.requiredSpacing} mm) is below the minimum anchor spacing of 4*da (${minSpacing} mm); use a larger bolt or more bolts per row.`,
+                });
+            }
+        }
+    }
+    return {
+        top,
+        bottom,
+        calculationDetails: {
+            ...flow.calculationDetails,
+            phiVbolt: boltResult.phiVbolt,
+            boltsPerRow,
+            transferLength,
+        },
+        unit: "kN",
+        warnings,
+    };
+};
+exports.plateInterfaceBoltRequirement = plateInterfaceBoltRequirement;
+//# sourceMappingURL=rc-beam-plate-interface-bolts.js.map

package/dist/strengthening/rc-beam-plate-interface-bolts.js.map

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

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

@@ -4,6 +4,7 @@ exports.calculateSteelJacketedBeamMomentCapacity = void 0;
 const rc_beam_design_1 = require("../rc/rc-beam-design");
 const math_1 = require("../utils/math");
 const rc_beam_type_1 = require("../core/types/rc-beam.type");
+const plate_jacketing_type_1 = require("../core/types/plate-jacketing.type");
 const merge_warning_1 = require("../utils/merge-warning");
 /**
  * Calculates the moment capacity of an RC beam strengthened with steel plate jacketing.
@@ -21,16 +22,23 @@ const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) =
     const originalResult = (0, rc_beam_design_1.rectBeamMomentCapacity)(section);
     // Convert steel plate strength to the same as rebar strength
     const n = jacketedProperties.fy / section.fy;
+    // A plate only counts when both its width and thickness are positive, so a
+    // bottom-only jacket may omit the top plate fields entirely.
+    const topSteelThickness = (0, plate_jacketing_type_1.hasTopPlate)(jacketedProperties)
+        ? jacketedProperties.topSteelThickness
+        : 0;
+    const bottomSteelThickness = (0, plate_jacketing_type_1.hasBottomPlate)(jacketedProperties)
+        ? jacketedProperties.bottomSteelThickness
+        : 0;
     // Calculate the effective area of the steel plates converted to rebar.
-    const plateTopSteelArea = n * jacketedProperties.topSteelWidth * jacketedProperties.topSteelThickness;
-    const plateBottomSteelArea = n *
-        jacketedProperties.bottomSteelWidth *
-        jacketedProperties.bottomSteelThickness;
-    let newD = ((jacketedProperties.topSteelThickness + section.d) * section.As +
-        (jacketedProperties.topSteelThickness +
-            section.h +
-            jacketedProperties.bottomSteelThickness / 2) *
-            plateBottomSteelArea) /
+    const plateTopSteelArea = (0, plate_jacketing_type_1.hasTopPlate)(jacketedProperties)
+        ? n * jacketedProperties.topSteelWidth * topSteelThickness
+        : 0;
+    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;
     let modifiedSection;
@@ -47,9 +55,8 @@ const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) =
         // Doubly reinforced section
         const doublySection = section;
         newD_ =
-            ((jacketedProperties.topSteelThickness + doublySection.d_) *
-                doublySection.As_ +
-                (jacketedProperties.topSteelThickness / 2) * plateTopSteelArea) /
+            ((topSteelThickness + doublySection.d_) * doublySection.As_ +
+                (topSteelThickness / 2) * plateTopSteelArea) /
                 (doublySection.As_ + plateTopSteelArea);
         modifiedSection = {
             ...doublySection,
@@ -65,7 +72,10 @@ const calculateSteelJacketedBeamMomentCapacity = (section, jacketedProperties) =
     }
     // Calculate the moment capacity of the modified (after strengthening) section
     let jacketedResult = (0, rc_beam_design_1.rectBeamMomentCapacity)(modifiedSection);
-    jacketedResult = { ...jacketedResult, warnings: (0, merge_warning_1.mergeWarnings)(jacketedResult.warnings, warnings) };
+    jacketedResult = {
+        ...jacketedResult,
+        warnings: (0, merge_warning_1.mergeWarnings)(jacketedResult.warnings, warnings),
+    };
     return {
         before: originalResult,
         after: 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":";;;AAAA,2DAAgE;AAChE,0CAAuD;AAEvD,+DAIsC;AAMtC,4DAAyD;AAEzD;;;;;;;;;GASG;AACI,MAAM,wCAAwC,GAAG,CACtD,OAAwB,EACxB,kBAAsC,EACtC,EAAE;IACF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,+EAA+E;IAC/E,MAAM,cAAc,GAAG,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAC;IAEvD,6DAA6D;IAC7D,MAAM,CAAC,GAAG,kBAAkB,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAE7C,uEAAuE;IACvE,MAAM,iBAAiB,GACrB,CAAC,GAAG,kBAAkB,CAAC,aAAa,GAAG,kBAAkB,CAAC,iBAAiB,CAAC;IAC9E,MAAM,oBAAoB,GACxB,CAAC;QACD,kBAAkB,CAAC,gBAAgB;QACnC,kBAAkB,CAAC,oBAAoB,CAAC;IAE1C,IAAI,IAAI,GACN,CAAC,CAAC,kBAAkB,CAAC,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,EAAE;QAC9D,CAAC,kBAAkB,CAAC,iBAAiB;YACnC,OAAO,CAAC,CAAC;YACT,kBAAkB,CAAC,oBAAoB,GAAG,CAAC,CAAC;YAC9C,oBAAoB,CAAC;QACvB,CAAC,OAAO,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAC;IACtC,IAAI,KAAK,GAAG,SAAS,CAAC;IAEtB,IAAI,eAAgC,CAAC;IACrC,sDAAsD;IACtD,IAAI,IAAA,iCAAkB,EAAC,OAAO,CAAC,EAAE,CAAC;QAChC,4BAA4B;QAC5B,eAAe,GAAG;YAChB,GAAG,OAAO;YACV,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,oBAAoB;YACrC,CAAC,EAAE,IAAI;SACR,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,4BAA4B;QAC5B,MAAM,aAAa,GAAG,OAAgC,CAAC;QACvD,KAAK;YACH,CAAC,CAAC,kBAAkB,CAAC,iBAAiB,GAAG,aAAa,CAAC,EAAE,CAAC;gBACxD,aAAa,CAAC,GAAG;gBACjB,CAAC,kBAAkB,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,iBAAiB,CAAC;gBACjE,CAAC,aAAa,CAAC,GAAG,GAAG,iBAAiB,CAAC,CAAC;QAC1C,eAAe,GAAG;YAChB,GAAG,aAAa;YAChB,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,oBAAoB;YAC3C,GAAG,EAAE,aAAa,CAAC,GAAG,GAAG,iBAAiB;YAC1C,CAAC,EAAE,IAAI;YACP,EAAE,EAAE,KAAK;SACV,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,IAAA,2BAAoB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACrC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,KAAK,GAAG,IAAA,2BAAoB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,8EAA8E;IAC9E,IAAI,cAAc,GAAG,IAAA,uCAAsB,EAAC,eAAe,CAAC,CAAC;IAE7D,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,QAAQ,EAAE,IAAA,6BAAa,EAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;IAEnG,OAAO;QACL,MAAM,EAAE,cAAc;QACtB,KAAK,EAAE,cAAc;KACtB,CAAC;AACJ,CAAC,CAAC;AArEW,QAAA,wCAAwC,4CAqEnD"}
+{"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/dist/utils/math.js.map

@@ -1 +1 @@
-{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/utils/math.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAY,EAAE;IAC1E,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACxB,CAAC,CAAC;AATW,QAAA,cAAc,kBASzB;AAEF;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACb,aAAqB,EACb,EAAE;IACV,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;AAC7C,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B"}
+{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/utils/math.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAY,EAAE;IAC1E,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACxB,CAAC,CAAC;AATW,QAAA,cAAc,kBASzB;AAEF;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAE,aAAqB,EAAU,EAAE;IACnF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;AAC7C,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B"}

package/package.json

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