aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Particles')
-rw-r--r--Source/Particles/Collision/BinaryCollision/BinaryCollision.H4
-rw-r--r--Source/Particles/Collision/BinaryCollision/NuclearFusion/BoschHaleFusionCrossSection.H2
-rw-r--r--Source/Particles/Collision/CollisionHandler.cpp1
-rw-r--r--Source/Particles/Deposition/CurrentDeposition.H1
-rw-r--r--Source/Particles/Pusher/PushSelector.H2
-rw-r--r--Source/Particles/WarpXParticleContainer.H5
-rw-r--r--Source/Particles/WarpXParticleContainer.cpp12
7 files changed, 14 insertions, 13 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
index 0c5ec182e..2c1cdc689 100644
--- a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
+++ b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
@@ -111,8 +111,9 @@ public:
* @param mypc Container of species involved
*
*/
- void doCollisions (amrex::Real /*cur_time*/, amrex::Real dt, MultiParticleContainer* mypc) override
+ void doCollisions (amrex::Real cur_time, amrex::Real dt, MultiParticleContainer* mypc) override
{
+ amrex::ignore_unused(cur_time);
auto& species1 = mypc->GetParticleContainerFromName(m_species_names[0]);
auto& species2 = mypc->GetParticleContainerFromName(m_species_names[1]);
@@ -192,6 +193,7 @@ public:
/** Perform all binary collisions within a tile
*
+ * \param[in] dt time step size
* \param[in] lev the mesh-refinement level
* \param[in] mfi iterator for multifab
* \param species_1 first species container
diff --git a/Source/Particles/Collision/BinaryCollision/NuclearFusion/BoschHaleFusionCrossSection.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/BoschHaleFusionCrossSection.H
index 08af65ca6..e2a4fca25 100644
--- a/Source/Particles/Collision/BinaryCollision/NuclearFusion/BoschHaleFusionCrossSection.H
+++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/BoschHaleFusionCrossSection.H
@@ -21,6 +21,8 @@
*
* @param[in] E_kin_star the kinetic energy of the reactants in their center of mass frame, in SI units.
* @param[in] fusion_type indicates which fusion reaction to calculate the cross-section for
+ * @param[in] m1 mass of the incoming particle
+ * @param[in] m2 mass of the target particle
* @return The total cross section in SI units (square meters).
*/
AMREX_GPU_HOST_DEVICE AMREX_INLINE
diff --git a/Source/Particles/Collision/CollisionHandler.cpp b/Source/Particles/Collision/CollisionHandler.cpp
index cc8d8eb4a..e8f25a78b 100644
--- a/Source/Particles/Collision/CollisionHandler.cpp
+++ b/Source/Particles/Collision/CollisionHandler.cpp
@@ -68,6 +68,7 @@ CollisionHandler::CollisionHandler(MultiParticleContainer const * const mypc)
/** Perform all collisions
*
* @param cur_time Current time
+ * @param dt time step size
* @param mypc MultiParticleContainer calling this method
*
*/
diff --git a/Source/Particles/Deposition/CurrentDeposition.H b/Source/Particles/Deposition/CurrentDeposition.H
index d478d838e..84d696ce4 100644
--- a/Source/Particles/Deposition/CurrentDeposition.H
+++ b/Source/Particles/Deposition/CurrentDeposition.H
@@ -36,7 +36,6 @@ using namespace amrex::literals;
ion_lev is a null pointer.
* \param jx_fab,jy_fab,jz_fab FArrayBox of current density, either full array or tile.
* \param np_to_depose Number of particles for which current is deposited.
- * \param dt Time step for particle level
* \param relative_time Time at which to deposit J, relative to the time of the
* current positions of the particles. When different than 0,
* the particle position will be temporarily modified to match
diff --git a/Source/Particles/Pusher/PushSelector.H b/Source/Particles/Pusher/PushSelector.H
index a56dda2b9..b1e590299 100644
--- a/Source/Particles/Pusher/PushSelector.H
+++ b/Source/Particles/Pusher/PushSelector.H
@@ -33,7 +33,7 @@
* \param Bx, By, Bz Magnetic field on particles.
* \param ion_lev Ionization level of this particle (0 if ioniziation not on)
* \param m Mass of this species.
- * \param q Charge of this species.
+ * \param a_q Charge of this species.
* \param pusher_algo 0: Boris, 1: Vay, 2: HigueraCary
* \param do_crr Whether to do the classical radiation reaction
* \param do_copy Whether to copy the old x and u for the BTD
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index cb5542025..4f226fbf8 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -279,7 +279,7 @@ public:
*/
void AddNParticles (int lev,
int n, const amrex::ParticleReal* x, const amrex::ParticleReal* y, const amrex::ParticleReal* z,
- const amrex::ParticleReal* vx, const amrex::ParticleReal* vy, const amrex::ParticleReal* vz,
+ const amrex::ParticleReal* ux, const amrex::ParticleReal* uy, const amrex::ParticleReal* uz,
const int nattr_real, const amrex::ParticleReal* attr_real,
const int nattr_int, const int* attr_int,
int uniqueparticles, amrex::Long id=-1);
@@ -293,9 +293,6 @@ public:
static void BackwardCompatibility ();
/** \brief Apply particle BC.
- *
- * \param[in] boundary_conditions Type of boundary conditions. For now, only absorbing or none
- * are supported
*/
void ApplyBoundaryConditions ();
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 6eae0d0b6..21ab1408c 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -144,9 +144,9 @@ WarpXParticleContainer::AddNParticles (int /*lev*/,
int n, const amrex::ParticleReal* x,
const amrex::ParticleReal* y,
const amrex::ParticleReal* z,
- const amrex::ParticleReal* vx,
- const amrex::ParticleReal* vy,
- const amrex::ParticleReal* vz,
+ const amrex::ParticleReal* ux,
+ const amrex::ParticleReal* uy,
+ const amrex::ParticleReal* uz,
const int nattr_real, const amrex::ParticleReal* attr_real,
const int nattr_int, const int* attr_int,
int uniqueparticles, amrex::Long id)
@@ -226,9 +226,9 @@ WarpXParticleContainer::AddNParticles (int /*lev*/,
if (np > 0)
{
pinned_tile.push_back_real(PIdx::w , weight.data(), weight.data() + np);
- pinned_tile.push_back_real(PIdx::ux, vx + ibegin, vx + iend);
- pinned_tile.push_back_real(PIdx::uy, vy + ibegin, vy + iend);
- pinned_tile.push_back_real(PIdx::uz, vz + ibegin, vz + iend);
+ pinned_tile.push_back_real(PIdx::ux, ux + ibegin, ux + iend);
+ pinned_tile.push_back_real(PIdx::uy, uy + ibegin, uy + iend);
+ pinned_tile.push_back_real(PIdx::uz, uz + ibegin, uz + iend);
if ( (NumRuntimeRealComps()>0) || (NumRuntimeIntComps()>0) ){
DefineAndReturnParticleTile(0, 0, 0);