Fix compilation further to lifecycle v25.06 (SofaDefrost#154)

hugtalbot · web-flow · commit 1a67763d5875 · 2025-02-26T09:17:18.000+01:00
diff --git a/src/ModelOrderReduction/component/contact/MORFrictionContact.h b/src/ModelOrderReduction/component/contact/MORFrictionContact.h
@@ -71,8 +71,8 @@ class MORFrictionContact : public FrictionContact<TCollisionModel1, TCollisionMo
 
     using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::parent;
 
-    using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::mu; ///< friction coefficient (0 for frictionless contacts)
-    using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::tol; ///< tolerance for the constraints resolution (0 for default tolerance)
+    using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::d_mu; ///< friction coefficient (0 for frictionless contacts)
+    using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::d_tol; ///< tolerance for the constraints resolution (0 for default tolerance)
     using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::contacts;
     using FrictionContact<TCollisionModel1, TCollisionModel2, ResponseDataTypes>::mappedContacts;
 
diff --git a/src/ModelOrderReduction/component/contact/MORUnilateralInteractionConstraint.inl b/src/ModelOrderReduction/component/contact/MORUnilateralInteractionConstraint.inl
@@ -180,8 +180,8 @@ void MORUnilateralInteractionConstraint<DataTypes>::buildConstraintMatrix(const
 template<class DataTypes>
 void MORUnilateralInteractionConstraint<DataTypes>::getPositionViolation(linearalgebra::BaseVector *v)
 {
-    const VecCoord &PfreeVec = this->getMState2()->read(core::ConstVecCoordId::freePosition())->getValue();
-    const VecCoord &QfreeVec = this->getMState1()->read(core::ConstVecCoordId::freePosition())->getValue();
+    const VecCoord &PfreeVec = this->getMState2()->read(core::vec_id::read_access::freePosition)->getValue();
+    const VecCoord &QfreeVec = this->getMState1()->read(core::vec_id::read_access::freePosition)->getValue();
     Real dfree = (Real)0.0;
     Real dfree_t = (Real)0.0;
     Real dfree_s = (Real)0.0;
diff --git a/src/ModelOrderReduction/component/contact/MORpointModel.h b/src/ModelOrderReduction/component/contact/MORpointModel.h
@@ -54,7 +54,7 @@ class MORPointCollisionModel : public PointCollisionModel<TDataTypes>
     using PointCollisionModel<TDataTypes>::mstate;
     using PointCollisionModel<TDataTypes>::size;
     using PointCollisionModel<TDataTypes>::normals;
-    using PointCollisionModel<TDataTypes>::m_displayFreePosition;
+    using PointCollisionModel<TDataTypes>::d_displayFreePosition;
     void init() override;
 
     // -- CollisionModel interface
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h
@@ -69,7 +69,7 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
 
     typedef type::Mat<24, 24, Real> ElementStiffness;
     typedef type::vector<ElementStiffness> VecElementStiffness;
-    using HexahedronFEMForceField<DataTypes>::_elementStiffnesses; ///< Stiffness matrices per element (K_i)
+    using HexahedronFEMForceField<DataTypes>::d_elementStiffnesses; ///< Stiffness matrices per element (K_i)
 
     typedef type::Mat<3, 3, Real> Mat33;
 
@@ -82,7 +82,7 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
 
 
     using HexahedronFEMForceField<DataTypes>::_sparseGrid;
-    using HexahedronFEMForceField<DataTypes>::_initialPoints; ///< the intial positions of the points
+    using HexahedronFEMForceField<DataTypes>::d_initialPoints; ///< the intial positions of the points
 
 
     using HexahedronFEMForceField<DataTypes>::_coef; ///< coef of each vertices to compute the strain stress matrix
@@ -96,14 +96,14 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
     // Inherited ForceField Variables
 
     using HexahedronFEMForceField<DataTypes>::method;
-    using HexahedronFEMForceField<DataTypes>::f_method; ///< the computation method of the displacements
-    using HexahedronFEMForceField<DataTypes>::f_poissonRatio;
-    using HexahedronFEMForceField<DataTypes>::f_youngModulus;
-    using HexahedronFEMForceField<DataTypes>::f_updateStiffnessMatrix;
-    using HexahedronFEMForceField<DataTypes>::_gatherPt; ///< use in GPU version
-    using HexahedronFEMForceField<DataTypes>::_gatherBsize; ///< use in GPU version
-    using HexahedronFEMForceField<DataTypes>::f_drawing; ///<  draw the forcefield if true
-    using HexahedronFEMForceField<DataTypes>::f_drawPercentageOffset; ///< size of the hexa
+    using HexahedronFEMForceField<DataTypes>::d_method; ///< the computation method of the displacements
+    using HexahedronFEMForceField<DataTypes>::d_poissonRatio;
+    using HexahedronFEMForceField<DataTypes>::d_youngModulus;
+    using HexahedronFEMForceField<DataTypes>::d_updateStiffnessMatrix;
+    using HexahedronFEMForceField<DataTypes>::d_gatherPt; ///< use in GPU version
+    using HexahedronFEMForceField<DataTypes>::d_gatherBsize; ///< use in GPU version
+    using HexahedronFEMForceField<DataTypes>::d_drawing; ///<  draw the forcefield if true
+    using HexahedronFEMForceField<DataTypes>::d_drawPercentageOffset; ///< size of the hexa
     using HexahedronFEMForceField<DataTypes>::needUpdateTopology;
 
     // Reduced Order Variables
@@ -127,8 +127,7 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
 
 
 protected:
-    HyperReducedHexahedronFEMForceField()
-        : HexahedronFEMForceField<DataTypes>()
+    HyperReducedHexahedronFEMForceField() : HexahedronFEMForceField<DataTypes>()
     {
     }
 public:
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl
@@ -456,7 +456,7 @@ void HyperReducedHexahedronFEMForceField<DataTypes>::draw(const core::visual::Vi
     if (!this->d_drawing.getValue()) return;
 
 
-    const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+    const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
 
     if (vparams->displayFlags().getShowWireFrame())
         vparams->drawTool()->setPolygonMode(0,true);
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl
@@ -224,7 +224,7 @@ bool HyperReducedRestShapeSpringsForceField<DataTypes>::checkOutOfBoundsIndices(
 template<class DataTypes>
 const typename HyperReducedRestShapeSpringsForceField<DataTypes>::DataVecCoord* HyperReducedRestShapeSpringsForceField<DataTypes>::getExtPosition() const
 {
-    return (useRestMState ? l_restMState->read(VecCoordId::position()) : this->mstate->read(VecCoordId::restPosition()));
+    return (useRestMState ? l_restMState->read(sofa::core::vec_id::read_access::position) : this->mstate->read(sofa::core::vec_id::read_access::restPosition));
 }
 
 template<class DataTypes>
@@ -409,7 +409,7 @@ void HyperReducedRestShapeSpringsForceField<DataTypes>::draw(const VisualParams
     vparams->drawTool()->setLightingEnabled(false);
 
     ReadAccessor< DataVecCoord > p0 = *this->getExtPosition();
-    ReadAccessor< DataVecCoord > p  = this->mstate->read(VecCoordId::position());
+    ReadAccessor< DataVecCoord > p  = this->mstate->read(sofa::core::vec_id::read_access::position);
 
     const VecIndex& indices = m_indices;
     const VecIndex& ext_indices = (useRestMState ? m_ext_indices : m_indices);
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h
@@ -69,7 +69,7 @@ class HyperReducedTetrahedralCorotationalFEMForceField : public virtual Tetrahed
     /// @}
 
     /// container that stotes all requires information for each tetrahedron
-    using TetrahedralCorotationalFEMForceField<DataTypes>::tetrahedronInfo;
+    using TetrahedralCorotationalFEMForceField<DataTypes>::d_tetrahedronInfo;
 
     /// @name Full system matrix assembly support
     /// @{
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl
@@ -175,7 +175,7 @@ void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::accumulateForc
 {
 
     const core::topology::BaseMeshTopology::Tetrahedron t=_topology->getTetrahedron(elementIndex);
-    const VecCoord& X0=this->mstate->read(core::ConstVecCoordId::restPosition())->getValue();
+    const VecCoord& X0=this->mstate->read(core::vec_id::read_access::restPosition)->getValue();
 
 
     Index a = t[0];
@@ -622,7 +622,7 @@ void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::draw(const cor
 
     vparams->drawTool()->saveLastState();
 
-    const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+    const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
 
     if (vparams->displayFlags().getShowWireFrame())
         vparams->drawTool()->setPolygonMode(0,true);
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h
@@ -112,7 +112,7 @@ class HyperReducedTetrahedronFEMForceField : public virtual TetrahedronFEMForceF
 
     using TetrahedronFEMForceField<DataTypes>::_plasticStrains; ///< one plastic strain per element
 
-    using TetrahedronFEMForceField<DataTypes>::_showVonMisesStressPerElement;
+    using TetrahedronFEMForceField<DataTypes>::d_showVonMisesStressPerElement;
     /// @name Full system matrix assembly support
     /// @{
 
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl
@@ -467,7 +467,7 @@ void HyperReducedTetrahedronFEMForceField<DataTypes>::draw(const core::visual::V
 
         vparams->drawTool()->disableLighting();
 
-        const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+        const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
         const VecReal& youngModulus = this->d_youngModulus.getValue();
 
         bool heterogeneous = false;
@@ -605,7 +605,7 @@ void HyperReducedTetrahedronFEMForceField<DataTypes>::draw(const core::visual::V
         ////////////// DRAW ROTATIONS //////////////
         if (vparams->displayFlags().getShowNormals())
         {
-            const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+            const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
             std::vector< type::Vec3 > points[3];
             for(unsigned ii = 0; ii<  x.size() ; ii++)
             {
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl
@@ -551,7 +551,7 @@ void HyperReducedTetrahedronHyperelasticityFEMForceField<DataTypes>::draw(const
 
     const auto stateLifeCycle = vparams->drawTool()->makeStateLifeCycle();
 
-    const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+    const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
 
     if (vparams->displayFlags().getShowWireFrame())
           vparams->drawTool()->setPolygonMode(0,true);
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h
@@ -84,7 +84,7 @@ class HyperReducedTriangleFEMForceField : public virtual TriangleFEMForceField<D
 
 
     using TriangleFEMForceField<DataTypes>::_indexedElements;
-    using TriangleFEMForceField<DataTypes>::_initialPoints; ///< the intial positions of the points
+    using TriangleFEMForceField<DataTypes>::d_initialPoints; ///< the intial positions of the points
     using TriangleFEMForceField<DataTypes>::_rotatedInitialElements;   ///< The initials positions in its frame
     using TriangleFEMForceField<DataTypes>::_rotations;
 
@@ -127,11 +127,11 @@ class HyperReducedTriangleFEMForceField : public virtual TriangleFEMForceField<D
     void draw(const core::visual::VisualParams* vparams) override;
 
     using TriangleFEMForceField<DataTypes>::method;
-    using TriangleFEMForceField<DataTypes>::f_method; ///< Choice of method: 0 for small, 1 for large displacements
-    using TriangleFEMForceField<DataTypes>::f_poisson;       ///< Poisson ratio of the material
-    using TriangleFEMForceField<DataTypes>::f_young;         ///< Young modulus of the material
-    using TriangleFEMForceField<DataTypes>::f_thickness;     ///< Thickness of the elements
-    using TriangleFEMForceField<DataTypes>::f_planeStrain; ///< compute material stiffness corresponding to the plane strain assumption, or to the plane stress otherwise.
+    using TriangleFEMForceField<DataTypes>::d_method; ///< Choice of method: 0 for small, 1 for large displacements
+    using TriangleFEMForceField<DataTypes>::d_poissonRatio;       ///< Poisson ratio of the material
+    using TriangleFEMForceField<DataTypes>::d_youngModulus;         ///< Young modulus of the material
+    using TriangleFEMForceField<DataTypes>::d_thickness;     ///< Thickness of the elements
+    using TriangleFEMForceField<DataTypes>::d_planeStrain; ///< compute material stiffness corresponding to the plane strain assumption, or to the plane stress otherwise.
 
 protected :
 
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl
@@ -258,7 +258,7 @@ void HyperReducedTriangleFEMForceField<DataTypes>::hyperReducedApplyStiffnessLar
     unsigned int i;
     typename VecElement::const_iterator it, it0;
 
-    it0=_indexedElements->begin();
+    it0 = _indexedElements->begin();
     unsigned int nbElementsConsidered;
     const bool performECSW = d_performECSW.getValue();
     if (!performECSW)
@@ -343,7 +343,7 @@ void HyperReducedTriangleFEMForceField<DataTypes>::draw(const core::visual::Visu
     if (vparams->displayFlags().getShowWireFrame())
         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-    const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();
+    const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();
 
     glDisable(GL_LIGHTING);
 
@@ -386,7 +386,7 @@ void HyperReducedTriangleFEMForceField<DataTypes>::buildStiffnessMatrix(core::be
     sofa::Size triangleId = 0;
 
     typename VecElement::const_iterator it;
-    auto it0=_indexedElements->begin();
+    auto it0 = _indexedElements->begin();
     int nbElementsConsidered;
 
     const bool performECSW = d_performECSW.getValue();
diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl
@@ -111,7 +111,7 @@ void ModelOrderReductionMapping<TIn, TOut>::apply(const core::MechanicalParams *
     helper::WriteOnlyAccessor< Data<VecCoord> > out = dOut;
     helper::ReadAccessor< Data<InVecCoord> > in = dIn;
 
-    const Data<VecCoord>* restPosData = toModel->read(core::VecCoordId::restPosition());
+    const Data<VecCoord>* restPosData = toModel->read(core::vec_id::read_access::restPosition);
     assert(restPosData != nullptr);
 
     out.wref() = restPosData->getValue();

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ bool HyperReducedRestShapeSpringsForceField<DataTypes>::checkOutOfBoundsIndices(`
`224`	`224`	`template<class DataTypes>`
`225`	`225`	`const typename HyperReducedRestShapeSpringsForceField<DataTypes>::DataVecCoord* HyperReducedRestShapeSpringsForceField<DataTypes>::getExtPosition() const`
`226`	`226`	`{`
`227`		`- return (useRestMState ? l_restMState->read(VecCoordId::position()) : this->mstate->read(VecCoordId::restPosition()));`
	`227`	`+ return (useRestMState ? l_restMState->read(sofa::core::vec_id::read_access::position) : this->mstate->read(sofa::core::vec_id::read_access::restPosition));`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`template<class DataTypes>`
`@@ -409,7 +409,7 @@ void HyperReducedRestShapeSpringsForceField<DataTypes>::draw(const VisualParams`
`409`	`409`	`vparams->drawTool()->setLightingEnabled(false);`
`410`	`410`
`411`	`411`	`ReadAccessor< DataVecCoord > p0 = *this->getExtPosition();`
`412`		`- ReadAccessor< DataVecCoord > p = this->mstate->read(VecCoordId::position());`
	`412`	`+ ReadAccessor< DataVecCoord > p = this->mstate->read(sofa::core::vec_id::read_access::position);`
`413`	`413`
`414`	`414`	`const VecIndex& indices = m_indices;`
`415`	`415`	`const VecIndex& ext_indices = (useRestMState ? m_ext_indices : m_indices);`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ void HyperReducedTetrahedronFEMForceField<DataTypes>::draw(const core::visual::V`
`467`	`467`
`468`	`468`	`vparams->drawTool()->disableLighting();`
`469`	`469`
`470`		`- const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();`
	`470`	`+ const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();`
`471`	`471`	`const VecReal& youngModulus = this->d_youngModulus.getValue();`
`472`	`472`
`473`	`473`	`bool heterogeneous = false;`
`@@ -605,7 +605,7 @@ void HyperReducedTetrahedronFEMForceField<DataTypes>::draw(const core::visual::V`
`605`	`605`	`////////////// DRAW ROTATIONS //////////////`
`606`	`606`	`if (vparams->displayFlags().getShowNormals())`
`607`	`607`	`{`
`608`		`- const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue();`
	`608`	`+ const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue();`
`609`	`609`	`std::vector< type::Vec3 > points[3];`
`610`	`610`	`for(unsigned ii = 0; ii< x.size() ; ii++)`
`611`	`611`	`{`