diff options
| -rw-r--r-- | Source/Diagnostics/SliceDiagnostic.cpp | 34 | ||||
| -rw-r--r-- | Source/Evolve/WarpXEvolveEM.cpp | 5 | ||||
| -rw-r--r-- | Source/Filter/NCIGodfreyFilter.cpp | 2 | ||||
| -rw-r--r-- | Source/Laser/LaserParticleContainer.cpp | 4 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 6 |
5 files changed, 30 insertions, 21 deletions
diff --git a/Source/Diagnostics/SliceDiagnostic.cpp b/Source/Diagnostics/SliceDiagnostic.cpp index 79f03985b..99eec4468 100644 --- a/Source/Diagnostics/SliceDiagnostic.cpp +++ b/Source/Diagnostics/SliceDiagnostic.cpp @@ -236,8 +236,10 @@ CheckSliceInput( const RealBox real_box, RealBox &slice_cc_nd_box, { // Modify coarsening ratio if the input value is not an exponent of 2 for AMR // if ( slice_cr_ratio[idim] > 0 ) { - int log_cr_ratio = floor ( log2( double(slice_cr_ratio[idim]))); - slice_cr_ratio[idim] = exp2( double(log_cr_ratio) ); + int log_cr_ratio = + static_cast<int>(floor ( log2( double(slice_cr_ratio[idim])))); + slice_cr_ratio[idim] = + static_cast<int> (exp2( double(log_cr_ratio) )); } //// Default coarsening ratio is 1 // @@ -269,20 +271,24 @@ CheckSliceInput( const RealBox real_box, RealBox &slice_cc_nd_box, // check for interpolation -- compute index lo with floor and ceil if ( slice_cc_nd_box.lo(idim) - real_box.lo(idim) >= fac ) { - slice_lo[idim] = floor( ( (slice_cc_nd_box.lo(idim) + slice_lo[idim] = static_cast<int>( + floor( ( (slice_cc_nd_box.lo(idim) - (real_box.lo(idim) + fac ) ) - / dom_geom[0].CellSize(idim)) + fac * 1E-10); - slice_lo2[idim] = ceil( ( (slice_cc_nd_box.lo(idim) + / dom_geom[0].CellSize(idim)) + fac * 1E-10) ); + slice_lo2[idim] = static_cast<int>( + ceil( ( (slice_cc_nd_box.lo(idim) - (real_box.lo(idim) + fac) ) - / dom_geom[0].CellSize(idim)) - fac * 1E-10 ); + / dom_geom[0].CellSize(idim)) - fac * 1E-10 ) ); } else { - slice_lo[idim] = round( (slice_cc_nd_box.lo(idim) + slice_lo[idim] = static_cast<int>( + round( (slice_cc_nd_box.lo(idim) - (real_box.lo(idim) ) ) - / dom_geom[0].CellSize(idim)); - slice_lo2[idim] = ceil((slice_cc_nd_box.lo(idim) + / dom_geom[0].CellSize(idim)) ); + slice_lo2[idim] = static_cast<int>( + ceil((slice_cc_nd_box.lo(idim) - (real_box.lo(idim) ) ) - / dom_geom[0].CellSize(idim) ); + / dom_geom[0].CellSize(idim) ) ); } // flag for interpolation -- if reduced dimension location // @@ -302,10 +308,10 @@ CheckSliceInput( const RealBox real_box, RealBox &slice_cc_nd_box, else { // moving realbox.lo and reabox.hi to nearest coarsenable grid point // - int index_lo = floor(((slice_realbox.lo(idim) + 1E-10 - - (real_box.lo(idim))) / dom_geom[0].CellSize(idim))); - int index_hi = ceil(((slice_realbox.hi(idim) - 1E-10 - - (real_box.lo(idim))) / dom_geom[0].CellSize(idim))); + auto index_lo = static_cast<int>(floor(((slice_realbox.lo(idim) + 1E-10 + - (real_box.lo(idim))) / dom_geom[0].CellSize(idim))) ); + auto index_hi = static_cast<int>(ceil(((slice_realbox.hi(idim) - 1E-10 + - (real_box.lo(idim))) / dom_geom[0].CellSize(idim))) ); bool modify_cr = true; diff --git a/Source/Evolve/WarpXEvolveEM.cpp b/Source/Evolve/WarpXEvolveEM.cpp index f5491ffe3..b35b3a6ed 100644 --- a/Source/Evolve/WarpXEvolveEM.cpp +++ b/Source/Evolve/WarpXEvolveEM.cpp @@ -615,9 +615,10 @@ WarpX::computeMaxStepBoostAccelerator(const amrex::Geometry& a_geom){ // Divide by dt, and update value of max_step. int computed_max_step; if (do_subcycling){ - computed_max_step = interaction_time_boost/dt[0]; + computed_max_step = static_cast<int>(interaction_time_boost/dt[0]); } else { - computed_max_step = interaction_time_boost/dt[maxLevel()]; + computed_max_step = + static_cast<int>(interaction_time_boost/dt[maxLevel()]); } max_step = computed_max_step; Print()<<"max_step computed in computeMaxStepBoostAccelerator: " diff --git a/Source/Filter/NCIGodfreyFilter.cpp b/Source/Filter/NCIGodfreyFilter.cpp index 8723322f6..41ae67768 100644 --- a/Source/Filter/NCIGodfreyFilter.cpp +++ b/Source/Filter/NCIGodfreyFilter.cpp @@ -35,7 +35,7 @@ void NCIGodfreyFilter::ComputeStencils(){ "ERROR: NCI filter requires 5 points in z"); // Interpolate coefficients from the table, and store into prestencil. - int index = tab_length*m_cdtodz; + auto index = static_cast<int>(tab_length*m_cdtodz); index = min(index, tab_length-2); index = max(index, 0); Real weight_right = m_cdtodz - index/tab_length; diff --git a/Source/Laser/LaserParticleContainer.cpp b/Source/Laser/LaserParticleContainer.cpp index a330200cc..1d9689979 100644 --- a/Source/Laser/LaserParticleContainer.cpp +++ b/Source/Laser/LaserParticleContainer.cpp @@ -249,8 +249,8 @@ LaserParticleContainer::InitData (int lev) { auto compute_min_max = [&](Real x, Real y, Real z){ const Vector<Real>& pos_plane = InverseTransform({x, y, z}); - int i = pos_plane[0]/S_X; - int j = pos_plane[1]/S_Y; + auto i = static_cast<int>(pos_plane[0]/S_X); + auto j = static_cast<int>(pos_plane[1]/S_Y); plane_lo[0] = std::min(plane_lo[0], i); plane_lo[1] = std::min(plane_lo[1], j); plane_hi[0] = std::max(plane_hi[0], i); diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 94d9bc363..ffe0bb20f 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -450,7 +450,8 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) overlap_box.setBig( dir, int( std::round((overlap_realbox.hi(dir)-overlap_realbox.lo(dir)) /dx[dir] )) - 1); - shifted[dir] = std::round((overlap_realbox.lo(dir)-problo[dir])/dx[dir]); + shifted[dir] = + static_cast<int>(std::round((overlap_realbox.lo(dir)-problo[dir])/dx[dir])); // shifted is exact in non-moving-window direction. That's all we care. } if (no_overlap == 1) { @@ -580,7 +581,8 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) IntVect iv = overlap_box.atOffset(cellid); - const XDim3 r = inj_pos->getPositionUnitBox(i_part, fac); + const XDim3 r = + inj_pos->getPositionUnitBox(i_part, static_cast<int>(fac)); #if (AMREX_SPACEDIM == 3) Real x = overlap_corner[0] + (iv[0]+r.x)*dx[0]; Real y = overlap_corner[1] + (iv[1]+r.y)*dx[1]; |