Skip to content

Commit 7084fb9

Browse files
committed
Fix warnings
1 parent 00410fe commit 7084fb9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/ModelOrderReduction/component/contact/MORUnilateralInteractionConstraint.inl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ void MORUnilateralInteractionConstraint<DataTypes>::getPositionViolation(lineara
246246
// Sets dfree in global violation vector
247247
if (!c.parameters.hasTangentialComponent()){
248248

249-
for (int k=0;k<reducedContacts.size();k++){
249+
for (size_t k=0;k<reducedContacts.size();k++){
250250
if (contactIndices(c.m2) != -1)
251251
dfreeRed(k) += dfree*lambdaModes(contactIndices(c.m2),reducedContacts[k]);
252252
}
253253
}
254254
else
255255
{
256-
for (int k=0;k<reducedContacts.size()/3;k++){
256+
for (size_t k=0;k<reducedContacts.size()/3;k++){
257257
if (contactIndices(3*c.m2) != -1){
258258
dfreeRed(3*k) += dfree*lambdaModes(contactIndices(3*c.m2),reducedContacts[3*k]);
259259
dfreeRed(3*k+1) += dfree_t*lambdaModes(contactIndices(3*c.m2+1),reducedContacts[3*k]);
@@ -267,7 +267,7 @@ void MORUnilateralInteractionConstraint<DataTypes>::getPositionViolation(lineara
267267

268268
c.dfree = dfree; // PJ : For isActive() method. Don't know if it's still usefull.
269269
}
270-
for (int k=0;k<reducedContacts.size();k++){
270+
for (size_t k=0;k<reducedContacts.size();k++){
271271
v->set(k, dfreeRed(k));
272272
}
273273

src/ModelOrderReduction/component/contact/MORpointModel.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void MORPointCollisionModel<DataTypes>::drawCollisionModel(const core::visual::V
8989
double val;
9090
double step = this->getContext()->getTime()/this->getContext()->getDt();
9191
numMode = (int) step - 1;
92-
for (int i = 0; i < size; i++)
92+
for (size_t i = 0; i < size; i++)
9393
{
9494
TPoint<DataTypes> p(this, i);
9595
if (p.isActive())
@@ -123,7 +123,7 @@ void MORPointCollisionModel<DataTypes>::drawCollisionModel(const core::visual::V
123123
{
124124
std::vector< type::Vec3 > pointsPFree;
125125

126-
for (int i = 0; i < size; i++)
126+
for (size_t i = 0; i < size; i++)
127127
{
128128
TPoint<DataTypes> p(this, i);
129129
if (p.isActive())

src/ModelOrderReduction/component/mapping/MORContactMapping.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void MORContactMapping<TIn, TOut>::applyJT(const core::ConstraintParams * /*cpar
133133
while (colIt != colItEnd)
134134
{
135135
InDeriv data;
136-
for(unsigned int j=0 ; j<m_nbCols ; j++)
136+
for(unsigned int j=0 ; j<(unsigned int)m_nbCols ; j++)
137137
{
138138
typename In::MatrixDeriv::RowIterator o = out.writeLine(j);
139139
data = colIt.val()*m_matrix(contactIndices(rowIt.index()),j);

0 commit comments

Comments
 (0)