Skip to content

Commit

Permalink
[src] Fix compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
epernod committed May 10, 2024
1 parent 7cae40f commit b3c8703
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions src/BeamAdapter/component/BeamInterpolation.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class BeamInterpolation : public virtual BaseBeamInterpolation<DataTypes>
using VecElementID = type::vector<BaseMeshTopology::EdgeID>;
using VecEdges = type::vector<BaseMeshTopology::Edge>;

using BaseBeamInterpolation<DataTypes>::d_componentState;
public:
BeamInterpolation() ;
virtual ~BeamInterpolation() override = default;
Expand Down Expand Up @@ -183,12 +184,12 @@ class BeamInterpolation : public virtual BaseBeamInterpolation<DataTypes>
virtual void addBeam(const BaseMeshTopology::EdgeID &eID , const Real &length, const Real &x0, const Real &x1, const Real &angle);
virtual void getSamplingParameters(type::vector<Real>& xP_noticeable,
type::vector<int>& nbP_density) ;
virtual Real getRestTotalLength() ;
virtual void getCollisionSampling(Real &dx, const Real& x_localcurv_abs) ;
virtual void getNumberOfCollisionSegment(Real &dx, unsigned int &numLines) ;
virtual void getYoungModulusAtX(int beamId,Real& x_curv, Real& youngModulus, Real& cPoisson) ;
void setTransformBetweenDofAndNode(int beam, const Transform &DOF_H_Node, unsigned int zeroORone ) ;
virtual void getSplineRestTransform(unsigned int edgeInList, Transform &local_H_local0_rest, Transform &local_H_local1_rest);
Real getRestTotalLength() override;
void getCollisionSampling(Real &dx, const Real& x_localcurv_abs) override;
void getNumberOfCollisionSegment(Real &dx, unsigned int &numLines) override;
void getYoungModulusAtX(int beamId,Real& x_curv, Real& youngModulus, Real& cPoisson) override;
void setTransformBetweenDofAndNode(int beam, const Transform &DOF_H_Node, unsigned int zeroORone );
void getSplineRestTransform(unsigned int edgeInList, Transform &local_H_local0_rest, Transform &local_H_local1_rest) override;

/////////////////////////// Deprecated Methods //////////////////////////////////////////
[[deprecated("Releasing catheter or brokenIn2 mode is not anymore supported. Feature has been removed after release v23.06")]]
Expand Down
4 changes: 2 additions & 2 deletions src/BeamAdapter/component/BeamInterpolation.inl
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ void BeamInterpolation<DataTypes>::bwdInit()
DOF1TransformNode1.resize(edgeList.size());
}

ReadAccessor<Data<VecCoord> > statePos = m_mstate->read(ConstVecCoordId::position()) ;
ReadAccessor<Data<VecCoord> > statePos = this->m_mstate->read(ConstVecCoordId::position()) ;

auto lengthList = sofa::helper::getWriteOnlyAccessor(d_lengthList);
auto lengthList = sofa::helper::getWriteOnlyAccessor(this->d_lengthList);
lengthList.clear();

const unsigned int edgeListSize = d_edgeList.getValue().size();
Expand Down

0 comments on commit b3c8703

Please sign in to comment.