diff options
Diffstat (limited to 'Source/Particles/Collision')
| -rw-r--r-- | Source/Particles/Collision/CollisionType.cpp | 6 | ||||
| -rw-r--r-- | Source/Particles/Collision/ComputeTemperature.H | 2 | ||||
| -rw-r--r-- | Source/Particles/Collision/ElasticCollisionPerez.H | 12 | ||||
| -rw-r--r-- | Source/Particles/Collision/ShuffleFisherYates.H | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/Source/Particles/Collision/CollisionType.cpp b/Source/Particles/Collision/CollisionType.cpp index d9de0ec1d..8c5fac875 100644 --- a/Source/Particles/Collision/CollisionType.cpp +++ b/Source/Particles/Collision/CollisionType.cpp @@ -25,7 +25,7 @@ CollisionType::CollisionType( m_CoulombLog = -1.0; pp.query("CoulombLog", m_CoulombLog); - for (int i=0; i<species_names.size(); i++) + for (int i=0; i<static_cast<int>(species_names.size()); i++) { if (species_names[i] == collision_species[0]) { m_species1_index = i; } @@ -162,6 +162,8 @@ void CollisionType::doCoulombCollisionsWithinTile #if defined WARPX_DIM_RZ int ri = (i_cell - i_cell%nz) / nz; auto dV = MathConst::pi*(2.0*ri+1.0)*dr*dr*dz; +#else + amrex::ignore_unused(nz); #endif // Call the function in order to perform collisions @@ -257,6 +259,8 @@ void CollisionType::doCoulombCollisionsWithinTile #if defined WARPX_DIM_RZ int ri = (i_cell - i_cell%nz) / nz; auto dV = MathConst::pi*(2.0*ri+1.0)*dr*dr*dz; +#else + amrex::ignore_unused(nz); #endif // Call the function in order to perform collisions diff --git a/Source/Particles/Collision/ComputeTemperature.H b/Source/Particles/Collision/ComputeTemperature.H index 8128e40ec..50e1f4a4b 100644 --- a/Source/Particles/Collision/ComputeTemperature.H +++ b/Source/Particles/Collision/ComputeTemperature.H @@ -26,7 +26,7 @@ T_R ComputeTemperature ( T_R vz = T_R(0.0); T_R vs = T_R(0.0); T_R gm = T_R(0.0); T_R us = T_R(0.0); - for (int i = Is; i < Ie; ++i) + for (int i = Is; i < static_cast<int>(Ie); ++i) { us = ( ux[ I[i] ] * ux[ I[i] ] + uy[ I[i] ] * uy[ I[i] ] + 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; } } } diff --git a/Source/Particles/Collision/ShuffleFisherYates.H b/Source/Particles/Collision/ShuffleFisherYates.H index 614b44d37..a2a7879b9 100644 --- a/Source/Particles/Collision/ShuffleFisherYates.H +++ b/Source/Particles/Collision/ShuffleFisherYates.H @@ -21,7 +21,7 @@ void ShuffleFisherYates (T_index *array, T_index const is, T_index const ie) { int j; T_index buf; - for (int i = ie-1; i >= is+1; --i) + for (int i = ie-1; i >= static_cast<int>(is+1); --i) { // get random number j: is <= j <= i j = amrex::Random_int(i-is+1) + is; |