diff options
Diffstat (limited to 'Source/FieldSolver/SpectralSolver')
10 files changed, 92 insertions, 92 deletions
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp index eb7e1578e..37bbc2ca3 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp @@ -75,15 +75,15 @@ PsatdAlgorithmComoving::pushSpectralFields (SpectralFieldData& f) const const amrex::Box& bx = f.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = f.fields[mfi].array(); + const amrex::Array4<Complex> fields = f.fields[mfi].array(); // Extract arrays for the coefficients - amrex::Array4<const amrex::Real> C_arr = C_coef [mfi].array(); - amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); - amrex::Array4<const Complex> X1_arr = X1_coef [mfi].array(); - amrex::Array4<const Complex> X2_arr = X2_coef [mfi].array(); - amrex::Array4<const Complex> X3_arr = X3_coef [mfi].array(); - amrex::Array4<const Complex> X4_arr = X4_coef [mfi].array(); + const amrex::Array4<const amrex::Real> C_arr = C_coef [mfi].array(); + const amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); + const amrex::Array4<const Complex> X1_arr = X1_coef [mfi].array(); + const amrex::Array4<const Complex> X2_arr = X2_coef [mfi].array(); + const amrex::Array4<const Complex> X3_arr = X3_coef [mfi].array(); + const amrex::Array4<const Complex> X4_arr = X4_coef [mfi].array(); // Extract pointers for the k vectors const amrex::Real* modified_kx_arr = modified_kx_vec[mfi].dataPtr(); @@ -178,13 +178,13 @@ void PsatdAlgorithmComoving::InitializeSpectralCoefficients (const SpectralKSpac const amrex::Real* kz = kz_vec[mfi].dataPtr(); // Extract arrays for the coefficients - amrex::Array4<amrex::Real> C = C_coef [mfi].array(); - amrex::Array4<amrex::Real> S_ck = S_ck_coef [mfi].array(); - amrex::Array4<Complex> X1 = X1_coef [mfi].array(); - amrex::Array4<Complex> X2 = X2_coef [mfi].array(); - amrex::Array4<Complex> X3 = X3_coef [mfi].array(); - amrex::Array4<Complex> X4 = X4_coef [mfi].array(); - amrex::Array4<Complex> T2 = Theta2_coef[mfi].array(); + const amrex::Array4<amrex::Real> C = C_coef [mfi].array(); + const amrex::Array4<amrex::Real> S_ck = S_ck_coef [mfi].array(); + const amrex::Array4<Complex> X1 = X1_coef [mfi].array(); + const amrex::Array4<Complex> X2 = X2_coef [mfi].array(); + const amrex::Array4<Complex> X3 = X3_coef [mfi].array(); + const amrex::Array4<Complex> X4 = X4_coef [mfi].array(); + const amrex::Array4<Complex> T2 = Theta2_coef[mfi].array(); // Store comoving velocity const amrex::Real vx = m_v_comoving[0]; @@ -254,7 +254,7 @@ void PsatdAlgorithmComoving::InitializeSpectralCoefficients (const SpectralKSpac if ( (nu != om_mod/om) && (nu != -om_mod/om) && (nu != 0.) ) { - Complex x1 = om2 / (om2_mod - nu * nu * om2) + const Complex x1 = om2 / (om2_mod - nu * nu * om2) * (theta_star - theta * C(i,j,k) + I * nu * om * theta * S_ck(i,j,k)); // X1 multiplies i*(k \times J) in the update equation for B @@ -424,7 +424,7 @@ void PsatdAlgorithmComoving::CurrentCorrection (SpectralFieldData& field_data) const amrex::Box& bx = field_data.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = field_data.fields[mfi].array(); + const amrex::Array4<Complex> fields = field_data.fields[mfi].array(); // Extract pointers for the k vectors const amrex::Real* const modified_kx_arr = modified_kx_vec[mfi].dataPtr(); diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp index 113f88fca..946d938c7 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp @@ -69,7 +69,7 @@ PsatdAlgorithmFirstOrder::pushSpectralFields (SpectralFieldData& f) const const amrex::Box& bx = f.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = f.fields[mfi].array(); + const amrex::Array4<Complex> fields = f.fields[mfi].array(); // Extract pointers for the k vectors const amrex::Real* modified_kx_arr = modified_kx_vec[mfi].dataPtr(); diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJConstantInTime.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJConstantInTime.cpp index 6aad1831e..72c2b7a28 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJConstantInTime.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJConstantInTime.cpp @@ -129,14 +129,14 @@ PsatdAlgorithmJConstantInTime::pushSpectralFields (SpectralFieldData& f) const const amrex::Box& bx = f.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = f.fields[mfi].array(); + const amrex::Array4<Complex> fields = f.fields[mfi].array(); // These coefficients are always allocated - amrex::Array4<const amrex::Real> C_arr = C_coef[mfi].array(); - amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); - amrex::Array4<const Complex> X1_arr = X1_coef[mfi].array(); - amrex::Array4<const Complex> X2_arr = X2_coef[mfi].array(); - amrex::Array4<const Complex> X3_arr = X3_coef[mfi].array(); + const amrex::Array4<const amrex::Real> C_arr = C_coef[mfi].array(); + const amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); + const amrex::Array4<const Complex> X1_arr = X1_coef[mfi].array(); + const amrex::Array4<const Complex> X2_arr = X2_coef[mfi].array(); + const amrex::Array4<const Complex> X3_arr = X3_coef[mfi].array(); amrex::Array4<const Complex> X4_arr; amrex::Array4<const Complex> T2_arr; @@ -379,11 +379,11 @@ void PsatdAlgorithmJConstantInTime::InitializeSpectralCoefficients ( const amrex::Real* kz_c = modified_kz_vec_centered[mfi].dataPtr(); // Coefficients always allocated - amrex::Array4<amrex::Real> C = C_coef[mfi].array(); - amrex::Array4<amrex::Real> S_ck = S_ck_coef[mfi].array(); - amrex::Array4<Complex> X1 = X1_coef[mfi].array(); - amrex::Array4<Complex> X2 = X2_coef[mfi].array(); - amrex::Array4<Complex> X3 = X3_coef[mfi].array(); + const amrex::Array4<amrex::Real> C = C_coef[mfi].array(); + const amrex::Array4<amrex::Real> S_ck = S_ck_coef[mfi].array(); + const amrex::Array4<Complex> X1 = X1_coef[mfi].array(); + const amrex::Array4<Complex> X2 = X2_coef[mfi].array(); + const amrex::Array4<Complex> X3 = X3_coef[mfi].array(); amrex::Array4<Complex> X4; amrex::Array4<Complex> T2; @@ -394,11 +394,11 @@ void PsatdAlgorithmJConstantInTime::InitializeSpectralCoefficients ( } // Extract Galilean velocity - amrex::Real vg_x = m_v_galilean[0]; + const amrex::Real vg_x = m_v_galilean[0]; #if defined(WARPX_DIM_3D) - amrex::Real vg_y = m_v_galilean[1]; + const amrex::Real vg_y = m_v_galilean[1]; #endif - amrex::Real vg_z = m_v_galilean[2]; + const amrex::Real vg_z = m_v_galilean[2]; // Loop over indices within one box ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept @@ -547,19 +547,19 @@ void PsatdAlgorithmJConstantInTime::InitializeSpectralCoefficientsAveraging ( const amrex::Real* kz_c = modified_kz_vec_centered[mfi].dataPtr(); // Coefficients allocated only with averaged Galilean PSATD - amrex::Array4<Complex> Psi1 = Psi1_coef[mfi].array(); - amrex::Array4<Complex> Psi2 = Psi2_coef[mfi].array(); - amrex::Array4<Complex> Y1 = Y1_coef[mfi].array(); - amrex::Array4<Complex> Y3 = Y3_coef[mfi].array(); - amrex::Array4<Complex> Y2 = Y2_coef[mfi].array(); - amrex::Array4<Complex> Y4 = Y4_coef[mfi].array(); + const amrex::Array4<Complex> Psi1 = Psi1_coef[mfi].array(); + const amrex::Array4<Complex> Psi2 = Psi2_coef[mfi].array(); + const amrex::Array4<Complex> Y1 = Y1_coef[mfi].array(); + const amrex::Array4<Complex> Y3 = Y3_coef[mfi].array(); + const amrex::Array4<Complex> Y2 = Y2_coef[mfi].array(); + const amrex::Array4<Complex> Y4 = Y4_coef[mfi].array(); // Extract Galilean velocity - amrex::Real vg_x = m_v_galilean[0]; + const amrex::Real vg_x = m_v_galilean[0]; #if defined(WARPX_DIM_3D) - amrex::Real vg_y = m_v_galilean[1]; + const amrex::Real vg_y = m_v_galilean[1]; #endif - amrex::Real vg_z = m_v_galilean[2]; + const amrex::Real vg_z = m_v_galilean[2]; // Loop over indices within one box ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept @@ -728,7 +728,7 @@ void PsatdAlgorithmJConstantInTime::CurrentCorrection (SpectralFieldData& field_ const amrex::Box& bx = field_data.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = field_data.fields[mfi].array(); + const amrex::Array4<Complex> fields = field_data.fields[mfi].array(); // Extract pointers for the k vectors const amrex::Real* const modified_kx_arr = modified_kx_vec[mfi].dataPtr(); @@ -828,7 +828,7 @@ PsatdAlgorithmJConstantInTime::VayDeposition (SpectralFieldData& field_data) const amrex::Box& bx = field_data.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = field_data.fields[mfi].array(); + const amrex::Array4<Complex> fields = field_data.fields[mfi].array(); // Extract pointers for the modified k vectors const amrex::Real* const modified_kx_arr = modified_kx_vec[mfi].dataPtr(); diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp index c03ebcf69..30243e630 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp @@ -84,14 +84,14 @@ PsatdAlgorithmJLinearInTime::pushSpectralFields (SpectralFieldData& f) const const amrex::Box& bx = f.fields[mfi].box(); // Extract arrays for the fields to be updated - amrex::Array4<Complex> fields = f.fields[mfi].array(); + const amrex::Array4<Complex> fields = f.fields[mfi].array(); // These coefficients are always allocated - amrex::Array4<const amrex::Real> C_arr = C_coef[mfi].array(); - amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); - amrex::Array4<const amrex::Real> X1_arr = X1_coef[mfi].array(); - amrex::Array4<const amrex::Real> X2_arr = X2_coef[mfi].array(); - amrex::Array4<const amrex::Real> X3_arr = X3_coef[mfi].array(); + const amrex::Array4<const amrex::Real> C_arr = C_coef[mfi].array(); + const amrex::Array4<const amrex::Real> S_ck_arr = S_ck_coef[mfi].array(); + const amrex::Array4<const amrex::Real> X1_arr = X1_coef[mfi].array(); + const amrex::Array4<const amrex::Real> X2_arr = X2_coef[mfi].array(); + const amrex::Array4<const amrex::Real> X3_arr = X3_coef[mfi].array(); amrex::Array4<const amrex::Real> X5_arr; amrex::Array4<const amrex::Real> X6_arr; @@ -280,11 +280,11 @@ void PsatdAlgorithmJLinearInTime::InitializeSpectralCoefficients ( const amrex::Real* kz_s = modified_kz_vec[mfi].dataPtr(); // Coefficients always allocated - amrex::Array4<amrex::Real> C = C_coef[mfi].array(); - amrex::Array4<amrex::Real> S_ck = S_ck_coef[mfi].array(); - amrex::Array4<amrex::Real> X1 = X1_coef[mfi].array(); - amrex::Array4<amrex::Real> X2 = X2_coef[mfi].array(); - amrex::Array4<amrex::Real> X3 = X3_coef[mfi].array(); + const amrex::Array4<amrex::Real> C = C_coef[mfi].array(); + const amrex::Array4<amrex::Real> S_ck = S_ck_coef[mfi].array(); + const amrex::Array4<amrex::Real> X1 = X1_coef[mfi].array(); + const amrex::Array4<amrex::Real> X2 = X2_coef[mfi].array(); + const amrex::Array4<amrex::Real> X3 = X3_coef[mfi].array(); // Loop over indices within one box amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept @@ -372,11 +372,11 @@ void PsatdAlgorithmJLinearInTime::InitializeSpectralCoefficientsAveraging ( #endif const amrex::Real* kz_s = modified_kz_vec[mfi].dataPtr(); - amrex::Array4<amrex::Real const> C = C_coef[mfi].array(); - amrex::Array4<amrex::Real const> S_ck = S_ck_coef[mfi].array(); + const amrex::Array4<amrex::Real const> C = C_coef[mfi].array(); + const amrex::Array4<amrex::Real const> S_ck = S_ck_coef[mfi].array(); - amrex::Array4<amrex::Real> X5 = X5_coef[mfi].array(); - amrex::Array4<amrex::Real> X6 = X6_coef[mfi].array(); + const amrex::Array4<amrex::Real> X5 = X5_coef[mfi].array(); + const amrex::Array4<amrex::Real> X6 = X6_coef[mfi].array(); // Loop over indices within one box amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp index 2b48bb99e..1a4039915 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp @@ -69,12 +69,12 @@ PsatdAlgorithmPml::pushSpectralFields(SpectralFieldData& f) const { const Box& bx = f.fields[mfi].box(); // Extract arrays for the fields to be updated - Array4<Complex> fields = f.fields[mfi].array(); + const Array4<Complex> fields = f.fields[mfi].array(); // Extract arrays for the coefficients - Array4<const Real> C_arr = C_coef[mfi].array(); - Array4<const Real> S_ck_arr = S_ck_coef[mfi].array(); - Array4<const Real> inv_k2_arr = inv_k2_coef[mfi].array(); + const Array4<const Real> C_arr = C_coef[mfi].array(); + const Array4<const Real> S_ck_arr = S_ck_coef[mfi].array(); + const Array4<const Real> inv_k2_arr = inv_k2_coef[mfi].array(); // Extract pointers for the k vectors const Real* modified_kx_arr = modified_kx_vec[mfi].dataPtr(); @@ -368,9 +368,9 @@ void PsatdAlgorithmPml::InitializeSpectralCoefficients ( const Real* modified_kz = modified_kz_vec[mfi].dataPtr(); // Extract arrays for the coefficients - Array4<Real> C = C_coef[mfi].array(); - Array4<Real> S_ck = S_ck_coef[mfi].array(); - Array4<Real> inv_k2 = inv_k2_coef[mfi].array(); + const Array4<Real> C = C_coef[mfi].array(); + const Array4<Real> S_ck = S_ck_coef[mfi].array(); + const Array4<Real> inv_k2 = inv_k2_coef[mfi].array(); // Loop over indices within one box ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp index 099f6edf3..172715b98 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp @@ -70,7 +70,7 @@ SpectralBaseAlgorithm::ComputeSpectralDivE ( const Box& bx = field_data.fields[mfi].box(); // Extract arrays for the fields to be updated - Array4<Complex> fields = field_data.fields[mfi].array(); + const Array4<Complex> fields = field_data.fields[mfi].array(); // Extract pointers for the k vectors const Real* modified_kx_arr = modified_kx_vec[mfi].dataPtr(); #if defined(WARPX_DIM_3D) diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp index e1db4e5ab..ab4e39710 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp @@ -125,7 +125,7 @@ SpectralFieldData::SpectralFieldData( const int lev, const bool periodic_single_box) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, realspace_ba, dm); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, realspace_ba, dm); m_periodic_single_box = periodic_single_box; @@ -178,7 +178,7 @@ SpectralFieldData::SpectralFieldData( const int lev, // Note: the size of the real-space box and spectral-space box // differ when using real-to-complex FFT. When initializing // the FFT plan, the valid dimensions are those of the real-space box. - IntVect fft_size = realspace_ba[mfi].length(); + const IntVect fft_size = realspace_ba[mfi].length(); forward_plan[mfi] = AnyFFT::CreatePlan( fft_size, tmpRealField[mfi].dataPtr(), @@ -219,7 +219,7 @@ SpectralFieldData::ForwardTransform (const int lev, const int i_comp) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, mf.boxArray(), mf.DistributionMap()); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, mf.boxArray(), mf.DistributionMap()); // Check field index type, in order to apply proper shift in spectral space #if (AMREX_SPACEDIM >= 2) @@ -258,8 +258,8 @@ SpectralFieldData::ForwardTransform (const int lev, } realspace_bx.enclosedCells(); // Discard last point in nodal direction AMREX_ALWAYS_ASSERT( realspace_bx.contains(tmpRealField[mfi].box()) ); - Array4<const Real> mf_arr = mf[mfi].array(); - Array4<Real> tmp_arr = tmpRealField[mfi].array(); + const Array4<const Real> mf_arr = mf[mfi].array(); + const Array4<Real> tmp_arr = tmpRealField[mfi].array(); ParallelFor( tmpRealField[mfi].box(), [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { tmp_arr(i,j,k) = mf_arr(i,j,k,i_comp); @@ -274,8 +274,8 @@ SpectralFieldData::ForwardTransform (const int lev, // and apply correcting shift factor if the real space data comes // from a cell-centered grid in real space instead of a nodal grid. { - Array4<Complex> fields_arr = SpectralFieldData::fields[mfi].array(); - Array4<const Complex> tmp_arr = tmpSpectralField[mfi].array(); + const Array4<Complex> fields_arr = SpectralFieldData::fields[mfi].array(); + const Array4<const Complex> tmp_arr = tmpSpectralField[mfi].array(); #if (AMREX_SPACEDIM >= 2) const Complex* xshift_arr = xshift_FFTfromCell[mfi].dataPtr(); #endif @@ -326,7 +326,7 @@ SpectralFieldData::BackwardTransform (const int lev, const int i_comp) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, mf.boxArray(), mf.DistributionMap()); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, mf.boxArray(), mf.DistributionMap()); // Check field index type, in order to apply proper shift in spectral space #if (AMREX_SPACEDIM >= 2) @@ -374,8 +374,8 @@ SpectralFieldData::BackwardTransform (const int lev, // and apply correcting shift factor if the field is to be transformed // to a cell-centered grid in real space instead of a nodal grid. { - Array4<const Complex> field_arr = SpectralFieldData::fields[mfi].array(); - Array4<Complex> tmp_arr = tmpSpectralField[mfi].array(); + const Array4<const Complex> field_arr = SpectralFieldData::fields[mfi].array(); + const Array4<Complex> tmp_arr = tmpSpectralField[mfi].array(); #if (AMREX_SPACEDIM >= 2) const Complex* xshift_arr = xshift_FFTtoCell[mfi].dataPtr(); #endif @@ -413,8 +413,8 @@ SpectralFieldData::BackwardTransform (const int lev, // normalize, dividing by N, since (FFT + inverse FFT) results in a factor N { amrex::Box mf_box = (m_periodic_single_box) ? mfi.validbox() : mfi.fabbox(); - amrex::Array4<amrex::Real> mf_arr = mf[mfi].array(); - amrex::Array4<const amrex::Real> tmp_arr = tmpRealField[mfi].array(); + const amrex::Array4<amrex::Real> mf_arr = mf[mfi].array(); + const amrex::Array4<const amrex::Real> tmp_arr = tmpRealField[mfi].array(); const amrex::Real inv_N = 1._rt / tmpRealField[mfi].box().numPts(); diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp index eecae3037..10575b189 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp @@ -319,7 +319,7 @@ SpectralFieldDataRZ::FABZForwardTransform (amrex::MFIter const & mfi, amrex::Box // are grouped together in memory. amrex::Box const& spectralspace_bx = tmpSpectralField[mfi].box(); int const nz = spectralspace_bx.length(1); - amrex::Real inv_nz = 1._rt/nz; + const amrex::Real inv_nz = 1._rt/nz; const int n_fields = m_n_fields; ParallelFor(spectralspace_bx, modes, @@ -446,7 +446,7 @@ SpectralFieldDataRZ::ForwardTransform (const int lev, int const i_comp) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf.boxArray(), field_mf.DistributionMap()); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf.boxArray(), field_mf.DistributionMap()); // Check field index type, in order to apply proper shift in spectral space. // Only cell centered in r is supported. @@ -506,11 +506,11 @@ SpectralFieldDataRZ::ForwardTransform (const int lev, amrex::MultiFab const & field_mf_t, int const field_index_t) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf_r.boxArray(), field_mf_r.DistributionMap()); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf_r.boxArray(), field_mf_r.DistributionMap()); // Check field index type, in order to apply proper shift in spectral space. // Only cell centered in r is supported. - bool const is_nodal_z = field_mf_r.is_nodal(1); + const bool is_nodal_z = field_mf_r.is_nodal(1); // Create copies of the input multifabs. The copies will include the imaginary part of mode 0. // Also note that the Hankel transform will overwrite the copies. @@ -571,10 +571,10 @@ SpectralFieldDataRZ::BackwardTransform (const int lev, int const i_comp) { amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev); - bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf.boxArray(), field_mf.DistributionMap()); + const bool do_costs = WarpXUtilLoadBalance::doCosts(cost, field_mf.boxArray(), field_mf.DistributionMap()); // Check field index type, in order to apply proper shift in spectral space. - bool const is_nodal_z = field_mf.is_nodal(1); + const bool is_nodal_z = field_mf.is_nodal(1); // A full multifab is created so that each GPU stream has its own temp space. amrex::MultiFab tempHTransformedSplit(tempHTransformed.boxArray(), tempHTransformed.DistributionMap(), 2*n_rz_azimuthal_modes, 0); diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp index 8330b645e..7320b7cf1 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp @@ -51,7 +51,7 @@ SpectralKSpace::SpectralKSpace( const BoxArray& realspace_ba, // For local FFTs, boxes in spectral space start at 0 in // each direction and have the same number of points as the // (cell-centered) real space box - Box realspace_bx = realspace_ba[i]; + const Box realspace_bx = realspace_ba[i]; IntVect fft_size = realspace_bx.length(); // Because the spectral solver uses real-to-complex FFTs, we only // need the positive k values along the fastest axis @@ -61,7 +61,7 @@ SpectralKSpace::SpectralKSpace( const BoxArray& realspace_ba, IntVect spectral_bx_size = fft_size; spectral_bx_size[0] = fft_size[0]/2 + 1; // Define the corresponding box - Box spectral_bx = Box( IntVect::TheZeroVector(), + const Box spectral_bx = Box( IntVect::TheZeroVector(), spectral_bx_size - IntVect::TheUnitVector() ); spectral_bl.push_back( spectral_bx ); } @@ -95,11 +95,11 @@ SpectralKSpace::getKComponent( const DistributionMapping& dm, // Loop over boxes and allocate the corresponding DeviceVector // for each box owned by the local MPI proc for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ - Box bx = spectralspace_ba[mfi]; + const Box bx = spectralspace_ba[mfi]; Gpu::DeviceVector<Real>& k = k_comp[mfi]; // Allocate k to the right size - int N = bx.length( i_dim ); + const int N = bx.length( i_dim ); k.resize( N ); Real* pk = k.data(); @@ -227,7 +227,7 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, // Loop over boxes and allocate the corresponding DeviceVector // for each box owned by the local MPI proc for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ - Real delta_x = dx[i_dim]; + const Real delta_x = dx[i_dim]; const Gpu::DeviceVector<Real>& k = k_vec[i_dim][mfi]; Gpu::DeviceVector<Real>& modified_k = modified_k_comp[mfi]; diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpaceRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpaceRZ.cpp index 4b02d1b7e..18e46d676 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpaceRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpaceRZ.cpp @@ -35,11 +35,11 @@ SpectralKSpaceRZ::SpectralKSpaceRZ (const amrex::BoxArray& realspace_ba, // For local FFTs, boxes in spectral space start at 0 in // each direction and have the same number of points as the // (cell-centered) real space box - amrex::Box realspace_bx = realspace_ba[i]; - amrex::IntVect fft_size = realspace_bx.length(); - amrex::IntVect spectral_bx_size = fft_size; + const amrex::Box realspace_bx = realspace_ba[i]; + const amrex::IntVect fft_size = realspace_bx.length(); + const amrex::IntVect spectral_bx_size = fft_size; // Define the corresponding box - amrex::Box spectral_bx = amrex::Box(amrex::IntVect::TheZeroVector(), + const amrex::Box spectral_bx = amrex::Box(amrex::IntVect::TheZeroVector(), spectral_bx_size - amrex::IntVect::TheUnitVector() ); spectral_bl.push_back(spectral_bx); } |