From a9e9ce575c1ac85c223498a8ebd580cd9775fddd Mon Sep 17 00:00:00 2001 From: Mohd Afeef Badri <52162083+mohd-afeef-badri@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:05:39 +0200 Subject: [PATCH] correct naming --- acoustics/FemModule.cc | 12 ++++++------ acoustics/FemModule.h | 4 ++-- femutils/ArcaneFemFunctions.h | 20 ++++++++++---------- fourier/FemModule.cc | 12 ++++++------ fourier/FemModule.h | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/acoustics/FemModule.cc b/acoustics/FemModule.cc index 2df384f0..7521f911 100644 --- a/acoustics/FemModule.cc +++ b/acoustics/FemModule.cc @@ -67,7 +67,7 @@ compute() * * This method follows a sequence of steps to solve FEM system: * 1. _getMaterialParameters() Retrieves material parameters via - * 2. _assembleBilinearOperatorTRIA3() Assembles the FEM matrix A + * 2. _assembleBilinearOperatorTria3() Assembles the FEM matrix A * 3. _assembleLinearOperator() Assembles the FEM RHS vector b * 4. _solve() Solves for solution vector u = A^-1*b * 5. _validateResults() Regression test @@ -78,7 +78,7 @@ void FemModule:: _doStationarySolve() { _getMaterialParameters(); - _assembleBilinearOperatorTRIA3(); + _assembleBilinearOperatorTria3(); _assembleLinearOperator(); _solve(); _validateResults(); @@ -137,10 +137,10 @@ _assembleLinearOperator() /*---------------------------------------------------------------------------*/ FixedMatrix<3, 3> FemModule:: -_computeElementMatrixTRIA3(Cell cell) +_computeElementMatrixTria3(Cell cell) { // step 1 - Real area = ArcaneFemFunctions::MeshOperation::computeAreaTriangle3(cell, m_node_coord); + Real area = ArcaneFemFunctions::MeshOperation::computeAreaTria3(cell, m_node_coord); // step 2 Real3x3 UV = ArcaneFemFunctions::FeOperation2D::computeUVTria3(cell, m_node_coord); @@ -163,14 +163,14 @@ _computeElementMatrixTRIA3(Cell cell) /*---------------------------------------------------------------------------*/ void FemModule:: -_assembleBilinearOperatorTRIA3() +_assembleBilinearOperatorTria3() { auto node_dof(m_dofs_on_nodes.nodeDoFConnectivityView()); ENUMERATE_ (Cell, icell, allCells()) { Cell cell = *icell; - auto K_e = _computeElementMatrixTRIA3(cell); // element matrix + auto K_e = _computeElementMatrixTria3(cell); // element matrix Int32 n1_index = 0; for (Node node1 : cell.nodes()) { Int32 n2_index = 0; diff --git a/acoustics/FemModule.h b/acoustics/FemModule.h index 242d2502..6e597204 100644 --- a/acoustics/FemModule.h +++ b/acoustics/FemModule.h @@ -76,12 +76,12 @@ class FemModule void _doStationarySolve(); void _getMaterialParameters(); - void _assembleBilinearOperatorTRIA3(); + void _assembleBilinearOperatorTria3(); void _solve(); void _assembleLinearOperator(); void _validateResults(); - FixedMatrix<3, 3> _computeElementMatrixTRIA3(Cell cell); + FixedMatrix<3, 3> _computeElementMatrixTria3(Cell cell); }; #endif diff --git a/femutils/ArcaneFemFunctions.h b/femutils/ArcaneFemFunctions.h index 3bf57670..c7ca1bba 100644 --- a/femutils/ArcaneFemFunctions.h +++ b/femutils/ArcaneFemFunctions.h @@ -12,7 +12,7 @@ using namespace Arcane; * The class provides methods organized into different nested classes for: * - MeshOperation: Mesh related operations. * - FeOperation2D: Finite element operations at element level. - * - BoundaryConditions2D: Boundary condition realated operations. + * - BoundaryConditions2D: Boundary condition related operations. */ /*---------------------------------------------------------------------------*/ @@ -70,7 +70,7 @@ class ArcaneFemFunctions */ /*---------------------------------------------------------------------------*/ - static inline Real computeAreaTriangle3(Cell cell, const VariableNodeReal3& node_coord) + static inline Real computeAreaTria3(Cell cell, const VariableNodeReal3& node_coord) { Real3 vertex0 = node_coord[cell.nodeId(0)]; Real3 vertex1 = node_coord[cell.nodeId(1)]; @@ -109,7 +109,7 @@ class ArcaneFemFunctions */ /*---------------------------------------------------------------------------*/ - static inline Real3 computeBaryCenterTriangle3(Cell cell, const VariableNodeReal3& node_coord) + static inline Real3 computeBaryCenterTria3(Cell cell, const VariableNodeReal3& node_coord) { Real3 vertex0 = node_coord[cell.nodeId(0)]; Real3 vertex1 = node_coord[cell.nodeId(1)]; @@ -129,7 +129,7 @@ class ArcaneFemFunctions */ /*---------------------------------------------------------------------------*/ - static inline Real computeEdgeLength2(Face face, const VariableNodeReal3& node_coord) + static inline Real computeLengthEdge2(Face face, const VariableNodeReal3& node_coord) { Real3 vertex0 = node_coord[face.nodeId(0)]; Real3 vertex1 = node_coord[face.nodeId(1)]; @@ -149,7 +149,7 @@ class ArcaneFemFunctions */ /*---------------------------------------------------------------------------*/ - static inline Real2 computeEdgeNormal2(Face face, const VariableNodeReal3& node_coord) + static inline Real2 computeNormalEdge2(Face face, const VariableNodeReal3& node_coord) { Real3 vertex0 = node_coord[face.nodeId(0)]; Real3 vertex1 = node_coord[face.nodeId(1)]; @@ -395,7 +395,7 @@ class ArcaneFemFunctions { ENUMERATE_ (Cell, icell, mesh->allCells()) { Cell cell = *icell; - Real area = ArcaneFemFunctions::MeshOperation::computeAreaTriangle3(cell, node_coord); + Real area = ArcaneFemFunctions::MeshOperation::computeAreaTria3(cell, node_coord); for (Node node : cell.nodes()) { if (node.isOwn()) rhs_values[node_dof.dofId(node, 0)] += qdot * area / cell.nbNode(); @@ -423,8 +423,8 @@ class ArcaneFemFunctions { ENUMERATE_ (Cell, icell, mesh->allCells()) { Cell cell = *icell; - Real area = ArcaneFemFunctions::MeshOperation::computeAreaTriangle3(cell, node_coord); - Real3 bcenter = ArcaneFemFunctions::MeshOperation::computeBaryCenterTriangle3(cell, node_coord); + Real area = ArcaneFemFunctions::MeshOperation::computeAreaTria3(cell, node_coord); + Real3 bcenter = ArcaneFemFunctions::MeshOperation::computeBaryCenterTria3(cell, node_coord); for (Node node : cell.nodes()) { if (node.isOwn()) @@ -472,8 +472,8 @@ class ArcaneFemFunctions ENUMERATE_ (Face, iface, group) { Face face = *iface; - Real length = ArcaneFemFunctions::MeshOperation::computeEdgeLength2(face, node_coord); - Real2 normal = ArcaneFemFunctions::MeshOperation::computeEdgeNormal2(face, node_coord); + Real length = ArcaneFemFunctions::MeshOperation::computeLengthEdge2(face, node_coord); + Real2 normal = ArcaneFemFunctions::MeshOperation::computeNormalEdge2(face, node_coord); for (Node node : iface->nodes()) { if (!node.isOwn()) diff --git a/fourier/FemModule.cc b/fourier/FemModule.cc index 67b38508..1fd63b41 100644 --- a/fourier/FemModule.cc +++ b/fourier/FemModule.cc @@ -221,9 +221,9 @@ _assembleLinearOperator() /*---------------------------------------------------------------------------*/ FixedMatrix<3, 3> FemModule:: -_computeElementMatrixTRIA3(Cell cell) +_computeElementMatrixTria3(Cell cell) { - Real area = ArcaneFemFunctions::MeshOperation::computeAreaTriangle3(cell, m_node_coord); + Real area = ArcaneFemFunctions::MeshOperation::computeAreaTria3(cell, m_node_coord); Real3 dxU = ArcaneFemFunctions::FeOperation2D::computeGradientXTria3(cell, m_node_coord); Real3 dyU = ArcaneFemFunctions::FeOperation2D::computeGradientYTria3(cell, m_node_coord); @@ -235,7 +235,7 @@ _computeElementMatrixTRIA3(Cell cell) /*---------------------------------------------------------------------------*/ FixedMatrix<4, 4> FemModule:: -_computeElementMatrixQUAD4(Cell cell) +_computeElementMatrixQuad4(Cell cell) { Real area = ArcaneFemFunctions::MeshOperation::computeAreaQuad4(cell, m_node_coord); @@ -256,11 +256,11 @@ _assembleBilinearOperator() { if (options()->meshType == "QUAD4") _assembleBilinear<4>([this](const Cell& cell) { - return _computeElementMatrixQUAD4(cell); + return _computeElementMatrixQuad4(cell); }); else if (options()->meshType == "TRIA3") _assembleBilinear<3>([this](const Cell& cell) { - return _computeElementMatrixTRIA3(cell); + return _computeElementMatrixTria3(cell); }); else ARCANE_FATAL("Non supported meshType"); @@ -273,7 +273,7 @@ _assembleBilinearOperator() * The method performs the following steps: * 1. For each cell, retrieves the cell-specific constant `lambda`. * 2. Computes element matrix using provided `compute_element_matrix` function. - * 3. Assembles global matrix by addingcontributions from each cell's element + * 3. Assembles global matrix by adding contributions from each cell's element * matrix to the corresponding entries in the global matrix. */ /*---------------------------------------------------------------------------*/ diff --git a/fourier/FemModule.h b/fourier/FemModule.h index 928efd76..218c1d99 100644 --- a/fourier/FemModule.h +++ b/fourier/FemModule.h @@ -86,8 +86,8 @@ class FemModule void _assembleLinearOperator(); void _validateResults(); - FixedMatrix<3, 3> _computeElementMatrixTRIA3(Cell cell); - FixedMatrix<4, 4> _computeElementMatrixQUAD4(Cell cell); + FixedMatrix<3, 3> _computeElementMatrixTria3(Cell cell); + FixedMatrix<4, 4> _computeElementMatrixQuad4(Cell cell); IBinaryMathFunctor* m_manufactured_dirichlet = nullptr; IBinaryMathFunctor* m_manufactured_source = nullptr;