remove quads / remove mesh-type

mohd-afeef-badri · mohd-afeef-badri · commit 21eca0bfcb51 · 2025-03-31T17:05:30.000+02:00
diff --git a/modules/acoustics/Fem.axl b/modules/acoustics/Fem.axl
@@ -33,11 +33,6 @@
       <description>k/c square of the material.</description>
     </simple>
 
-    <!-- Mesh type used by the solver -->
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
-
     <!-- Linear system service instance -->
     <service-instance name="linear-system" type="Arcane::FemUtils::IDoFLinearSystemFactory" default="AlephLinearSystem" />
 
diff --git a/modules/bilaplacian/Fem.axl b/modules/bilaplacian/Fem.axl
@@ -26,17 +26,17 @@
     <simple name="f" type="real" default="0.0">
       <description>Source within the material.</description>
     </simple>
+
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
+
     <simple name = "enforce-Dirichlet-method" type = "string" default="Penalty" optional="true">
       <description>
         Method via which Dirichlet boundary condition is imposed
       </description>
     </simple>
+
     <simple name = "penalty" type = "real" default="1.e30" optional="true">
       <description>
         Penalty value for enforcing Dirichlet condition
diff --git a/modules/elastodynamics/Fem.axl b/modules/elastodynamics/Fem.axl
@@ -62,9 +62,6 @@
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
     <simple name="time-discretization" type="string"  default="Newmark-beta" optional="true">
       <description>Type of time discretization for the solver</description>
     </simple>
diff --git a/modules/electrostatics/Fem.axl b/modules/electrostatics/Fem.axl
@@ -29,10 +29,6 @@
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
 
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
-
     <simple name="matrix-format" type="string" default="DOK" optional="true">
       <description>Which matrix format to use DOK|BSR|AF-BSR.</description>
     </simple>
diff --git a/modules/heat/Fem.axl b/modules/heat/Fem.axl
@@ -32,9 +32,6 @@
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
     <simple name="dt" type="real" default="0.1">
       <description>Time step of simulation.</description>
     </simple>
diff --git a/modules/laplace/Fem.axl b/modules/laplace/Fem.axl
@@ -17,9 +17,6 @@
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
 
     <simple name="matrix-format" type="string" default="DOK" optional="true">
       <description>Which matrix format to use DOK|BSR|AF-BSR.</description>
diff --git a/modules/laplace/inputs/L-shape.3D.arc b/modules/laplace/inputs/L-shape.3D.arc
@@ -21,7 +21,6 @@
 
   <fem>
     <result-file>check/test_3D_L-shape.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <boundary-conditions>
       <dirichlet>
         <surface>bot</surface>
diff --git a/modules/soildynamics/Fem.axl b/modules/soildynamics/Fem.axl
@@ -56,9 +56,6 @@
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
     <simple name = "enforce-Dirichlet-method" type = "string" default="Penalty" optional="true">
       <description>
         Method via which Dirichlet boundary condition is imposed
diff --git a/modules/testlab/BlCsrBiliAssembly.cc b/modules/testlab/BlCsrBiliAssembly.cc
@@ -25,9 +25,9 @@ _buildMatrixBuildLessCsr()
   Integer nbnde = nbNode();
   Int64 nedge;
 
-  if (options()->meshType == "TETRA4")
+  if (mesh()->dimension() == 3)
     nedge = nbEdge();
-  else if (options()->meshType == "TRIA3")
+  else if (mesh()->dimension() == 2)
     nedge = nbFace();
   else
     ARCANE_THROW(NotImplementedException, "");
@@ -38,15 +38,15 @@ _buildMatrixBuildLessCsr()
   Integer index = 1;
   m_csr_matrix.m_matrix_row(0) = 0;
 
-  if (options()->meshType == "TETRA4")
+  if (mesh()->dimension() == 3)
     ENUMERATE_NODE (inode, allNodes()) {
       Node node = *inode;
       if (index < nbnde) {
         m_csr_matrix.m_matrix_row(index) = node.nbEdge() + m_csr_matrix.m_matrix_row(index - 1) + 1;
         index++;
       }
     }
