Skip to content

Commit d8e8917

Browse files
mohd-afeef-badrimohd-afeef-badri
authored
Merge pull request #252 from arcaneframework/dev/mab-fourier-remove-quad
purge quad support
2 parents 3b34afb + 21eca0b commit d8e8917

34 files changed

+23
-99
lines changed

‎modules/acoustics/Fem.axl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
<description>k/c square of the material.</description>
3434
</simple>
3535

36-
<!-- Mesh type used by the solver -->
37-
<simple name="mesh-type" type="string" default="TRIA3" optional="true">
38-
<description>Type of mesh provided to the solver</description>
39-
</simple>
40-
4136
<!-- Linear system service instance -->
4237
<service-instance name="linear-system" type="Arcane::FemUtils::IDoFLinearSystemFactory" default="AlephLinearSystem" />
4338

‎modules/bilaplacian/Fem.axl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
<simple name="f" type="real" default="0.0">
2727
<description>Source within the material.</description>
2828
</simple>
29+
2930
<simple name="result-file" type="string" optional="true">
3031
<description>File name of a file containing the values of the solution vector to check the results</description>
3132
</simple>
32-
<simple name="mesh-type" type="string" default="TRIA3" optional="true">
33-
<description>Type of mesh provided to the solver</description>
34-
</simple>
33+
3534
<simple name = "enforce-Dirichlet-method" type = "string" default="Penalty" optional="true">
3635
<description>
3736
Method via which Dirichlet boundary condition is imposed
3837
</description>
3938
</simple>
39+
4040
<simple name = "penalty" type = "real" default="1.e30" optional="true">
4141
<description>
4242
Penalty value for enforcing Dirichlet condition

‎modules/elastodynamics/Fem.axl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
<simple name="result-file" type="string" optional="true">
6363
<description>File name of a file containing the values of the solution vector to check the results</description>
6464
</simple>
65-
<simple name="mesh-type" type="string" default="TRIA3" optional="true">
66-
<description>Type of mesh provided to the solver</description>
67-
</simple>
6865
<simple name="time-discretization" type="string" default="Newmark-beta" optional="true">
6966
<description>Type of time discretization for the solver</description>
7067
</simple>

‎modules/electrostatics/Fem.axl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<description>File name of a file containing the values of the solution vector to check the results</description>
3030
</simple>
3131

32-
<simple name="mesh-type" type="string" default="TRIA3" optional="true">
33-
<description>Type of mesh provided to the solver</description>
34-
</simple>
35-
3632
<simple name="matrix-format" type="string" default="DOK" optional="true">
3733
<description>Which matrix format to use DOK|BSR|AF-BSR.</description>
3834
</simple>

‎modules/fourier/CMakeLists.txt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/meshes)
3232
set(MESH_FILES
3333
plancher.msh
3434
multi-material.msh
35-
plancher.quad4.msh
3635
square_-2pi_to_2pi.msh
3736
bar_dynamic_3D.msh
3837
pipe.msh
@@ -67,12 +66,6 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
6766
inputs/conduction.arc)
6867
add_test(NAME [Fourier]conduction_heterogeneous COMMAND Fourier
6968
inputs/conduction.heterogeneous.arc)
70-
add_test(NAME [Fourier]conduction_quad COMMAND Fourier
71-
-A,//meshes/mesh/filename=meshes/plancher.quad4.msh
72-
-A,//fem/mesh-type=QUAD4
73-
-A,//fem/petsc-flags=-ksp_monitor
74-
-A,//fem/cross-validation=false
75-
inputs/conduction.arc)
7669
add_test(NAME [Fourier]manufacture_solution COMMAND Fourier
7770
-A,UsingDotNet=1
7871
inputs/manufacture.solution.arc)
@@ -83,7 +76,6 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
8376
add_test(NAME [Fourier]manufacture_solution_3D COMMAND Fourier
8477
-A,UsingDotNet=1
8578
-A,//meshes/mesh/filename=meshes/bar_dynamic_3D.msh
86-
-A,//fem/mesh-type=TETRA4
8779
inputs/manufacture.solution.arc)
8880

