Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation further to lifecycle v25.06 #167

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation further to lifecycle v25.06 #167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d30f64
Fix compilation further to lifecycle v25.06
hugtalbot Jan 29, 2025
ff81282
Update BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConst…
damienmarchal Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion BeamAdapter_test/BeamInterpolation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ using sofa::simulation::SceneLoaderXML;
using sofa::simulation::graph::DAGSimulation;
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::simulation::setSimulation ;
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::BaseData ;
using sofa::component::statecontainer::MechanicalObject ;
Expand Down
3 changes: 1 addition & 2 deletions BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ using sofa::simulation::SceneLoaderXML ;
using sofa::simulation::graph::DAGSimulation;
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::simulation::setSimulation ;
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::New ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::New ;

damienmarchal marked this conversation as resolved.
Show resolved Hide resolved
using sofa::core::objectmodel::BaseData ;
using sofa::component::statecontainer::MechanicalObject ;

Expand Down
8 changes: 4 additions & 4 deletions BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ struct BeamLengthMappingTest : public sofa::mapping_test::Mapping_test<_BeamLeng
this->root->getTreeObject(ToModel);
this->outDofs= ToModel;

const Data<InVecCoord>& dataInX = *FromModel->read(VecCoordId::position());
const Data<InVecCoord>& dataInX = *FromModel->read(core::vec_id::read_access::position);
const InVecCoord& xin = dataInX.getValue();

const Data<OutVecCoord>& dataOutX = *ToModel->read(VecCoordId::position());
const Data<OutVecCoord>& dataOutX = *ToModel->read(core::vec_id::read_access::position);
const OutVecCoord& xout = dataOutX.getValue();

std::cout<<" x in = "<<xin<<std::endl;
Expand Down Expand Up @@ -220,10 +220,10 @@ struct BeamLengthMappingTest : public sofa::mapping_test::Mapping_test<_BeamLeng
this->root->getTreeObject(ToModel);
this->outDofs= ToModel;

const Data<InVecCoord>& dataInX = *FromModel->read(VecCoordId::position());
const Data<InVecCoord>& dataInX = *FromModel->read(core::vec_id::read_access::position);
const InVecCoord& xin = dataInX.getValue();

const Data<OutVecCoord>& dataOutX = *ToModel->read(VecCoordId::position());
const Data<OutVecCoord>& dataOutX = *ToModel->read(core::vec_id::read_access::position);
const OutVecCoord& xout = dataOutX.getValue();

std::cout<<" x in = "<<xin<<std::endl;
Expand Down
Loading