diff options
Diffstat (limited to 'Source/Particles/Collision/ElasticCollisionPerez.H')
| -rw-r--r-- | Source/Particles/Collision/ElasticCollisionPerez.H | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Particles/Collision/ElasticCollisionPerez.H b/Source/Particles/Collision/ElasticCollisionPerez.H index e98a76a92..8262a19ce 100644 --- a/Source/Particles/Collision/ElasticCollisionPerez.H +++ b/Source/Particles/Collision/ElasticCollisionPerez.H @@ -69,16 +69,16 @@ void ElasticCollisionPerez ( T_R n1 = T_R(0.0); T_R n2 = T_R(0.0); T_R n12 = T_R(0.0); - for (int i1=I1s; i1<I1e; ++i1) { n1 += w1[ I1[i1] ]; } - for (int i2=I2s; i2<I2e; ++i2) { n2 += w2[ I2[i2] ]; } + for (int i1=I1s; i1<static_cast<int>(I1e); ++i1) { n1 += w1[ I1[i1] ]; } + for (int i2=I2s; i2<static_cast<int>(I2e); ++i2) { n2 += w2[ I2[i2] ]; } n1 = n1 / dV; n2 = n2 / dV; { int i1 = I1s; int i2 = I2s; for (int k = 0; k < amrex::max(NI1,NI2); ++k) { n12 += amrex::min( w1[ I1[i1] ], w2[ I2[i2] ] ); - ++i1; if ( i1 == I1e ) { i1 = I1s; } - ++i2; if ( i2 == I2e ) { i2 = I2s; } + ++i1; if ( i1 == static_cast<int>(I1e) ) { i1 = I1s; } + ++i2; if ( i2 == static_cast<int>(I2e) ) { i2 = I2s; } } n12 = n12 / dV; } @@ -102,8 +102,8 @@ void ElasticCollisionPerez ( n1, n2, n12, q1, m1, w1[ I1[i1] ], q2, m2, w2[ I2[i2] ], dt, L, lmdD); - ++i1; if ( i1 == I1e ) { i1 = I1s; } - ++i2; if ( i2 == I2e ) { i2 = I2s; } + ++i1; if ( i1 == static_cast<int>(I1e) ) { i1 = I1s; } + ++i2; if ( i2 == static_cast<int>(I2e) ) { i2 = I2s; } } } |