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.

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

[all] Fix order warnings #1239

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion SofaKernel/modules/SofaBaseMechanics/SubsetMapping.inl
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ SubsetMapping<TIn, TOut>::SubsetMapping()
, f_handleTopologyChange( initData(&f_handleTopologyChange, true, "handleTopologyChange", "Enable support of topological changes for indices (disable if it is linked from SubsetTopologicalMapping::pointD2S)"))
, f_ignoreNotFound( initData(&f_ignoreNotFound, false, "ignoreNotFound", "True to ignore points that are not found in the input model, they will be treated as fixed points"))
, f_resizeToModel( initData(&f_resizeToModel, false, "resizeToModel", "True to resize the output MechanicalState to match the size of indices"))
, l_topology(initLink("topology", "link to the topology container"))
, matrixJ()
, updateJ(false)
, l_topology(initLink("topology", "link to the topology container"))
{
}

Expand Down
2 changes: 1 addition & 1 deletion SofaKernel/modules/SofaMeshCollision/LineModel.inl
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ using core::topology::BaseMeshTopology;
template<class DataTypes>
LineCollisionModel<DataTypes>::LineCollisionModel()
: bothSide(initData(&bothSide, false, "bothSide", "activate collision on both side of the line model (when surface normals are defined on these lines)") )
, mstate(nullptr), topology(nullptr), meshRevision(-1), m_lmdFilter(nullptr)
, LineActiverPath(initData(&LineActiverPath,"LineActiverPath", "path of a component LineActiver that activates or deactivates collision line during execution") )
, m_displayFreePosition(initData(&m_displayFreePosition, false, "displayFreePosition", "Display Collision Model Points free position(in green)") )
, l_topology(initLink("topology", "link to the topology container"))
, mstate(nullptr), topology(nullptr), meshRevision(-1), m_lmdFilter(nullptr)
{
enum_type = LINE_TYPE;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ bool TriangleInfo::validate(const unsigned int tri_index, const defaulttype::Vec


TriangleLocalMinDistanceFilter::TriangleLocalMinDistanceFilter()
: m_pointInfo(initData(&m_pointInfo, "pointInfo", "point filter data"))
: l_topology(initLink("topology", "link to the topology container"))
, m_pointInfo(initData(&m_pointInfo, "pointInfo", "point filter data"))
, m_lineInfo(initData(&m_lineInfo, "lineInfo", "line filter data"))
, m_triangleInfo(initData(&m_triangleInfo, "triangleInfo", "triangle filter data"))
, pointInfoHandler(nullptr)
, lineInfoHandler(nullptr)
, triangleInfoHandler(nullptr)
, l_topology(initLink("topology", "link to the topology container"))
, bmt(nullptr)
{
}
Expand Down
2 changes: 1 addition & 1 deletion modules/SofaBoundaryCondition/FixedConstraint.inl
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ FixedConstraint<DataTypes>::FixedConstraint()
, d_showObject(initData(&d_showObject,true,"showObject","draw or not the fixed constraints"))
, d_drawSize( initData(&d_drawSize,(SReal)0.0,"drawSize","0 -> point based rendering, >0 -> radius of spheres") )
, d_projectVelocity( initData(&d_projectVelocity,false,"activate_projectVelocity","activate project velocity to set velocity") )
, data(new FixedConstraintInternalData<DataTypes>())
, l_topology(initLink("topology", "link to the topology container"))
, data(new FixedConstraintInternalData<DataTypes>())
, m_pointHandler(nullptr)
{
// default to indice 0
Expand Down
2 changes: 1 addition & 1 deletion modules/SofaBoundaryCondition/QuadPressureForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ QuadPressureForceField<DataTypes>::QuadPressureForceField()
, dmin(initData(&dmin,(Real)0.0, "dmin", "Minimum distance from the origin along the normal direction"))
, dmax(initData(&dmax,(Real)0.0, "dmax", "Maximum distance from the origin along the normal direction"))
, p_showForces(initData(&p_showForces, (bool)false, "showForces", "draw quads which have a given pressure"))
, quadPressureMap(initData(&quadPressureMap, "quadPressureMap", "map between edge indices and their pressure"))
, l_topology(initLink("topology", "link to the topology container"))
, quadPressureMap(initData(&quadPressureMap, "quadPressureMap", "map between edge indices and their pressure"))
, m_topology(nullptr)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ template <class DataTypes> TrianglePressureForceField<DataTypes>::TrianglePress
, dmax(initData(&dmax,(Real)0.0, "dmax", "Maximum distance from the origin along the normal direction"))
, p_showForces(initData(&p_showForces, (bool)false, "showForces", "draw triangles which have a given pressure"))
, p_useConstantForce(initData(&p_useConstantForce, (bool)true, "useConstantForce", "applied force is computed as the the pressure vector times the area at rest"))
, trianglePressureMap(initData(&trianglePressureMap, "trianglePressureMap", "map between edge indices and their pressure"))
, l_topology(initLink("topology", "link to the topology container"))
, trianglePressureMap(initData(&trianglePressureMap, "trianglePressureMap", "map between edge indices and their pressure"))
, m_topology(nullptr)
{
}
Expand Down
10 changes: 5 additions & 5 deletions modules/SofaMiscFem/FastTetrahedralCorotationalForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void FastTetrahedralCorotationalForceField<DataTypes>::FTCFTetrahedronHandler::a

if (m==n)
{
my_tinfo.linearDfDxDiag[j][m][m]+=(Real)val;
my_tinfo.linearDfDxDiag[j][m][m]+=Real(val);
} else
my_tinfo.linearDfDxDiag[j][n][m]=my_tinfo.linearDfDxDiag[j][m][n];
}
Expand Down Expand Up @@ -125,7 +125,7 @@ void FastTetrahedralCorotationalForceField<DataTypes>::FTCFTetrahedronHandler::a

if (m==n)
{
my_tinfo.linearDfDx[j][m][m]+=(Real)val;
my_tinfo.linearDfDx[j][m][m]+=Real(val);
}
}
}
Expand All @@ -147,12 +147,12 @@ template <class DataTypes> FastTetrahedralCorotationalForceField<DataTypes>::Fas
: pointInfo(initData(&pointInfo, "pointInfo", "Internal point data"))
, edgeInfo(initData(&edgeInfo, "edgeInfo", "Internal edge data"))
, tetrahedronInfo(initData(&tetrahedronInfo, "tetrahedronInfo", "Internal tetrahedron data"))
, _initialPoints(0)
, m_topology(nullptr)
, _initialPoints(0)
, updateMatrix(true)
, f_method(initData(&f_method,std::string("qr"),"method"," method for rotation computation :\"qr\" (by QR) or \"polar\" or \"polar2\" or \"none\" (Linear elastic) "))
, f_poissonRatio(initData(&f_poissonRatio,(Real)0.3,"poissonRatio","Poisson ratio in Hooke's law"))
, f_youngModulus(initData(&f_youngModulus,(Real)1000.,"youngModulus","Young modulus in Hooke's law"))
, f_poissonRatio(initData(&f_poissonRatio,Real(0.3),"poissonRatio","Poisson ratio in Hooke's law"))
, f_youngModulus(initData(&f_youngModulus,Real(1000.),"youngModulus","Young modulus in Hooke's law"))
, lambda(0)
, mu(0)
, f_drawing(initData(&f_drawing, true, "drawing", " draw the forcefield if true"))
Expand Down
3 changes: 1 addition & 2 deletions modules/SofaMiscFem/StandardTetrahedralFEMForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,9 @@ template <class DataTypes> StandardTetrahedralFEMForceField<DataTypes>::Standard
, f_parameterSet(initData(&f_parameterSet,"ParameterSet","The global parameters specifying the material"))
, f_anisotropySet(initData(&f_anisotropySet,"AnisotropyDirections","The global directions of anisotropy of the material"))
, f_parameterFileName(initData(&f_parameterFileName,std::string("myFile.param"),"ParameterFile","the name of the file describing the material parameters for all tetrahedra"))
, l_topology(initLink("topology", "link to the topology container"))
, tetrahedronInfo(initData(&tetrahedronInfo, "tetrahedronInfo", "Internal tetrahedron data"))
, edgeInfo(initData(&edgeInfo, "edgeInfo", "Internal edge data"))
, l_topology(initLink("topology", "link to the topology container"))

