Update HeatConduction2DFinGmsh.html tutorial

Author: nikoscham

tutorials/HeatConduction2DFin.html

@@ -244,9 +244,9 @@ <h2 id="results"><a name="Results"></a>Results</h2>
     </ul>
 
     <script type="module">
-      //Import FEAScript library from GitHub
+      // Import FEAScript library from GitHub
       import { FEAScriptModel, plotSolution, printVersion } from "https://core.feascript.com/src/index.js";
-      //Import FEAScript library from a local directory
+      // Import FEAScript library from a local directory
       //import { FEAScriptModel, plotSolution, printVersion } from "../../FEAScript-core/src/index.js";
 
       window.addEventListener("DOMContentLoaded", () => {

tutorials/HeatConduction2DFinGmsh.html

@@ -101,6 +101,8 @@ <h2 id="gmshfileimport"><a name="gmshfileimport"></a>Gmsh File Import</h2>
 
     <h2 id="results"><a name="results"></a>Results</h2>
 
+    <div id="solutionPlot"></div>
+
     <ul id="menu">
       <li>
         <a href="https://feascript.com/tutorials/HeatConduction2DFin.html" target="_blank"
@@ -113,44 +115,61 @@ <h2 id="results"><a name="results"></a>Results</h2>
     </ul>
 
     <script type="module">
+      // Import FEAScript library from GitHub
       import { FEAScriptModel, plotSolution, printVersion } from "https://core.feascript.com/src/index.js";
+      import { importGmshQuadTri } from "https://core.feascript.com/src/readers/gmshReaderScript.js";
+      // Import FEAScript library from a local directory      
+      //import { FEAScriptModel, plotSolution, printVersion } from "../../FEAScript-core/src/index.js";
+      //import { importGmshQuadTri } from "../../FEAScript-core/src/readers/gmshReaderScript.js";
 
-      window.addEventListener("DOMContentLoaded", () => {
+      window.addEventListener("DOMContentLoaded", async () => {
         // Print FEAScript version in the console
         printVersion();
 
+        // Fetch the mesh file from your server
+        const response = await fetch("./rect_quad.msh");
+        if (!response.ok) {
+          throw new Error(`Failed to load mesh file: ${response.status} ${response.statusText}`);
+        }
+        const meshContent = await response.text();
+        
+        // Create a File object with the actual content
+        const meshFile = new File([meshContent], "rect_quad.msh");
+        
         // Create a new FEAScript model
         const model = new FEAScriptModel();
-
+        
         // Set solver configuration
         model.setSolverConfig("solidHeatTransferScript");
-
-        // Define mesh configuration
+        
+        // Parse the mesh file first
+        const result = await importGmshQuadTri(meshFile);
+
+        // Fix nodal numbering format for the solver
+        if (result.nodalNumbering.quadElements && result.nodalNumbering.quadElements.length > 0) {
+          result.nodalNumbering = result.nodalNumbering.quadElements;
+        } else if (result.nodalNumbering.triangleElements && result.nodalNumbering.triangleElements.length > 0) {
+          result.nodalNumbering = result.nodalNumbering.triangleElements;
+        }
+
+        // Define mesh configuration with the parsed result
         model.setMeshConfig({
-          meshFile: "rect_quad"
+          parsedMesh: result,
+          meshDimension: "2D",
+          elementOrder: "linear"
         });
 
-        // Define boundary conditions
-        model.addBoundaryCondition("0", ["constantTemp", 200]);
-        model.addBoundaryCondition("1", ["symmetry"]);
-        model.addBoundaryCondition("2", ["convection", 1, 20]);
-        model.addBoundaryCondition("3", ["constantTemp", 200]);
+        // Define boundary conditions using Gmsh physical group tags
+        model.addBoundaryCondition("1", ["constantTemp", 200]); // bottom boundary
+        model.addBoundaryCondition("4", ["symmetry"]);          // left boundary
+        model.addBoundaryCondition("3", ["convection", 1, 20]); // top boundary
+        model.addBoundaryCondition("2", ["constantTemp", 200]); // right boundary
 
-        // Set solver method (optional) - 'lusolve' uses LU decomposition
+        // Set solver method
         model.setSolverMethod("lusolve");
 
         // Solve the problem and get the solution
-        const { solutionVector, nodesCoordinates } = model.solve();
-
-        // Plot the solution as a 2D contour plot
-        plotSolution(
-          solutionVector,
-          nodesCoordinates,
-          model.solverConfig,
-          model.meshConfig.meshDimension,
-          "contour",
-          "solutionPlot"
-        );
+        //const { solutionVector, nodesCoordinates } = model.solve();
       });
     </script>
 

tutorials/rect.geo

@@ -1,7 +1,8 @@
 // 2D Rectangle: 4m (width) x 2m (height)
 // With Physical Lines for boundary labeling
+// Use the command "gmsh rect.geo -2" to generate the mesh
 
-lc = 0.2; // Characteristic length (mesh density)
+lc = 0.8; // Characteristic length (mesh density)
 
 // Points (x, y, z, mesh size)
 Point(1) = {0, 0, 0, lc};     // Bottom left
@@ -29,6 +30,6 @@ Physical Line("left")   = {4};
 Physical Surface("domain") = {1};
 
 // Generate 2D mesh
-//Recombine Surface{1}; // Turns triangle mesh into quads
+Recombine Surface{1}; // Turns triangle mesh into quads
 Mesh 2;