diff options
Diffstat (limited to 'Source/Particles')
-rw-r--r-- | Source/Particles/MultiParticleContainer.H | 2 | ||||
-rw-r--r-- | Source/Particles/MultiParticleContainer.cpp | 21 | ||||
-rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 2 | ||||
-rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 10 |
4 files changed, 0 insertions, 35 deletions
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(); |