{
tetrahedronHandler = new GHTetrahedronHandler(this,&tetrahedronInfo);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ template <class DataTypes> TetrahedronHyperelasticityFEMForceField<DataTypes>::T
, d_anisotropySet(initData(&d_anisotropySet,"AnisotropyDirections","The global directions of anisotropy of the material"))
, m_tetrahedronInfo(initData(&m_tetrahedronInfo, "tetrahedronInfo", "Internal tetrahedron data"))
, m_edgeInfo(initData(&m_edgeInfo, "edgeInfo", "Internal edge data"))
, m_tetrahedronHandler(nullptr)
, l_topology(initLink("topology", "link to the topology container"))
, m_tetrahedronHandler(nullptr)
{
m_tetrahedronHandler = new TetrahedronHandler(this,&m_tetrahedronInfo);
}
Expand Down
10 changes: 5 additions & 5 deletions modules/SofaMiscFem/TriangleFEMForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ namespace forcefield
template <class DataTypes>
TriangleFEMForceField<DataTypes>::
TriangleFEMForceField()
: m_topology(nullptr)
, _indexedElements(nullptr)
: _indexedElements(nullptr)
, _initialPoints(initData(&_initialPoints, "initialPoints", "Initial Position"))
, m_topology(nullptr)
, method(LARGE)
, f_method(initData(&f_method,std::string("large"),"method","large: large displacements, small: small displacements"))
, f_poisson(initData(&f_poisson,(Real)0.3,"poissonRatio","Poisson ratio in Hooke's law"))
, f_young(initData(&f_young,(Real)1000.,"youngModulus","Young modulus in Hooke's law"))
, f_thickness(initData(&f_thickness,(Real)1.,"thickness","Thickness of the elements"))
, f_poisson(initData(&f_poisson,Real(0.3),"poissonRatio","Poisson ratio in Hooke's law"))
, f_young(initData(&f_young,Real(1000.),"youngModulus","Young modulus in Hooke's law"))
, f_thickness(initData(&f_thickness,Real(1.),"thickness","Thickness of the elements"))
// , f_damping(initData(&f_damping,(Real)0.,"damping","Ratio damping/stiffness"))
, f_planeStrain(initData(&f_planeStrain,false,"planeStrain","Plane strain or plane stress assumption"))
, l_topology(initLink("topology", "link to the topology container"))
Expand Down