diff options
Diffstat (limited to 'Source/FieldSolver')
6 files changed, 30 insertions, 32 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp index 851ff1a1a..1bb557d00 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp @@ -43,7 +43,7 @@ FiniteDifferenceSolver::FiniteDifferenceSolver ( // Calculate coefficients of finite-difference stencil #ifdef WARPX_DIM_RZ m_dr = cell_size[0]; - m_nmodes = WarpX::GetInstance().n_rz_azimuthal_modes; + m_nmodes = WarpX::n_rz_azimuthal_modes; m_rmin = WarpX::GetInstance().Geom(0).ProbLo(0); if (fdtd_algo == ElectromagneticSolverAlgo::Yee || fdtd_algo == ElectromagneticSolverAlgo::HybridPIC ) { diff --git a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp index 347a0ad6c..7213e599b 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp @@ -59,8 +59,6 @@ void HybridPICModel::AllocateLevelMFs (int lev, const BoxArray& ba, const Distri const IntVect& jz_nodal_flag, const IntVect& rho_nodal_flag) { - auto & warpx = WarpX::GetInstance(); - // The "electron_pressure_fp" multifab stores the electron pressure calculated // from the specified equation of state. // The "rho_fp_temp" multifab is used to store the ion charge density @@ -69,24 +67,24 @@ void HybridPICModel::AllocateLevelMFs (int lev, const BoxArray& ba, const Distri // interpolated or extrapolated to appropriate timesteps. // The "current_fp_ampere" multifab stores the total current calculated as // the curl of B. - warpx.AllocInitMultiFab(electron_pressure_fp[lev], amrex::convert(ba, rho_nodal_flag), + WarpX::AllocInitMultiFab(electron_pressure_fp[lev], amrex::convert(ba, rho_nodal_flag), dm, ncomps, ngRho, lev, "electron_pressure_fp", 0.0_rt); - warpx.AllocInitMultiFab(rho_fp_temp[lev], amrex::convert(ba, rho_nodal_flag), + WarpX::AllocInitMultiFab(rho_fp_temp[lev], amrex::convert(ba, rho_nodal_flag), dm, ncomps, ngRho, lev, "rho_fp_temp", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_temp[lev][0], amrex::convert(ba, jx_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_temp[lev][0], amrex::convert(ba, jx_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_temp[x]", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_temp[lev][1], amrex::convert(ba, jy_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_temp[lev][1], amrex::convert(ba, jy_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_temp[y]", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_temp[lev][2], amrex::convert(ba, jz_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_temp[lev][2], amrex::convert(ba, jz_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_temp[z]", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_ampere[lev][0], amrex::convert(ba, jx_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_ampere[lev][0], amrex::convert(ba, jx_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_ampere[x]", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_ampere[lev][1], amrex::convert(ba, jy_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_ampere[lev][1], amrex::convert(ba, jy_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_ampere[y]", 0.0_rt); - warpx.AllocInitMultiFab(current_fp_ampere[lev][2], amrex::convert(ba, jz_nodal_flag), + WarpX::AllocInitMultiFab(current_fp_ampere[lev][2], amrex::convert(ba, jz_nodal_flag), dm, ncomps, ngJ, lev, "current_fp_ampere[z]", 0.0_rt); } diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp index 946d938c7..e396efe12 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp @@ -53,10 +53,10 @@ PsatdAlgorithmFirstOrder::pushSpectralFields (SpectralFieldData& f) const { const bool div_cleaning = m_div_cleaning; - const bool J_constant = (m_J_in_time == JInTime::Constant) ? true : false; - const bool J_linear = (m_J_in_time == JInTime::Linear ) ? true : false; - const bool rho_constant = (m_rho_in_time == RhoInTime::Constant) ? true : false; - const bool rho_linear = (m_rho_in_time == RhoInTime::Linear ) ? true : false; + const bool J_constant = (m_J_in_time == JInTime::Constant); + const bool J_linear = (m_J_in_time == JInTime::Linear); + const bool rho_constant = (m_rho_in_time == RhoInTime::Constant); + const bool rho_linear = (m_rho_in_time == RhoInTime::Linear); const amrex::Real dt = m_dt; const amrex::Real dt2 = dt*dt; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp index f6b3460e2..32825155f 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp @@ -82,7 +82,7 @@ PsatdAlgorithmRZ::pushSpectralFields(SpectralFieldDataRZ & f) const bool update_with_rho = m_update_with_rho; const bool time_averaging = m_time_averaging; - const bool J_linear = (m_J_in_time == JInTime::Linear) ? true : false; + const bool J_linear = (m_J_in_time == JInTime::Linear); const bool dive_cleaning = m_dive_cleaning; const bool divb_cleaning = m_divb_cleaning; @@ -337,7 +337,7 @@ PsatdAlgorithmRZ::pushSpectralFields(SpectralFieldDataRZ & f) void PsatdAlgorithmRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ const & f) { const bool time_averaging = m_time_averaging; - const bool J_linear = (m_J_in_time == JInTime::Linear) ? true : false; + const bool J_linear = (m_J_in_time == JInTime::Linear); // Fill them with the right values: // Loop over boxes and allocate the corresponding coefficients diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp index ab4e39710..0cd7a3463 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.cpp @@ -47,7 +47,7 @@ SpectralFieldIndex::SpectralFieldIndex (const bool update_with_rho, int c = 0; - if (pml == false) + if (!pml) { Ex = c++; Ey = c++; Ez = c++; Bx = c++; By = c++; Bz = c++; @@ -291,15 +291,15 @@ SpectralFieldData::ForwardTransform (const int lev, Complex spectral_field_value = tmp_arr(i,j,k); // Apply proper shift in each dimension #if (AMREX_SPACEDIM >= 2) - if (is_nodal_x==false) spectral_field_value *= xshift_arr[i]; + if (!is_nodal_x) spectral_field_value *= xshift_arr[i]; #endif #if defined(WARPX_DIM_3D) - if (is_nodal_y==false) spectral_field_value *= yshift_arr[j]; - if (is_nodal_z==false) spectral_field_value *= zshift_arr[k]; + if (!is_nodal_y) spectral_field_value *= yshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[k]; #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) - if (is_nodal_z==false) spectral_field_value *= zshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[j]; #elif defined(WARPX_DIM_1D_Z) - if (is_nodal_z==false) spectral_field_value *= zshift_arr[i]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[i]; #endif // Copy field into the right index fields_arr(i,j,k,field_index) = spectral_field_value; @@ -391,15 +391,15 @@ SpectralFieldData::BackwardTransform (const int lev, Complex spectral_field_value = field_arr(i,j,k,field_index); // Apply proper shift in each dimension #if (AMREX_SPACEDIM >= 2) - if (is_nodal_x==false) spectral_field_value *= xshift_arr[i]; + if (!is_nodal_x) spectral_field_value *= xshift_arr[i]; #endif #if defined(WARPX_DIM_3D) - if (is_nodal_y==false) spectral_field_value *= yshift_arr[j]; - if (is_nodal_z==false) spectral_field_value *= zshift_arr[k]; + if (!is_nodal_y) spectral_field_value *= yshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[k]; #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) - if (is_nodal_z==false) spectral_field_value *= zshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[j]; #elif defined(WARPX_DIM_1D_Z) - if (is_nodal_z==false) spectral_field_value *= zshift_arr[i]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[i]; #endif // Copy field into temporary array tmp_arr(i,j,k) = spectral_field_value; @@ -444,11 +444,11 @@ SpectralFieldData::BackwardTransform (const int lev, #endif // If necessary, do not fill the guard cells // (shrink box by passing negative number of cells) - if (m_periodic_single_box == false) + if (!m_periodic_single_box) { for (int dir = 0; dir < AMREX_SPACEDIM; dir++) { - if (static_cast<bool>(fill_guards[dir]) == false) mf_box.grow(dir, -mf_ng[dir]); + if ((fill_guards[dir]) == 0) mf_box.grow(dir, -mf_ng[dir]); } } diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp index 10575b189..b5e9f4c90 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp @@ -326,7 +326,7 @@ SpectralFieldDataRZ::FABZForwardTransform (amrex::MFIter const & mfi, amrex::Box [=] AMREX_GPU_DEVICE(int i, int j, int k, int mode) noexcept { Complex spectral_field_value = tmp_arr(i,j,k,mode); // Apply proper shift. - if (is_nodal_z==false) spectral_field_value *= zshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[j]; // Copy field into the correct index. int const ic = field_index + mode*n_fields; fields_arr(i,j,k,ic) = spectral_field_value*inv_nz; @@ -364,7 +364,7 @@ SpectralFieldDataRZ::FABZBackwardTransform (amrex::MFIter const & mfi, amrex::Bo int const ic = field_index + mode*n_fields; Complex spectral_field_value = fields_arr(i,j,k,ic); // Apply proper shift. - if (is_nodal_z==false) spectral_field_value *= zshift_arr[j]; + if (!is_nodal_z) spectral_field_value *= zshift_arr[j]; // Copy field into the right index. tmp_arr(i,j,k,mode) = spectral_field_value; }); |