aboutsummaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Laser/LaserParticleContainer.cpp4
-rwxr-xr-xSource/Particles/Deposition/ChargeDeposition.H2
-rw-r--r--Source/Particles/Deposition/CurrentDeposition.H4
-rw-r--r--Source/Particles/Gather/FieldGather.H2
-rw-r--r--Source/Particles/PhotonParticleContainer.cpp2
-rw-r--r--Source/Particles/PhysicalParticleContainer.cpp20
-rw-r--r--Source/Particles/RigidInjectedParticleContainer.cpp10
-rw-r--r--Source/Particles/WarpXParticleContainer.cpp2
8 files changed, 23 insertions, 23 deletions
diff --git a/Source/Laser/LaserParticleContainer.cpp b/Source/Laser/LaserParticleContainer.cpp
index 658e56db4..0203cc4b2 100644
--- a/Source/Laser/LaserParticleContainer.cpp
+++ b/Source/Laser/LaserParticleContainer.cpp
@@ -585,7 +585,7 @@ LaserParticleContainer::calculate_laser_plane_coordinates (const WarpXParIter& p
amrex::ParallelFor(
np,
[=] AMREX_GPU_DEVICE (int i) {
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
#if (defined WARPX_DIM_3D) || (defined WARPX_DIM_RZ)
pplane_Xp[i] =
@@ -662,7 +662,7 @@ LaserParticleContainer::update_laser_particle(WarpXParIter& pti,
puzp[i] = gamma * vz;
// Push the the particle positions
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
x += vx * dt;
#if (defined WARPX_DIM_3D) || (defined WARPX_DIM_RZ)
diff --git a/Source/Particles/Deposition/ChargeDeposition.H b/Source/Particles/Deposition/ChargeDeposition.H
index a2eff20b3..f97866f03 100755
--- a/Source/Particles/Deposition/ChargeDeposition.H
+++ b/Source/Particles/Deposition/ChargeDeposition.H
@@ -55,7 +55,7 @@ void doChargeDepositionShapeN(const GetPosition& get_position,
wq *= ion_lev[ip];
}
- amrex::Real xp, yp, zp;
+ amrex::ParticleReal xp, yp, zp;
get_position(ip, xp, yp, zp);
// --- Compute shape factors
diff --git a/Source/Particles/Deposition/CurrentDeposition.H b/Source/Particles/Deposition/CurrentDeposition.H
index c7e79bce6..e4cb8c1cd 100644
--- a/Source/Particles/Deposition/CurrentDeposition.H
+++ b/Source/Particles/Deposition/CurrentDeposition.H
@@ -88,7 +88,7 @@ void doDepositionShapeN(const GetPosition& get_position,
wq *= ion_lev[ip];
}
- amrex::Real xp, yp, zp;
+ amrex::ParticleReal xp, yp, zp;
get_position(ip, xp, yp, zp);
const amrex::Real vx = uxp[ip]*gaminv;
@@ -311,7 +311,7 @@ void doEsirkepovDepositionShapeN (const GetPosition& get_position,
wq *= ion_lev[ip];
}
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(ip, xp, yp, zp);
Real const wqx = wq*invdtdx;
diff --git a/Source/Particles/Gather/FieldGather.H b/Source/Particles/Gather/FieldGather.H
index abdc068b4..2d2b85271 100644
--- a/Source/Particles/Gather/FieldGather.H
+++ b/Source/Particles/Gather/FieldGather.H
@@ -73,7 +73,7 @@ void doGatherShapeN(const GetPosition& get_position,
np_to_gather,
[=] AMREX_GPU_DEVICE (long ip) {
- amrex::Real xp, yp, zp;
+ amrex::ParticleReal xp, yp, zp;
get_position(ip, xp, yp, zp);
// --- Compute shape factors
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index 590b8b9dc..1e34b4c97 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -78,7 +78,7 @@ PhotonParticleContainer::PushPX(WarpXParIter& pti, Real dt, DtType a_dt_type)
amrex::ParallelFor(
pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePositionPhoton( x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index f4cdbcb92..0daa9fb5f 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -1000,7 +1000,7 @@ PhysicalParticleContainer::AssignExternalFieldOnParticles(WarpXParIter& pti,
Real time = warpx.gett_new(lev);
amrex::ParallelFor(pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
Exp_data[i] = xfield_partparser->getField(x, y, z, time);
Eyp_data[i] = yfield_partparser->getField(x, y, z, time);
@@ -1022,7 +1022,7 @@ PhysicalParticleContainer::AssignExternalFieldOnParticles(WarpXParIter& pti,
Real time = warpx.gett_new(lev);
amrex::ParallelFor(pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
Bxp_data[i] = xfield_partparser->getField(x, y, z, time);
Byp_data[i] = yfield_partparser->getField(x, y, z, time);
@@ -1489,7 +1489,7 @@ PhysicalParticleContainer::SplitParticles(int lev)
auto& uzp = attribs[PIdx::uz];
const long np = pti.numParticles();
for(int i=0; i<np; i++){
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
auto& p = particles[i];
if (p.id() == DoSplitParticleID){
@@ -1667,7 +1667,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], q, m, dt);
}
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1680,7 +1680,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
UpdateMomentumBorisWithRadiationReaction( ux[i], uy[i], uz[i],
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], q, m, dt);
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1697,7 +1697,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
UpdateMomentumBorisWithRadiationReaction( ux[i], uy[i], uz[i],
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], qp, m, dt);
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1713,7 +1713,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
UpdateMomentumBoris( ux[i], uy[i], uz[i],
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], qp, m, dt);
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1728,7 +1728,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
UpdateMomentumVay( ux[i], uy[i], uz[i],
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], qp, m, dt);
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1743,7 +1743,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_type)
UpdateMomentumHigueraCary( ux[i], uy[i], uz[i],
Ex[i], Ey[i], Ez[i], Bx[i],
By[i], Bz[i], qp, m, dt);
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt );
set_position(i, x, y, z);
@@ -1937,7 +1937,7 @@ void PhysicalParticleContainer::copy_attribs (WarpXParIter& pti)
ParallelFor( np,
[=] AMREX_GPU_DEVICE (long i) {
- Real x, y, z;
+ ParticleReal x, y, z;
get_position(i, x, y, z);
xpold[i]=x;
ypold[i]=y;
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index 2bf4ee59d..692b1f287 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -93,7 +93,7 @@ RigidInjectedParticleContainer::RemapParticles()
const long np = pti.numParticles();
for (int i=0 ; i < np ; i++) {
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
const Real gammapr = std::sqrt(1. + (uxp[i]*uxp[i] + uyp[i]*uyp[i] + uzp[i]*uzp[i])/csq);
@@ -153,7 +153,7 @@ RigidInjectedParticleContainer::BoostandRemapParticles()
const long np = pti.numParticles();
for (int i=0 ; i < np ; i++) {
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
const Real gamma_lab = std::sqrt(1. + (uxp[i]*uxp[i] + uyp[i]*uyp[i] + uzp[i]*uzp[i])/(PhysConst::c*PhysConst::c));
@@ -255,7 +255,7 @@ RigidInjectedParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_
amrex::ParallelFor( np,
[=] AMREX_GPU_DEVICE (long i) {
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
xp_save_ptr[i] = xp;
yp_save_ptr[i] = yp;
@@ -274,7 +274,7 @@ RigidInjectedParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_
const Real vz_ave_boosted = vzbeam_ave_boosted;
amrex::ParallelFor( pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
const Real dtscale = dt - (z_plane_previous - zp)/(vz_ave_boosted + v_boost);
if (0. < dtscale && dtscale < dt) {
@@ -308,7 +308,7 @@ RigidInjectedParticleContainer::PushPX (WarpXParIter& pti, Real dt, DtType a_dt_
const Real inv_csq = 1./(PhysConst::c*PhysConst::c);
amrex::ParallelFor( pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real xp, yp, zp;
+ ParticleReal xp, yp, zp;
get_position(i, xp, yp, zp);
if (zp <= z_plane_lev) {
ux[i] = ux_save[i];
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index db32f2bf4..33fb98d0e 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -749,7 +749,7 @@ WarpXParticleContainer::PushX (int lev, amrex::Real dt)
// Loop over the particles and update their position
amrex::ParallelFor( pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
- Real x, y, z;
+ ParticleReal x, y, z;
#ifndef WARPX_DIM_RZ
get_position(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt);