diff options
Diffstat (limited to 'Source/FieldSolver')
| -rw-r--r-- | Source/FieldSolver/WarpXPushFieldsEM.cpp | 12 | ||||
| -rw-r--r-- | Source/FieldSolver/WarpX_FDTD.H | 32 |
2 files changed, 22 insertions, 22 deletions
diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp index 6bc674e06..0887fa6a2 100644 --- a/Source/FieldSolver/WarpXPushFieldsEM.cpp +++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp @@ -41,8 +41,8 @@ WarpX::EvolveB (int lev, PatchType patch_type, amrex::Real a_dt) { const int patch_level = (patch_type == PatchType::fine) ? lev : lev-1; const std::array<Real,3>& dx = WarpX::CellSize(patch_level); - Real dtsdx = a_dt/dx[0], dtsdy = a_dt/dx[1], dtsdz = a_dt/dx[2]; - Real dxinv = 1./dx[0]; + const Real dtsdx = a_dt/dx[0], dtsdy = a_dt/dx[1], dtsdz = a_dt/dx[2]; + const Real dxinv = 1./dx[0]; MultiFab *Ex, *Ey, *Ez, *Bx, *By, *Bz; if (patch_type == PatchType::fine) @@ -224,10 +224,10 @@ WarpX::EvolveE (int lev, PatchType patch_type, amrex::Real a_dt) const Real mu_c2_dt = (PhysConst::mu0*PhysConst::c*PhysConst::c) * a_dt; const Real c2dt = (PhysConst::c*PhysConst::c) * a_dt; - int patch_level = (patch_type == PatchType::fine) ? lev : lev-1; + const int patch_level = (patch_type == PatchType::fine) ? lev : lev-1; const std::array<Real,3>& dx = WarpX::CellSize(patch_level); - Real dtsdx_c2 = c2dt/dx[0], dtsdy_c2 = c2dt/dx[1], dtsdz_c2 = c2dt/dx[2]; - Real dxinv = 1./dx[0]; + const Real dtsdx_c2 = c2dt/dx[0], dtsdy_c2 = c2dt/dx[1], dtsdz_c2 = c2dt/dx[2]; + const Real dxinv = 1./dx[0]; MultiFab *Ex, *Ey, *Ez, *Bx, *By, *Bz, *jx, *jy, *jz, *F; if (patch_type == PatchType::fine) @@ -462,7 +462,7 @@ WarpX::EvolveF (int lev, PatchType patch_type, Real a_dt, DtType a_dt_type) static constexpr Real mu_c2 = PhysConst::mu0*PhysConst::c*PhysConst::c; - int patch_level = (patch_type == PatchType::fine) ? lev : lev-1; + const int patch_level = (patch_type == PatchType::fine) ? lev : lev-1; const auto& dx = WarpX::CellSize(patch_level); const std::array<Real,3> dtsdx {a_dt/dx[0], a_dt/dx[1], a_dt/dx[2]}; diff --git a/Source/FieldSolver/WarpX_FDTD.H b/Source/FieldSolver/WarpX_FDTD.H index ee13875f6..e2d40f4c2 100644 --- a/Source/FieldSolver/WarpX_FDTD.H +++ b/Source/FieldSolver/WarpX_FDTD.H @@ -45,8 +45,8 @@ void warpx_push_bz_yee(int i, int j, int k, Array4<Real> const& Bz, #elif defined WARPX_DIM_2D Bz(i,j,0) += - dtsdx * (Ey(i+1,j,0) - Ey(i,j,0)); #elif defined WARPX_DIM_RZ - Real ru = 1. + 0.5/(rmin*dxinv + i + 0.5); - Real rd = 1. - 0.5/(rmin*dxinv + i + 0.5); + const Real ru = 1. + 0.5/(rmin*dxinv + i + 0.5); + const Real rd = 1. - 0.5/(rmin*dxinv + i + 0.5); Bz(i,j,0) += - dtsdx * (ru*Ey(i+1,j,0) - rd*Ey(i,j,0)); #endif } @@ -103,8 +103,8 @@ void warpx_push_ez_yee(int i, int j, int k, Array4<Real> const& Ez, - mu_c2_dt * Jz(i,j,0); #elif defined WARPX_DIM_RZ if (i != 0 || rmin != 0.) { - Real ru = 1. + 0.5/(rmin*dxinv + i); - Real rd = 1. - 0.5/(rmin*dxinv + i); + const Real ru = 1. + 0.5/(rmin*dxinv + i); + const Real rd = 1. - 0.5/(rmin*dxinv + i); Ez(i,j,0) += + dtsdx_c2 * (ru*By(i,j,0) - rd*By(i-1,j,0)) - mu_c2_dt * Jz(i,j,0); } else { @@ -153,11 +153,11 @@ static void warpx_calculate_ckc_coefficients(Real dtsdx, Real dtsdy, Real dtsdz, // Cole-Karkkainen-Cowan push // computes coefficients according to Cowan - PRST-AB 16, 041303 (2013) #if defined WARPX_DIM_3D - Real delta = std::max( { dtsdx,dtsdy,dtsdz } ); - Real rx = (dtsdx/delta)*(dtsdx/delta); - Real ry = (dtsdy/delta)*(dtsdy/delta); - Real rz = (dtsdz/delta)*(dtsdz/delta); - Real beta = 0.125*(1. - rx*ry*rz/(ry*rz + rz*rx + rx*ry)); + const Real delta = std::max( { dtsdx,dtsdy,dtsdz } ); + const Real rx = (dtsdx/delta)*(dtsdx/delta); + const Real ry = (dtsdy/delta)*(dtsdy/delta); + const Real rz = (dtsdz/delta)*(dtsdz/delta); + const Real beta = 0.125*(1. - rx*ry*rz/(ry*rz + rz*rx + rx*ry)); betaxy = ry*beta; betaxz = rz*beta; betayx = rx*beta; @@ -184,9 +184,9 @@ static void warpx_calculate_ckc_coefficients(Real dtsdx, Real dtsdy, Real dtsdz, gammay *= dtsdy; gammaz *= dtsdz; #elif defined WARPX_DIM_2D - Real delta = std::max(dtsdx,dtsdz); - Real rx = (dtsdx/delta)*(dtsdx/delta); - Real rz = (dtsdz/delta)*(dtsdz/delta); + const Real delta = std::max(dtsdx,dtsdz); + const Real rx = (dtsdx/delta)*(dtsdx/delta); + const Real rz = (dtsdz/delta)*(dtsdz/delta); betaxz = 0.125*rz; betazx = 0.125*rx; alphax = 1. - 2.*betaxz; @@ -386,8 +386,8 @@ void warpx_computedivb(int i, int j, int k, int dcomp, Array4<Real> const& divB, divB(i,j,0,dcomp) = (Bx(i+1,j ,0) - Bx(i,j,0))*dxinv + (Bz(i ,j+1,0) - Bz(i,j,0))*dzinv; #elif defined WARPX_DIM_RZ - Real ru = 1. + 0.5/(rmin*dxinv + i + 0.5); - Real rd = 1. - 0.5/(rmin*dxinv + i + 0.5); + const Real ru = 1. + 0.5/(rmin*dxinv + i + 0.5); + const Real rd = 1. - 0.5/(rmin*dxinv + i + 0.5); divB(i,j,0,dcomp) = (ru*Bx(i+1,j,0) - rd*Bx(i,j,0))*dxinv + (Bz(i,j+1,0) - Bz(i,j,0))*dzinv; #endif @@ -417,8 +417,8 @@ void warpx_computedive(int i, int j, int k, int dcomp, Array4<Real> const& divE, divE(i,j,0,dcomp) = 4.*Ex(i,j,0)*dxinv + (Ez(i,j,0) - Ez(i,j-1,0))*dzinv; } else { - Real ru = 1. + 0.5/(rmin*dxinv + i); - Real rd = 1. - 0.5/(rmin*dxinv + i); + const Real ru = 1. + 0.5/(rmin*dxinv + i); + const Real rd = 1. - 0.5/(rmin*dxinv + i); divE(i,j,0,dcomp) = (ru*Ex(i,j,0) - rd*Ex(i-1,j,0))*dxinv + (Ez(i,j,0) - Ez(i,j-1,0))*dzinv; } |