-  else if (options()->meshType == "TRIA3")
+  else if (mesh()->dimension() == 2)
     ENUMERATE_NODE (inode, allNodes()) {
       Node node = *inode;
       if (index < nbnde) {
@@ -66,9 +66,9 @@ void FemModule::_buildMatrixGpuBuildLessCsr()
   Integer nbnde = nbNode();
   Int64 nedge;
 
-  if (options()->meshType == "TETRA4")
+  if (mesh()->dimension() == 3)
     nedge = m_nb_edge;
-  else if (options()->meshType == "TRIA3")
+  else if (mesh()->dimension() == 2)
     nedge = nbFace();
   else
     ARCANE_THROW(NotImplementedException, "");
@@ -86,7 +86,7 @@ void FemModule::_buildMatrixGpuBuildLessCsr()
   UnstructuredMeshConnectivityView connectivity_view;
   connectivity_view.setMesh(this->mesh());
 
-  if (options()->meshType == "TRIA3") {
+  if (mesh()->dimension() == 2) {
     auto nfc = connectivity_view.nodeFace();
     command << RUNCOMMAND_ENUMERATE(Node, inode, allNodes())
     {
diff --git a/modules/testlab/Fem.axl b/modules/testlab/Fem.axl
@@ -24,9 +24,6 @@
     <simple name="result-file" type="string" optional="true">
       <description>File name of a file containing the values of the solution vector to check the results</description>
     </simple>
-    <simple name="mesh-type" type="string"  default="TRIA3" optional="true">
-      <description>Type of mesh provided to the solver</description>
-    </simple>
     <simple name = "enforce-Dirichlet-method" type = "string" default="Penalty" optional="true">
       <description>
         Method via which Dirichlet boundary condition is imposed
diff --git a/modules/testlab/FemModule.cc b/modules/testlab/FemModule.cc
@@ -567,7 +567,7 @@ _getMaterialParameters()
   f = options()->f();
   ElementNodes = 3.;
 
-  if (options()->meshType == "TETRA4")
+  if (mesh()->dimension() == 3)
     ElementNodes = 4.;
 
   elapsedTime = platform::getRealTime() - elapsedTime;
@@ -683,7 +683,7 @@ _checkCellType()
   Real elapsedTime = platform::getRealTime();
 
   Int16 type = 0;
-  if (options()->meshType == "TETRA4") {
+  if (mesh()->dimension() == 3) {
     type = IT_Tetraedron4;
   }
   else {
@@ -839,7 +839,7 @@ _assembleLinearOperator(BSRMatrix* bsr_matrix)
     //  $int_{Omega}(f*v^h)$
     //  only for noded that are non-Dirichlet
     //----------------------------------------------
-    if (options()->meshType == "TRIA3") {
+    if (mesh()->dimension() == 2) {
       ENUMERATE_ (Cell, icell, allCells()) {
         Cell cell = *icell;
         Real area = _computeAreaTriangle3(cell);
@@ -851,7 +851,7 @@ _assembleLinearOperator(BSRMatrix* bsr_matrix)
       }
     }
 
-    if (options()->meshType == "TETRA4") {
+    if (mesh()->dimension() == 3) {
       ENUMERATE_ (Cell, icell, allCells()) {
         Cell cell = *icell;
         Real area = _computeAreaTetra4(cell);
@@ -1348,7 +1348,7 @@ _assembleCsrGpuLinearOperator()
            << "  - WeakPenalty\n";
   }
 
-  if (options()->meshType == "TRIA3") {
+  if (mesh()->dimension() == 2) {
     Timer::Action timer_action(m_time_stats, "CsrGpuConstantSourceTermAssembly");
     //----------------------------------------------
     // Constant source term assembly
@@ -1394,7 +1394,7 @@ _assembleCsrGpuLinearOperator()
     };
   }
 
-  if (options()->meshType == "TETRA4") {
+  if (mesh()->dimension() == 3) {
     Timer::Action timer_action(m_time_stats, "CsrGpuConstantSourceTermAssembly");
     //----------------------------------------------
     // Constant source term assembly
diff --git a/modules/testlab/NodeWiseCsrBiliAssembly.cc b/modules/testlab/NodeWiseCsrBiliAssembly.cc
@@ -40,11 +40,11 @@
 
   // Compute the number of nnz and initialize the memory space
   Int64 nbnde = nbNode();
-  Int64 nedge = options()->meshType == "TETRA4" ? nbEdge() : nbFace();
+  Int64 nedge = mesh()->dimension() == 3 ? nbEdge() : nbFace();
   Int32 nnz = nedge * 2 + nbnde;
   m_csr_matrix.initialize(m_dof_family, nnz, nbnde);
 
-  if (options()->meshType == "TRIA3") {
+  if (mesh()->dimension() == 2) {
     ENUMERATE_NODE (inode, allNodes()) {
 
       //Since we compute the neighbouring connectivity here, we also fill the csr matrix
@@ -65,7 +65,7 @@
       }
     }
   }
-  else if (options()->meshType == "TETRA4") {
+  else if (mesh()->dimension() == 3) {
     ENUMERATE_NODE (inode, allNodes()) {
       Node node = *inode;
       Int32 node_dof_id = node_dof.dofId(node, 0);
diff --git a/modules/testlab/benchmarking/TEST_TEMPLATE_3D.xml b/modules/testlab/benchmarking/TEST_TEMPLATE_3D.xml
@@ -21,7 +21,6 @@
 
   <fem>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.arc b/modules/testlab/inputs/Test.L-shape.3D.arc
@@ -23,7 +23,6 @@
     <blcsr>true</blcsr>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.coo-gpu.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-gpu.arc
@@ -23,7 +23,6 @@
     <coo-gpu>true</coo-gpu>
     <f>5.5</f>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc
@@ -23,7 +23,6 @@
     <coo-sorting-gpu>true</coo-sorting-gpu>
     <f>5.5</f>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.coo-sort.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-sort.arc
@@ -23,7 +23,6 @@
     <coo-sorting>true</coo-sorting>
     <f>5.5</f>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.coo.arc b/modules/testlab/inputs/Test.L-shape.3D.coo.arc
@@ -23,7 +23,6 @@
     <coo>true</coo>
     <f>5.5</f>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.L-shape.3D.nwcsr.arc b/modules/testlab/inputs/Test.L-shape.3D.nwcsr.arc
@@ -23,7 +23,6 @@
     <nwcsr>true</nwcsr>
     <f>5.5</f>
     <result-file>poisson_test_ref_L-shape_3D.txt</result-file>
-    <mesh-type>TETRA4</mesh-type>
     <dirichlet-boundary-condition>
       <surface>bot</surface>
       <value>50.0</value>
diff --git a/modules/testlab/inputs/Test.sphere.3D.arc b/modules/testlab/inputs/Test.sphere.3D.arc
@@ -23,7 +23,6 @@
     <blcsr>true</blcsr>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.bsr.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.bsr.hypre.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.hypre.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.csr-gpu.arc b/modules/testlab/inputs/Test.sphere.3D.csr-gpu.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
diff --git a/modules/testlab/inputs/Test.sphere.3D.csr.arc b/modules/testlab/inputs/Test.sphere.3D.csr.arc
@@ -22,7 +22,6 @@
   <fem>
     <result-file>poisson_test_ref_sphere_3D.txt</result-file>
     <f>5.5</f>
-    <mesh-type>TETRA4</mesh-type>
     <enforce-Dirichlet-method>Penalty</enforce-Dirichlet-method>
     <penalty>1.e31</penalty>
     <dirichlet-boundary-condition>
