aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/Particles/PhysicalParticleContainer.cpp18
-rw-r--r--Source/Particles/WarpXParticleContainer.H3
-rw-r--r--Source/Particles/WarpXParticleContainer.cpp2
-rw-r--r--Source/WarpX.H12
-rw-r--r--Source/WarpX.cpp3
5 files changed, 9 insertions, 29 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index b11a8e82b..34b8d6cb4 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -1033,7 +1033,6 @@ PhysicalParticleContainer::FieldGather (int lev,
//
pti.GetPosition(m_xp[thread_num], m_yp[thread_num], m_zp[thread_num]);
- // to delete comment
if (WarpX::E_ext_particle_s=="parse_e_ext_particle_function") {
// Points to particle position
Real* const AMREX_RESTRICT xp_data = m_xp[thread_num].dataPtr();
@@ -1042,9 +1041,9 @@ PhysicalParticleContainer::FieldGather (int lev,
Real* const AMREX_RESTRICT Exp_data = Exp.dataPtr();
Real* const AMREX_RESTRICT Eyp_data = Eyp.dataPtr();
Real* const AMREX_RESTRICT Ezp_data = Ezp.dataPtr();
- ParserWrapper *xfield_partparser = Ex_particle_parser.get();
- ParserWrapper *yfield_partparser = Ey_particle_parser.get();
- ParserWrapper *zfield_partparser = Ez_particle_parser.get();
+ ParserWrapper *xfield_partparser = Ex_particle_parser.get();
+ ParserWrapper *yfield_partparser = Ey_particle_parser.get();
+ ParserWrapper *zfield_partparser = Ez_particle_parser.get();
amrex::ParallelFor(pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
Real x = xp_data[i];
@@ -1063,9 +1062,9 @@ PhysicalParticleContainer::FieldGather (int lev,
Real* const AMREX_RESTRICT Bxp_data = Bxp.dataPtr();
Real* const AMREX_RESTRICT Byp_data = Byp.dataPtr();
Real* const AMREX_RESTRICT Bzp_data = Bzp.dataPtr();
- ParserWrapper *xfield_partparser = Bx_particle_parser.get();
- ParserWrapper *yfield_partparser = By_particle_parser.get();
- ParserWrapper *zfield_partparser = Bz_particle_parser.get();
+ ParserWrapper *xfield_partparser = Bx_particle_parser.get();
+ ParserWrapper *yfield_partparser = By_particle_parser.get();
+ ParserWrapper *zfield_partparser = Bz_particle_parser.get();
amrex::ParallelFor(pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
Real x = xp_data[i];
@@ -1076,7 +1075,7 @@ PhysicalParticleContainer::FieldGather (int lev,
Bzp_data[i] = zfield_partparser->getField(x,y,z);
});
}
-
+
//
// Field Gather
@@ -1225,7 +1224,7 @@ PhysicalParticleContainer::Evolve (int lev,
// copy data from particle container to temp arrays
//
pti.GetPosition(m_xp[thread_num], m_yp[thread_num], m_zp[thread_num]);
- // to delete comment
+
if (WarpX::E_ext_particle_s=="parse_e_ext_particle_function") {
// Points to particle position
Real* const AMREX_RESTRICT xp_data = m_xp[thread_num].dataPtr();
@@ -1933,7 +1932,6 @@ PhysicalParticleContainer::PushP (int lev, Real dt,
//
pti.GetPosition(m_xp[thread_num], m_yp[thread_num], m_zp[thread_num]);
- // to delete comment
if (WarpX::E_ext_particle_s=="parse_e_ext_particle_function") {
// Points to particle position
Real* const AMREX_RESTRICT xp_data = m_xp[thread_num].dataPtr();
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index b80dfb056..14eb1a96f 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -323,7 +323,6 @@ public:
//amrex::Real getMass () {return mass;}
amrex::ParticleReal getMass () const {return mass;}
- // to delete comment
// ParserWrapper for B_external on the particle
std::unique_ptr<ParserWrapper> Bx_particle_parser;
std::unique_ptr<ParserWrapper> By_particle_parser;
@@ -332,7 +331,7 @@ public:
std::unique_ptr<ParserWrapper> Ex_particle_parser;
std::unique_ptr<ParserWrapper> Ey_particle_parser;
std::unique_ptr<ParserWrapper> Ez_particle_parser;
-
+
protected:
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 9d5f4bcf4..465539d1a 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -115,8 +115,6 @@ WarpXParticleContainer::WarpXParticleContainer (AmrCore* amr_core, int ispecies)
m_yp.resize(num_threads);
m_zp.resize(num_threads);
-
- // to delete comment
if (WarpX::B_ext_particle_s == "parse_b_ext_particle_function") {
Bx_particle_parser.reset(new ParserWrapper(
makeParser(WarpX::str_Bx_ext_particle_function)));
diff --git a/Source/WarpX.H b/Source/WarpX.H
index 91a815f7c..5818df394 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -92,7 +92,6 @@ public:
// Initialization Type for External E and B on grid and particles
static std::string B_ext_grid_s;
static std::string E_ext_grid_s;
- // EB parser for particles -- to delete comment
static std::string B_ext_particle_s;
static std::string E_ext_particle_s;
@@ -114,7 +113,6 @@ public:
std::unique_ptr<ParserWrapper> Eyfield_parser;
std::unique_ptr<ParserWrapper> Ezfield_parser;
- // EV parser for particles -- to delete comment
// Parser for B_external on the particle
static std::string str_Bx_ext_particle_function;
static std::string str_By_ext_particle_function;
@@ -124,16 +122,6 @@ public:
static std::string str_Ey_ext_particle_function;
static std::string str_Ez_ext_particle_function;
- // -- to delete comment
- // ParserWrapper for B_external on the particle
- static std::unique_ptr<ParserWrapper> Bx_particle_parser;
- static std::unique_ptr<ParserWrapper> By_particle_parser;
- static std::unique_ptr<ParserWrapper> Bz_particle_parser;
- // ParserWrapper for E_external on the particle
- static std::unique_ptr<ParserWrapper> Ex_particle_parser;
- static std::unique_ptr<ParserWrapper> Ey_particle_parser;
- static std::unique_ptr<ParserWrapper> Ez_particle_parser;
-
// Algorithms
static long current_deposition_algo;
static long charge_deposition_algo;
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index bc0edf979..d9be00df8 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -32,7 +32,6 @@ Vector<Real> WarpX::B_external_grid(3, 0.0);
std::string WarpX::B_ext_grid_s = "default";
std::string WarpX::E_ext_grid_s = "default";
-//to delete comment
std::string WarpX::B_ext_particle_s = "default";
std::string WarpX::E_ext_particle_s = "default";
@@ -45,7 +44,6 @@ std::string WarpX::str_Ex_ext_grid_function;
std::string WarpX::str_Ey_ext_grid_function;
std::string WarpX::str_Ez_ext_grid_function;
-// EV parser for particles -- to delete comment
// Parser for B_external on the particle
std::string WarpX::str_Bx_ext_particle_function;
std::string WarpX::str_By_ext_particle_function;
@@ -331,7 +329,6 @@ WarpX::ReadParameters ()
pp.query("zmax_plasma_to_compute_max_step",
zmax_plasma_to_compute_max_step);
- // -- to delete comment
// default values of E_external_particle and B_external_particle
// are used to set the E and B field when "constant" or "parser"
// is not explicitly used in the input
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-19 15:34:12 +0000