Merge inf_dev_2022 into inf_dev_2024

Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl

@@ -942,6 +942,7 @@ void TriangularFEMForceField<DataTypes>::computeStressPerVertex()
     }
 }
 
+
 // ----------------------------------------------------------------------------------------------------------------------------------------
 // ---	Compute value of stress along a given direction (typically the fiber direction and transverse direction in anisotropic materials)
 // ----------------------------------------------------------------------------------------------------------------------------------------
@@ -1212,6 +1213,9 @@ void TriangularFEMForceField<DataTypes>::accumulateForceLarge(VecCoord& f, const
         const Coord deforme_b = R_0_2 * (pB - pA);
         const Coord deforme_c = R_0_2 * (pC - pA);
 
+        const Real determinant = deforme_b[0] * deforme_c[1];
+        tInfo.area = determinant * 0.5;
+
         // Strain-displacement matrix
         StrainDisplacement J(type::NOINIT);
         try
@@ -1370,7 +1374,6 @@ void TriangularFEMForceField<DataTypes>::draw(const core::visual::VisualParams*
     {
         const type::vector<VertexInformation>& vertexInf = vertexInfo.getValue();
         std::vector<sofa::type::Vec3> vertices;
-
         std::vector<sofa::type::RGBAColor> colorVector;
 
         auto evalColor = p_drawColorMap->getEvaluator(m_minStress, m_maxStress);

Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp

@@ -511,7 +511,6 @@ MeshTopology::MeshTopology()
 
 void MeshTopology::init()
 {
-
     BaseMeshTopology::init();
 
     const auto hexahedra = sofa::helper::getReadAccessor(seqHexahedra);
@@ -535,9 +534,12 @@ void MeshTopology::init()
     else
         m_upperElementType = sofa::geometry::ElementType::POINT;
 
+   // computeCrossElementBuffers();
 
+void MeshTopology::computeCrossElementBuffers()
+{
     // compute the number of points, if the topology is charged from the scene or if it was loaded from a MeshLoader without any points data.
-    if (nbPoints==0)
+    if (nbPoints == 0)
     {
         unsigned int n = 0;
         const auto countPoints = [&n](const auto& seqElements)
@@ -565,7 +567,63 @@ void MeshTopology::init()
 
     if(edges.empty() )
     {
-        if(seqEdges.getParent() != nullptr )
+        createHexahedraAroundVertexArray();
+
+        if (!seqQuads.getValue().empty())
+        {
+            createQuadsInHexahedronArray();
+            createHexahedraAroundQuadArray();
+        }
+
+        if (!seqEdges.getValue().empty())
+        {
+            createEdgesInHexahedronArray();
+            createHexahedraAroundEdgeArray();
+        }
+    }
+    if (!seqTetrahedra.getValue().empty()) // Create tetrahedron cross element buffers.
+    {
+        createTetrahedraAroundVertexArray();
+
+        if (!seqTriangles.getValue().empty())
+        {
+            createTrianglesInTetrahedronArray();
+            createTetrahedraAroundTriangleArray();
+        }
+
+        if (!seqEdges.getValue().empty())
+        {
+            createEdgesInTetrahedronArray();
+            createTetrahedraAroundEdgeArray();
+        }
+    }
+    if (!seqQuads.getValue().empty()) // Create triangle cross element buffers.
+    {
+        createQuadsAroundVertexArray();
+
+        if (!seqEdges.getValue().empty())
+        {
+            createEdgesInQuadArray();
+            createQuadsAroundEdgeArray();
+        }
+    }
+    if (!seqTriangles.getValue().empty()) // Create triangle cross element buffers.
+    {
+        createTrianglesAroundVertexArray();
+
+        if (!seqEdges.getValue().empty())
+        {
+            createEdgesInTriangleArray();
+            createTrianglesAroundEdgeArray();
+        }
+    }
+    if (!seqEdges.getValue().empty())
+    {
+        createEdgesAroundVertexArray();
+    }
+
+    {
+        if (seqEdges.getParent() != nullptr)
         {
             seqEdges.delInput(seqEdges.getParent());
         }
@@ -575,7 +633,7 @@ void MeshTopology::init()
     }
     if(triangles.empty() )
     {
-        if(seqTriangles.getParent() != nullptr)
+        if (seqTriangles.getParent() != nullptr)
         {
             seqTriangles.delInput(seqTriangles.getParent());
         }
@@ -585,7 +643,7 @@ void MeshTopology::init()
     }
     if(quads.empty() )
     {
-        if(seqQuads.getParent() != nullptr )
+        if (seqQuads.getParent() != nullptr)
         {
             seqQuads.delInput(seqQuads.getParent());
         }

Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h

@@ -84,6 +84,9 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core:
 public:
     void init() override;
 
+    /// Method called by component Init method. Will create all the topology buffers
+    void computeCrossElementBuffers() override;
+
     Size getNbPoints() const override;
 
     void setNbPoints(Size  n) override;

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.cpp

@@ -74,10 +74,10 @@ void EdgeSetTopologyContainer::init()
 
     // only init if edges are present at init.
     if (!m_edge.empty())
-        initTopology();
+        computeCrossElementBuffers();
 }
 
-void EdgeSetTopologyContainer::initTopology()
+void EdgeSetTopologyContainer::computeCrossElementBuffers()
 {
     // force computation of neighborhood elements
     createEdgesAroundVertexArray();

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h

@@ -98,7 +98,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API EdgeSetTopologyContainer : p
     /// Dynamic Topology API
     /// @{
     /// Method called by component Init method. Will create all the topology neighboorhood buffers.
-    void initTopology();
+    void computeCrossElementBuffers() override;
 
     /** \brief Checks if the topology is coherent
      *

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.cpp

@@ -83,12 +83,12 @@ void HexahedronSetTopologyContainer::init()
     }
 
     if (!m_hexahedron.empty())
-        initTopology();
+        computeCrossElementBuffers();
 }
 
-void HexahedronSetTopologyContainer::initTopology()
+void HexahedronSetTopologyContainer::computeCrossElementBuffers()
 {
-    QuadSetTopologyContainer::initTopology();
+    QuadSetTopologyContainer::computeCrossElementBuffers();
 
     // Create tetrahedron cross element buffers.
     createQuadsInHexahedronArray();

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.h

@@ -222,8 +222,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API HexahedronSetTopologyContain
     /// Dynamic Topology API
     /// @{
 
-    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see TriangleSetTopologyContainer::initTopology()
-    void initTopology();
+    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see QuadSetTopologyContainer::computeCrossElementBuffers()
+    void computeCrossElementBuffers() override;
 
     /** \brief Checks if the topology is coherent
      *

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.cpp

@@ -73,13 +73,13 @@ void QuadSetTopologyContainer::init()
 
     // only init if triangles are present at init.
     if (!m_quads.empty())
-        initTopology();
+        computeCrossElementBuffers();
 }
 
-void QuadSetTopologyContainer::initTopology()
+void QuadSetTopologyContainer::computeCrossElementBuffers()
 {
     // Force creation of Edge Neighboordhood buffers.
-    EdgeSetTopologyContainer::initTopology();
+    EdgeSetTopologyContainer::computeCrossElementBuffers();
 
     // Create triangle cross element buffers.
     createEdgesInQuadArray();

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h

@@ -144,8 +144,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API QuadSetTopologyContainer : p
 
     /// Dynamic Topology API
     /// @{
-    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::initTopology()
-    void initTopology();
+    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::computeCrossElementBuffers()
+    void computeCrossElementBuffers() override;
 
     /** \brief Checks if the topology is coherent
     *

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetTopologyContainer.cpp

@@ -79,12 +79,12 @@ void TetrahedronSetTopologyContainer::init()
     }
 
     if (!m_tetrahedron.empty())
-        initTopology();
+        computeCrossElementBuffers();
 }
 
-void TetrahedronSetTopologyContainer::initTopology()
+void TetrahedronSetTopologyContainer::computeCrossElementBuffers()
 {
-    TriangleSetTopologyContainer::initTopology();
+    TriangleSetTopologyContainer::computeCrossElementBuffers();
 
     // Create tetrahedron cross element buffers.
     createTrianglesInTetrahedronArray();

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetTopologyContainer.h

@@ -193,8 +193,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API TetrahedronSetTopologyContai
     /// Dynamic Topology API
     /// @{
 
-    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see TriangleSetTopologyContainer::initTopology()
-    void initTopology();
+    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see TriangleSetTopologyContainer::computeCrossElementBuffers()
+    void computeCrossElementBuffers() override;
 
     /** \brief Checks if the topology is coherent
      *

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.cpp

@@ -74,13 +74,13 @@ void TriangleSetTopologyContainer::init()
 
     // only init if triangles are present at init.
     if (!m_triangle.empty())
-        initTopology();
+        computeCrossElementBuffers();
 }
 
-void TriangleSetTopologyContainer::initTopology()
+void TriangleSetTopologyContainer::computeCrossElementBuffers()
 {
     // Force creation of Edge Neighboordhood buffers.
-    EdgeSetTopologyContainer::initTopology();
+    EdgeSetTopologyContainer::computeCrossElementBuffers();
 
     // Create triangle cross element buffers.
     createEdgesInTriangleArray();

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h

@@ -151,8 +151,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API TriangleSetTopologyContainer
 
     /// Dynamic Topology API
     /// @{
-    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::initTopology()
-    void initTopology();
+    /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::computeCrossElementBuffers()
+    void computeCrossElementBuffers() override;
 
     /** \brief Checks if the topology is coherent
      *