Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/feascript.cjs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/feascript.cjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/feascript.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/feascript.esm.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/feascript.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/feascript.umd.js.map

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions src/mesh/meshGenerationScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,8 @@ export class Mesh2D extends Mesh {
* @param {number} [config.maxY] - Maximum y-coordinate of the mesh (required for geometry-based mesh)
* @param {string} [config.elementOrder='linear'] - The order of elements, either 'linear' or 'quadratic'
* @param {object} [config.parsedMesh=null] - Optional pre-parsed mesh data
* @param {number} [config.angleLeft=90] - Left side skew angle in degrees (90 = vertical)
* @param {number} [config.angleRight=90] - Right side skew angle in degrees (90 = vertical)
*/
constructor({
numElementsX = null,
Expand All @@ -519,6 +521,8 @@ export class Mesh2D extends Mesh {
maxY = null,
elementOrder = "linear",
parsedMesh = null,
angleLeft = 90,
angleRight = 90,
}) {
super({
numElementsX,
Expand All @@ -530,6 +534,9 @@ export class Mesh2D extends Mesh {
parsedMesh,
});

this.angleLeft = angleLeft;
this.angleRight = angleRight;

// Validate geometry parameters (when not using a parsed mesh)
if (
!parsedMesh &&
Expand Down Expand Up @@ -592,6 +599,32 @@ export class Mesh2D extends Mesh {
}
}

// Angles are measured from the positive X-axis:
// 90° = vertical sides (rectangle)
// angleLeft < 90° => left side leans right as y increases
// angleLeft > 90° => left side leans left
// angleRight < 90° => right side leans left
// angleRight > 90° => right side leans right
if (this.angleLeft !== 90 || this.angleRight !== 90) {
const degToRad = Math.PI / 180;
const tanLeft = Math.tan(this.angleLeft * degToRad);
const tanRight = Math.tan(this.angleRight * degToRad);
const epsilon = 1e-12;

for (let nodeIndexY = 0; nodeIndexY < totalNodesY; nodeIndexY++) {
const rowBaseIndex = nodeIndexY;
const y = nodesYCoordinates[rowBaseIndex];
const xLeft = Math.abs(tanLeft) < epsilon ? 0 : y / tanLeft;
const xRight = Math.abs(tanRight) < epsilon ? this.maxX : this.maxX - y / tanRight;

for (let nodeIndexX = 0; nodeIndexX < totalNodesX; nodeIndexX++) {
const nnode = nodeIndexX * totalNodesY + nodeIndexY;
const t = totalNodesX === 1 ? 0 : nodeIndexX / (totalNodesX - 1);
nodesXCoordinates[nnode] = xLeft + (xRight - xLeft) * t;
}
}
}

// Generate nodal numbering (NOP) array
const nodalNumbering = this.generateNodalNumbering2D(
this.numElementsX,
Expand Down
25 changes: 22 additions & 3 deletions src/mesh/meshUtilsScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,35 @@ import { basicLog, debugLog, errorLog } from "../utilities/loggingScript.js";
* @returns {object} An object containing all mesh-related data
*/
export function prepareMesh(meshConfig) {
const { meshDimension, numElementsX, numElementsY, maxX, maxY, elementOrder, parsedMesh } = meshConfig;
const {
meshDimension,
numElementsX,
numElementsY,
maxX,
maxY,
elementOrder,
parsedMesh,
angleLeft,
angleRight,
} = meshConfig;

// Create a new instance of the Mesh class
let mesh;
if (meshDimension === "1D") {
mesh = new Mesh1D({ numElementsX, maxX, elementOrder, parsedMesh });
} else if (meshDimension === "2D") {
mesh = new Mesh2D({ numElementsX, maxX, numElementsY, maxY, elementOrder, parsedMesh });
mesh = new Mesh2D({
numElementsX,
maxX,
numElementsY,
maxY,
elementOrder,
parsedMesh,
angleLeft,
angleRight,
});
} else {
errorLog("Mesh dimension must be either '1D' or '2D'.");
errorLog("Mesh dimension must be either '1D' or '2D'");
}

// Use the parsed mesh (e.g., from a Gmsh .msh import) if provided. Otherwise, generate a structured mesh
Expand Down