Perform various modification for cleaning up the GPU solvers

Author: nikoscham

examples/heatConductionScript/heatConduction2DFin/HeatConduction2DFinGPU.html renamed to examples/heatConductionScript/heatConduction2DFin/HeatConduction2DFinWebgpu.html

@@ -13,9 +13,9 @@ import { newtonRaphson } from "./methods/newtonRaphsonScript.js";
 import { solveLinearSystem } from "./methods/linearSystemSolverScript.js";
 import { solveLinearSystemAsync } from "./methods/linearSystemSolverScript.js";
 import { prepareMesh } from "./mesh/meshUtilsScript.js";
-import { assembleFrontPropagationMat } from "./solvers/frontPropagationScript.js";
-import { assembleGeneralFormPDEMat, assembleGeneralFormPDEFront } from "./solvers/generalFormPDEScript.js";
-import { assembleHeatConductionMat, assembleHeatConductionFront } from "./solvers/heatConductionScript.js";
+import { assembleFrontPropagationMat } from "./models/frontPropagationScript.js";
+import { assembleGeneralFormPDEMat, assembleGeneralFormPDEFront } from "./models/generalFormPDEScript.js";
+import { assembleHeatConductionMat, assembleHeatConductionFront } from "./models/heatConductionScript.js";
 import { runFrontalSolver } from "./methods/frontalSolverScript.js";
 import { basicLog, debugLog, warnLog, errorLog } from "./utilities/loggingScript.js";
 
@@ -119,7 +119,7 @@ export class FEAScriptModel {
 
     // Use WebGPU Jacobi method
     const initialGuess = new Array(b.length).fill(0);
-    solutionVector = await computeEngine.jacobiSolve(A, b, initialGuess, 10000, 1e-3);
+    solutionVector = await computeEngine.webgpuJacobiSolver(A, b, initialGuess, 10000, 1e-3);
 
     console.timeEnd("systemSolving");
     basicLog("System solved successfully with WebGPU Jacobi");

src/FEAScript.js

@@ -11,10 +11,10 @@
 // Internal imports
 import { BasisFunctions } from "../mesh/basisFunctionsScript.js";
 import { initializeFEA } from "../mesh/meshUtilsScript.js";
-import { assembleHeatConductionFront } from "../solvers/heatConductionScript.js";
-import { ThermalBoundaryConditions } from "../solvers/thermalBoundaryConditionsScript.js";
-import { assembleFrontPropagationFront } from "../solvers/frontPropagationScript.js";
-import { GenericBoundaryConditions } from "../solvers/genericBoundaryConditionsScript.js";
+import { assembleHeatConductionFront } from "../models/heatConductionScript.js";
+import { ThermalBoundaryConditions } from "../models/thermalBoundaryConditionsScript.js";
+import { assembleFrontPropagationFront } from "../models/frontPropagationScript.js";
+import { GenericBoundaryConditions } from "../models/genericBoundaryConditionsScript.js";
 import { basicLog, debugLog, errorLog } from "../utilities/loggingScript.js";
 
 // Create object templates

src/methods/frontalSolverScript.js

@@ -74,7 +74,7 @@ export function solveLinearSystem(solverMethod, jacobianMatrix, residualVector,
 
 // Helper to lazily create a default WebGPU compute engine (Comlink + worker)
 async function createDefaultComputeEngine() {
-  const worker = new Worker(new URL("../workers/webgpuComputeWorker.js", import.meta.url), {
+  const worker = new Worker(new URL("../workers/webgpuWorkerScript.js", import.meta.url), {
     type: "module",
   });
   const computeEngine = Comlink.wrap(worker);
@@ -108,11 +108,11 @@ export async function solveLinearSystemAsync(solverMethod, jacobianMatrix, resid
     const x0 = new Array(b.length).fill(0);
     let result;
 
-    if (computeEngine && typeof computeEngine.jacobiSolve === "function") {
-      result = await computeEngine.jacobiSolve(A, b, x0, maxIterations, tolerance);
+    if (computeEngine && typeof computeEngine.webgpuJacobiSolver === "function") {
+      result = await computeEngine.webgpuJacobiSolver(A, b, x0, maxIterations, tolerance);
     } else {
       // Fallback to CPU Jacobi
-      warnLog("Falling back to CPU Jacobi: computeEngine.jacobiSolve not available");
+      warnLog("Falling back to CPU Jacobi: computeEngine.webgpuJacobiSolver not available");
       const cpu = jacobiSolver(A, b, x0, { maxIterations, tolerance });
       result = { x: cpu.solutionVector, converged: cpu.converged, iterations: cpu.iterations };
     }

src/methods/linearSystemSolverScript.js

@@ -13,7 +13,7 @@ import { euclideanNorm } from "../methods/euclideanNormScript.js";
 import { solveLinearSystem } from "./linearSystemSolverScript.js";
 import { basicLog, debugLog, errorLog } from "../utilities/loggingScript.js";
 import { runFrontalSolver } from "./frontalSolverScript.js";
-import { assembleFrontPropagationFront } from "../solvers/frontPropagationScript.js";
+import { assembleFrontPropagationFront } from "../models/frontPropagationScript.js";
 
 /**
  * Function to solve a system of non-linear equations using the Newton-Raphson method