diff options
Diffstat (limited to 'Source/FieldSolver/FiniteDifferenceSolver')
6 files changed, 22 insertions, 22 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp index 1a50dc236..257bca404 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp @@ -177,7 +177,7 @@ void FiniteDifferenceSolver::EvolveBCartesian ( if (Gfield) { // Extract field data for this grid/tile - Array4<Real> G = Gfield->array(mfi); + const Array4<Real> G = Gfield->array(mfi); // Loop over cells and update G amrex::ParallelFor(tbx, tby, tbz, diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp index 3ea6bc8db..b04498638 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp @@ -199,7 +199,7 @@ void FiniteDifferenceSolver::EvolveECartesian ( if (Ffield) { // Extract field data for this grid/tile - Array4<Real> F = Ffield->array(mfi); + const Array4<Real> F = Ffield->array(mfi); // Loop over the cells and update the fields amrex::ParallelFor(tex, tey, tez, diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H index e6e48af88..622f7fa82 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H @@ -58,7 +58,7 @@ struct CylindricalYeeAlgorithm { // Use a realistic extrapolation multimode_alpha = (n_rz_azimuthal_modes - 1._rt)*(n_rz_azimuthal_modes - 1._rt) - 0.4_rt; } - amrex::Real delta_t = 1._rt / ( std::sqrt( + const amrex::Real delta_t = 1._rt / ( std::sqrt( (1._rt + multimode_alpha) / (dx[0]*dx[0]) + 1._rt / (dx[1]*dx[1]) ) * PhysConst::c ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp index ffa9fbfc8..fe9aa979a 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp @@ -184,8 +184,8 @@ void FiniteDifferenceSolver::MacroscopicEvolveECartesian ( // Interpolated permittivity, epsilon, to Ex position on the grid amrex::Real const epsilon_interp = ablastr::coarsen::sample::Interp(eps_arr, epsilon_stag, Ex_stag, macro_cr, i, j, k, scomp); - amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); - amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); + const amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); + const amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); Ex(i, j, k) = alpha * Ex(i, j, k) + beta * ( - T_Algo::DownwardDz(Hy, coefs_z, n_coefs_z, i, j, k,0) + T_Algo::DownwardDy(Hz, coefs_y, n_coefs_y, i, j, k,0) @@ -208,8 +208,8 @@ void FiniteDifferenceSolver::MacroscopicEvolveECartesian ( // Interpolated permittivity, epsilon, to Ey position on the grid amrex::Real const epsilon_interp = ablastr::coarsen::sample::Interp(eps_arr, epsilon_stag, Ey_stag, macro_cr, i, j, k, scomp); - amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); - amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); + const amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); + const amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); Ey(i, j, k) = alpha * Ey(i, j, k) + beta * ( - T_Algo::DownwardDx(Hz, coefs_x, n_coefs_x, i, j, k,0) @@ -228,8 +228,8 @@ void FiniteDifferenceSolver::MacroscopicEvolveECartesian ( // Interpolated permittivity, epsilon, to Ez position on the grid amrex::Real const epsilon_interp = ablastr::coarsen::sample::Interp(eps_arr, epsilon_stag, Ez_stag, macro_cr, i, j, k, scomp); - amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); - amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); + const amrex::Real alpha = T_MacroAlgo::alpha( sigma_interp, epsilon_interp, dt); + const amrex::Real beta = T_MacroAlgo::beta( sigma_interp, epsilon_interp, dt); Ez(i, j, k) = alpha * Ez(i, j, k) + beta * ( - T_Algo::DownwardDy(Hx, coefs_y, n_coefs_y, i, j, k,0) diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H index b8e1db2a6..0c060102b 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H @@ -114,8 +114,8 @@ struct LaxWendroffAlgo { amrex::Real const epsilon, amrex::Real dt) { using namespace amrex; - amrex::Real fac1 = 0.5_rt * sigma * dt / epsilon; - amrex::Real alpha = (1._rt - fac1)/(1._rt + fac1); + const amrex::Real fac1 = 0.5_rt * sigma * dt / epsilon; + const amrex::Real alpha = (1._rt - fac1)/(1._rt + fac1); return alpha; } @@ -124,8 +124,8 @@ struct LaxWendroffAlgo { amrex::Real const epsilon, amrex::Real dt) { using namespace amrex; - amrex::Real fac1 = 0.5_rt * sigma * dt / epsilon; - amrex::Real beta = dt / ( epsilon * (1._rt + fac1) ); + const amrex::Real fac1 = 0.5_rt * sigma * dt / epsilon; + const amrex::Real beta = dt / ( epsilon * (1._rt + fac1) ); return beta; } @@ -146,8 +146,8 @@ struct BackwardEulerAlgo { amrex::Real const epsilon, amrex::Real dt) { using namespace amrex; - amrex::Real fac1 = sigma * dt / epsilon; - amrex::Real alpha = (1._rt)/(1._rt + fac1); + const amrex::Real fac1 = sigma * dt / epsilon; + const amrex::Real alpha = (1._rt)/(1._rt + fac1); return alpha; } @@ -156,8 +156,8 @@ struct BackwardEulerAlgo { amrex::Real const epsilon, amrex::Real dt) { using namespace amrex; - amrex::Real fac1 = sigma * dt / epsilon; - amrex::Real beta = dt / ( epsilon * (1._rt + fac1) ); + const amrex::Real fac1 = sigma * dt / epsilon; + const amrex::Real beta = dt / ( epsilon * (1._rt + fac1) ); return beta; } diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp index 01a89c0a2..858972f2e 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp @@ -35,7 +35,7 @@ MacroscopicProperties::MacroscopicProperties () void MacroscopicProperties::ReadParameters () { - ParmParse pp_macroscopic("macroscopic"); + const ParmParse pp_macroscopic("macroscopic"); // Since macroscopic maxwell solve is turned on, // user-defined sigma, mu, and epsilon are queried. // The vacuum values are used as default for the macroscopic parameters @@ -126,9 +126,9 @@ MacroscopicProperties::InitData () auto & warpx = WarpX::GetInstance(); // Get BoxArray and DistributionMap of warpx instance. - int lev = 0; - amrex::BoxArray ba = warpx.boxArray(lev); - amrex::DistributionMapping dmap = warpx.DistributionMap(lev); + const int lev = 0; + const amrex::BoxArray ba = warpx.boxArray(lev); + const amrex::DistributionMapping dmap = warpx.DistributionMap(lev); const amrex::IntVect ng_EB_alloc = warpx.getngEB(); // Define material property multifabs using ba and dmap from WarpX instance // sigma is cell-centered MultiFab @@ -209,7 +209,7 @@ MacroscopicProperties::InitializeMacroMultiFabUsingParser ( WarpX& warpx = WarpX::GetInstance(); const amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> dx_lev = warpx.Geom(lev).CellSizeArray(); const amrex::RealBox& real_box = warpx.Geom(lev).ProbDomain(); - amrex::IntVect iv = macro_mf->ixType().toIntVect(); + const amrex::IntVect iv = macro_mf->ixType().toIntVect(); for ( amrex::MFIter mfi(*macro_mf, TilingIfNotGPU()); mfi.isValid(); ++mfi ) { // Initialize ghost cells in addition to valid cells |