aboutsummaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Diagnostics/BoostedFrameDiagnostic.cpp5
-rw-r--r--Source/Evolve/WarpXEvolveEM.cpp2
-rw-r--r--Source/Particles/MultiParticleContainer.H2
-rw-r--r--Source/Particles/MultiParticleContainer.cpp21
-rw-r--r--Source/Particles/PhysicalParticleContainer.cpp2
-rw-r--r--Source/Particles/WarpXParticleContainer.cpp10
-rw-r--r--Source/WarpX.cpp7
7 files changed, 2 insertions, 47 deletions
diff --git a/Source/Diagnostics/BoostedFrameDiagnostic.cpp b/Source/Diagnostics/BoostedFrameDiagnostic.cpp
index 413730f91..49038b9e2 100644
--- a/Source/Diagnostics/BoostedFrameDiagnostic.cpp
+++ b/Source/Diagnostics/BoostedFrameDiagnostic.cpp
@@ -539,7 +539,6 @@ void BoostedFrameDiagnostic::Flush(const Geometry& geom)
}
if (WarpX::do_boosted_frame_particles) {
- // for (int j = 0; j < mypc.nSpecies(); ++j) {
for (int j = 0; j < mypc.nSpeciesLabFrameDiags(); ++j) {
int js = mypc.mapSpeciesLabDiags(j);
std::string species_name = species_names[js];
@@ -645,8 +644,8 @@ writeLabFrameData(const MultiFab* cell_centered_data,
&ncomp, &i_boost, &i_lab);
}
}
- if (WarpX::do_boosted_frame_particles) {
+ if (WarpX::do_boosted_frame_particles) {
mypc.GetLabFrameData(snapshots_[i].file_name, i_lab, boost_direction_,
old_z_boost, snapshots_[i].current_z_boost,
t_boost, snapshots_[i].t_lab, dt, particles_buffer_[i]);
@@ -732,7 +731,6 @@ writeParticleDataHDF5(const WarpXParticleContainer::DiagnosticParticleData& pdat
ParallelDescriptor::ReduceLongMax(old_np);
// Write data here
- Print()<<"particle_field_names.size()"<<particle_field_names.size()<<std::endl;
for (int k = 0; k < static_cast<int>(particle_field_names.size()); ++k)
{
std::string field_path = species_name + "/" + particle_field_names[k];
@@ -869,7 +867,6 @@ LabSnapShot(Real t_lab_in, Real t_boost, Real zmin_lab_in,
if (WarpX::do_boosted_frame_particles){
auto & mypc = WarpX::GetInstance().GetPartContainer();
const std::vector<std::string> species_names = mypc.GetSpeciesNames();
- // for (int j = 0; j < mypc.nSpecies(); ++j)
for (int j = 0; j < mypc.nSpeciesLabFrameDiags(); ++j)
{
int js = mypc.mapSpeciesLabDiags(j);
diff --git a/Source/Evolve/WarpXEvolveEM.cpp b/Source/Evolve/WarpXEvolveEM.cpp
index d88f178df..dab58f95b 100644
--- a/Source/Evolve/WarpXEvolveEM.cpp
+++ b/Source/Evolve/WarpXEvolveEM.cpp
@@ -247,9 +247,7 @@ WarpX::EvolveEM (int numsteps)
}
if (do_boosted_frame_diagnostic) {
- std::cout<<"before myBFD->Flush"<<std::endl;
myBFD->Flush(geom[0]);
- std::cout<<"after myBFD->Flush"<<std::endl;
}
#ifdef BL_USE_SENSEI_INSITU
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index 217f727b0..e88879127 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -153,8 +153,6 @@ public:
void SetParticleBoxArray (int lev, amrex::BoxArray& new_ba);
void SetParticleDistributionMap (int lev, amrex::DistributionMapping& new_dm);
- void setSpeciesLabFrameDiags() const;
-
int nSpecies() const {return nspecies;}
int nSpeciesLabFrameDiags() const {return nspecies_lab_frame_diags;}
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 508f3f606..ea87e2d5b 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -47,18 +47,6 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
if (WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags)
{
- //maxoldattribs
- /*
- for (int i = 0; i < nspecies + nlasers; ++i)
- {
- allcontainers[i]->AddRealComp("xold");
- allcontainers[i]->AddRealComp("yold");
- allcontainers[i]->AddRealComp("zold");
- allcontainers[i]->AddRealComp("uxold");
- allcontainers[i]->AddRealComp("uyold");
- allcontainers[i]->AddRealComp("uzold");
- }
- */
for (int i = 0; i < nspecies_lab_frame_diags; ++i)
{
int is = map_species_lab_diags[i];
@@ -69,14 +57,12 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
allcontainers[is]->AddRealComp("uyold");
allcontainers[is]->AddRealComp("uzold");
}
- /*
pc_tmp->AddRealComp("xold");
pc_tmp->AddRealComp("yold");
pc_tmp->AddRealComp("zold");
pc_tmp->AddRealComp("uxold");
pc_tmp->AddRealComp("uyold");
pc_tmp->AddRealComp("uzold");
- */
}
}
@@ -500,10 +486,3 @@ MultiParticleContainer::doContinuousInjection() const
}
return warpx_do_continuous_injection;
}
-
-// Set number of species for which lab frame data is dumped
-// and maps their ID to MultiParticleContainer IDs.
-//void
-//MultiParticleContainer::setSpeciesLabFrameDiags() const
-//{
-//}
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index dd167ba41..37c136a3d 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -835,9 +835,7 @@ FieldGatherES (const amrex::Vector<std::array<std::unique_ptr<amrex::MultiFab>,
const auto& particles = pti.GetArrayOfStructs();
int nstride = particles.dataShape().first;
const long np = pti.numParticles();
- std::cout<<"start 1 GetAttribs\n";
auto& attribs = pti.GetAttribs();
- std::cout<<"end 2 GetAttribs\n";
auto& Exp = attribs[PIdx::Ex];
auto& Eyp = attribs[PIdx::Ey];
#if AMREX_SPACEDIM == 3
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 66f0dfb5c..0cf5c10b4 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -6,8 +6,6 @@
#include <AMReX_AmrParGDB.H>
#include <WarpX_f.H>
#include <WarpX.H>
-#include <AMReX_Particles.H>
-#include <AMReX_AmrCore.H>
using namespace amrex;
@@ -24,9 +22,7 @@ WarpXParIter::GetPosition (Cuda::ManagedDeviceVector<Real>& x, Cuda::ManagedDevi
{
amrex::ParIter<0,0,PIdx::nattribs>::GetPosition(x, z);
#ifdef WARPX_RZ
- std::cout<<"start 2 GetAttribs()\n";
const auto& attribs = GetAttribs();
- std::cout<<"stop 2 GetAttribs()\n";
const auto& theta = attribs[PIdx::theta];
y.resize(x.size());
for (unsigned int i=0 ; i < x.size() ; i++) {
@@ -43,9 +39,7 @@ void
WarpXParIter::SetPosition (const Cuda::ManagedDeviceVector<Real>& x, const Cuda::ManagedDeviceVector<Real>& y, const Cuda::ManagedDeviceVector<Real>& z)
{
#ifdef WARPX_RZ
- std::cout<<"start 3 GetAttribs()\n";
auto& attribs = GetAttribs();
- std::cout<<"stop 3 GetAttribs()\n";
auto& theta = attribs[PIdx::theta];
Cuda::DeviceVector<Real> r(x.size());
for (unsigned int i=0 ; i < x.size() ; i++) {
@@ -1001,9 +995,7 @@ WarpXParticleContainer::PushXES (Real dt)
int nstride = particles.dataShape().first;
const long np = pti.numParticles();
- std::cout<<"start 4 GetAttribs()\n";
auto& attribs = pti.GetAttribs();
- std::cout<<"stop 4 GetAttribs()\n";
auto& uxp = attribs[PIdx::ux];
auto& uyp = attribs[PIdx::uy];
auto& uzp = attribs[PIdx::uz];
@@ -1052,9 +1044,7 @@ WarpXParticleContainer::PushX (int lev, Real dt)
// - positions are stored as an array of struct, in `ParticleType`
ParticleType * AMREX_RESTRICT pstructs = &(pti.GetArrayOfStructs()[0]);
// - momenta are stored as a struct of array, in `attribs`
- std::cout<<"start 5 GetAttribs()\n";
auto& attribs = pti.GetAttribs();
- std::cout<<"stop 5 GetAttribs()\n";
Real* AMREX_RESTRICT ux = attribs[PIdx::ux].dataPtr();
Real* AMREX_RESTRICT uy = attribs[PIdx::uy].dataPtr();
Real* AMREX_RESTRICT uz = attribs[PIdx::uz].dataPtr();
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index e4c54cc05..6b1edaccd 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -56,12 +56,9 @@ int WarpX::num_mirrors = 0;
int WarpX::sort_int = -1;
+bool WarpX::do_boosted_frame_diagnostic = false;
int WarpX::num_snapshots_lab = std::numeric_limits<int>::lowest();
Real WarpX::dt_snapshots_lab = std::numeric_limits<Real>::lowest();
-// bool WarpX::do_boosted_frame_diagnostic = false;
-// bool WarpX::do_boosted_frame_fields = true;
-// bool WarpX::do_boosted_frame_particles = true;
-bool WarpX::do_boosted_frame_diagnostic = false;
bool WarpX::do_boosted_frame_fields = true;
bool WarpX::do_boosted_frame_particles = true;
@@ -329,8 +326,6 @@ WarpX::ReadParameters ()
pp.get("gamma_boost", gamma_boost);
pp.query("do_boosted_frame_fields", do_boosted_frame_fields);
- // pp.query("do_boosted_frame_particles", do_boosted_frame_particles);
-
AMREX_ALWAYS_ASSERT_WITH_MESSAGE(do_moving_window,
"The moving window should be on if using the boosted frame diagnostic.");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-18 11:18:57 +0000