8981
if(FEMUTILS_HAS_PARALLEL_SOLVER AND MPIEXEC_EXECUTABLE)
@@ -99,7 +91,6 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
9991
add_test(NAME [Fourier]manufacture_solution_3D_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier
10092
-A,UsingDotNet=1
10193
-A,//meshes/mesh/filename=meshes/bar_dynamic_3D.msh
102-
-A,//fem/mesh-type=TETRA4
10394
inputs/manufacture.solution.arc)
10495
if(FEMTEST_HAS_GMSH_TEST)
10596
add_test(NAME [Fourier]conduction_10k_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Fourier

‎modules/fourier/ElementMatrix.h‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/*---------------------------------------------------------------------------*/
1515
/**
16-
* @brief Computes the element matrix for a triangular/quad element (ℙ1 FE).
16+
* @brief Computes the element matrix for a triangular element (ℙ1 FE).
1717
*
1818
* This function calculates the expression:
1919
* a(𝑢,𝑣) = ∫∫ λ(∂𝑢/∂𝑥 ∂𝑣/∂𝑥 + ∂𝑢/∂𝑦 ∂𝑣/∂𝑦)dΩ
@@ -36,20 +36,6 @@ _computeElementMatrixTria3(Cell cell)
3636
return area * lambda * (dxU ^ dxU) + area * lambda * (dyU ^ dyU);
3737
}
3838

39-
/*---------------------------------------------------------------------------*/
40-
/*---------------------------------------------------------------------------*/
41-
42-
RealMatrix<4, 4> FemModule::
43-
_computeElementMatrixQuad4(Cell cell)
44-
{
45-
Real area = ArcaneFemFunctions::MeshOperation::computeAreaQuad4(cell, m_node_coord);
46-
47-
Real4 dxU = ArcaneFemFunctions::FeOperation2D::computeGradientXQuad4(cell, m_node_coord);
48-
Real4 dyU = ArcaneFemFunctions::FeOperation2D::computeGradientYQuad4(cell, m_node_coord);
49-
50-
return area * lambda * (dxU ^ dxU) + area * lambda * (dyU ^ dyU);
51-
}
52-
5339
/*---------------------------------------------------------------------------*/
5440
/**
5541
* @brief Computes the element matrix for a tetrahedral element (ℙ1 FE).

‎modules/fourier/Fem.axl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<description>File name of a file containing the values of the solution vector to check the results</description>
3333
</simple>
3434

35-
<simple name="mesh-type" type="string" default="TRIA3" optional="true">
36-
<description>Type of mesh provided to the solver</description>
37-
</simple>
38-
3935
<simple name="matrix-format" type="string" default="DOK" optional="true">
4036
<description>Which matrix format to use DOK|BSR|AF-BSR.</description>
4137
</simple>

‎modules/fourier/FemModule.cc‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -255,20 +255,14 @@ _assembleBilinearOperator()
255255
info() << "[ArcaneFem-Info] Started module _assembleBilinearOperator()";
256256
Real elapsedTime = platform::getRealTime();
257257

258-
if (options()->meshType == "QUAD4")
259-
_assembleBilinear<4>([this](const Cell& cell) {
260-
return _computeElementMatrixQuad4(cell);
261-
});
262-
else if (options()->meshType == "TRIA3")
258+
if (mesh()->dimension() == 2)
263259
_assembleBilinear<3>([this](const Cell& cell) {
264260
return _computeElementMatrixTria3(cell);
265261
});
266-
else if (options()->meshType == "TETRA4")
262+
else
267263
_assembleBilinear<4>([this](const Cell& cell) {
268264
return _computeElementMatrixTetra4(cell);
269265
});
270-
else
271-
ARCANE_FATAL("Non supported meshType");
272266

273267
elapsedTime = platform::getRealTime() - elapsedTime;
274268
ArcaneFemFunctions::GeneralFunctions::printArcaneFemTime(traceMng(),"lhs-matrix-assembly", elapsedTime);
@@ -400,7 +394,7 @@ _validateResults()
400394
if (allNodes().size() < 200)
401395
ENUMERATE_ (Node, inode, allNodes()) {
402396
Node node = *inode;
403-
info() << "u[" << node.localId() << "][" << node.uniqueId() << "] = " << m_u[node];
397+
info() << "u[" << node.uniqueId() << "] = " << m_u[node];
404398
}
405399

406400
String filename = options()->resultFile();

‎modules/fourier/FemModule.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ class FemModule
9797
void _updateVariables();
9898

9999
RealMatrix<3, 3> _computeElementMatrixTria3(Cell cell);
100-
RealMatrix<4, 4> _computeElementMatrixQuad4(Cell cell);
101100
RealMatrix<4, 4> _computeElementMatrixTetra4(Cell cell);
102101

103102
IBinaryMathFunctor<Real, Real3, Real>* m_manufactured_dirichlet = nullptr;

‎modules/fourier/inputs/conduction.3D.arc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<fem>
4242
<lambda>0.023</lambda>
4343
<qdot>1.123e-2</qdot>
44-
<mesh-type>TETRA4</mesh-type>
4544
<result-file>check/test_conduction_3D.txt</result-file>
4645
<boundary-conditions>
4746
<dirichlet>

0 commit comments

Comments
 (0)