[Type] Remove VecView class and update codebase to use Vec utilities instead (#6138)

Author: alxbilger

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

@@ -21,7 +21,6 @@
 ******************************************************************************/
 #pragma once
 #include <sofa/component/solidmechanics/fem/elastic/ElementCorotationalFEMForceField.h>
-#include <sofa/type/VecView.h>
 #include <sofa/component/solidmechanics/fem/elastic/impl/VectorTools.h>
 #include <sofa/core/behavior/BaseLocalForceFieldMatrix.h>
 
@@ -84,6 +83,7 @@ void ElementCorotationalFEMForceField<DataTypes, ElementType>::computeElementsFo
     const sofa::simulation::Range<std::size_t>& range, const sofa::core::MechanicalParams* mparams,
     sofa::type::vector<ElementGradient>& elementForces, const sofa::VecCoord_t<DataTypes>& nodePositions)
 {
+    static constexpr auto DIM = trait::spatial_dimensions;
     const auto& elements = trait::FiniteElement::getElementSequence(*this->l_topology);
     auto restPositionAccessor = this->mstate->readRestPositions();
     auto elementStiffness = sofa::helper::getReadAccessor(this->d_elementStiffness);
@@ -108,19 +108,20 @@ void ElementCorotationalFEMForceField<DataTypes, ElementType>::computeElementsFo
         typename trait::ElementDisplacement displacement(sofa::type::NOINIT);
         for (sofa::Size j = 0; j < trait::NumberOfNodesInElement; ++j)
         {
-            sofa::type::VecView<trait::spatial_dimensions, sofa::Real_t<DataTypes>> transformedDisplacement(displacement, j * trait::spatial_dimensions);
-            transformedDisplacement = elementRotation.multTranspose(elementNodesCoordinates[j] - t) - (restElementNodesCoordinates[j] - t0);
+            displacement.setsub(j * DIM,
+                elementRotation.multTranspose(elementNodesCoordinates[j] - t) - (restElementNodesCoordinates[j] - t0));
         }
 
         const auto& stiffnessMatrix = elementStiffness[elementId];
 
         auto& elementForce = elementForces[elementId];
         elementForce = stiffnessMatrix * displacement;
 
-        for (sofa::Size i = 0; i < trait::NumberOfNodesInElement; ++i)
+        sofa::type::Vec<DIM, sofa::Real_t<DataTypes>> nodeForce { sofa::type::NOINIT };
+        for (sofa::Size n = 0; n < trait::NumberOfNodesInElement; ++n)
         {
-            sofa::type::VecView<trait::spatial_dimensions, sofa::Real_t<DataTypes>> nodeForce(elementForce, i * trait::spatial_dimensions);
-            nodeForce = elementRotation * nodeForce;
+            elementForce.getsub(n * DIM, nodeForce);
+            elementForce.setsub(n * DIM, elementRotation * nodeForce);
         }
     }
 }
@@ -146,19 +147,19 @@ void ElementCorotationalFEMForceField<DataTypes, ElementType>::computeElementsFo
 
         for (sofa::Size n = 0; n < trait::NumberOfNodesInElement; ++n)
         {
-            sofa::type::VecView<trait::spatial_dimensions, sofa::Real_t<DataTypes>> rotated_dx(element_dx, n * trait::spatial_dimensions);
-            rotated_dx = elementRotation.multTranspose(nodeDx[element[n]]);
+            element_dx.setsub(n * trait::spatial_dimensions, elementRotation.multTranspose(nodeDx[element[n]]));
         }
 
         const auto& stiffnessMatrix = elementStiffness[elementId];
 
         auto& df = elementForcesDeriv[elementId];
         df = stiffnessMatrix * element_dx;
 
+        sofa::type::Vec<trait::spatial_dimensions, sofa::Real_t<DataTypes>> nodedForce { sofa::type::NOINIT };
         for (sofa::Size n = 0; n < trait::NumberOfNodesInElement; ++n)
         {
-            sofa::type::VecView<trait::spatial_dimensions, sofa::Real_t<DataTypes>> nodedForce(df, n * trait::spatial_dimensions);
-            nodedForce = elementRotation * nodedForce;
+            df.getsub(n * trait::spatial_dimensions, nodedForce);
+            df.setsub(n * trait::spatial_dimensions, elementRotation * nodedForce);
         }
     }
 }

Sofa/framework/Type/CMakeLists.txt

@@ -52,7 +52,6 @@ set(HEADER_FILES
     ${SOFATYPESRC_ROOT}/vector_algebra.h
     ${SOFATYPESRC_ROOT}/vector_algorithm.h
     ${SOFATYPESRC_ROOT}/vector_device.h
-    ${SOFATYPESRC_ROOT}/VecView.h
     ${SOFATYPESRC_ROOT}/VoigtNotation.h
 )
 

Sofa/framework/Type/src/sofa/type/Vec.h

@@ -311,6 +311,16 @@ class Vec
         m = this->elems[i];
     }
 
+    template <Size N2, std::enable_if_t<(N2 < N), bool> = true>
+    void setsub(const Size i, const sofa::type::Vec<N2, ValueType>& v) noexcept
+    {
+        for (Size j = 0; j < N2; j++)
+        {
+            this->elems[j + i] = v[j];
+        }
+    }
+
+
     // LINEAR ALGEBRA
     constexpr Vec<N,ValueType> mulscalar(const ValueType f) const noexcept
     {

Sofa/framework/Type/src/sofa/type/VecView.h

@@ -538,6 +538,17 @@ TEST(VecTest, getSubScalar)
     EXPECT_EQ(scalar, 6.0);
 }
 
+TEST(VecTest, setSub)
+{
+    sofa::type::Vec<5, double> v(1.0, 2.0, 3.0, 4.0, 5.0);
+    sofa::type::Vec<2, double> sub { 9., 8. };
+    v.setsub(1, sub);
+    EXPECT_EQ(v[0], 1.0);
+    EXPECT_EQ(v[1], 9.0);
+    EXPECT_EQ(v[2], 8.0);
+    EXPECT_EQ(v[3], 4.0);
+}
+
 TEST(VecTest, staticSize)
 {
     constexpr sofa::Size s = sofa::type::Vec<3, double>::static_size;