From baa68ebdef3951ab4bc2802128a7af02a481feb9 Mon Sep 17 00:00:00 2001
From: Sadr Mohsen <sadr_m@merlin-l-001.psi.ch>
Date: Mon, 24 Jun 2024 08:44:46 +0200
Subject: [PATCH] comment out gather and load balancer for successful run on
gpu, minor edits
---
src/PartBunch/PartBunch.cpp | 4 ++--
src/PartBunch/PartBunch.hpp | 17 ++++++++++++-----
src/Track/TrackRun.cpp | 2 +-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/PartBunch/PartBunch.cpp b/src/PartBunch/PartBunch.cpp
index 5eae7c8f7..a6e213240 100644
--- a/src/PartBunch/PartBunch.cpp
+++ b/src/PartBunch/PartBunch.cpp
@@ -202,11 +202,11 @@ void PartBunch<double,3>::bunchUpdate() {
this->getParticleContainer()->getLayout().updateLayout(*FL, *mesh);
this->getParticleContainer()->update();
*/
-
+/*
this->isFirstRepartition_m = true;
this->loadbalancer_m->initializeORB(FL, mesh);
this->loadbalancer_m->repartition(FL, mesh, this->isFirstRepartition_m);
-
+*/
this->updateMoments();
}
diff --git a/src/PartBunch/PartBunch.hpp b/src/PartBunch/PartBunch.hpp
index 843d87b13..4d3fb66d3 100644
--- a/src/PartBunch/PartBunch.hpp
+++ b/src/PartBunch/PartBunch.hpp
@@ -226,7 +226,7 @@ public:
it_m(0),
integration_method_m(integration_method),
solver_m(""),
- isFirstRepartition_m(true),
+ isFirstRepartition_m(true),
qi_m(qi),
mi_m(mi),
rmsDensity_m(0.0),
@@ -267,9 +267,10 @@ public:
this->origin_m = -3.0;
this->dt_m = 0.5 / this->nr_m[2];
- this->setFieldContainer(std::make_shared<FieldContainer_t>(
- this->hr_m, this->rmin_m, this->rmax_m, this->decomp_m, this->domain_m, this->origin_m,
- isAllPeriodic));
+ rmin_m = origin_m;
+ rmax_m = origin_m + length;
+
+ this->setFieldContainer( std::make_shared<FieldContainer_t>(hr_m, rmin_m, rmax_m, decomp_m, domain_m, origin_m, isAllPeriodic) );
this->setParticleContainer(std::make_shared<ParticleContainer_t>(
this->fcontainer_m->getMesh(), this->fcontainer_m->getFL()));
@@ -382,7 +383,13 @@ public:
}
void gatherCIC() {
- gather(this->pcontainer_m->E, this->fcontainer_m->getE(), this->pcontainer_m->R);
+/*
+ using Base = ippl::ParticleBase<ippl::ParticleSpatialLayout<T, Dim>>;
+ typename Base::particle_position_type* Ep = &this->pcontainer_m->E;
+ typename Base::particle_position_type* R = &this->pcontainer_m->R;
+ VField_t<T, Dim>* Ef = &this->fcontainer_m->getE();
+ gather(*Ep, *Ef, *R);
+*/
}
void scatterCIC();
diff --git a/src/Track/TrackRun.cpp b/src/Track/TrackRun.cpp
index 020f7a326..3be62f732 100644
--- a/src/Track/TrackRun.cpp
+++ b/src/Track/TrackRun.cpp
@@ -313,7 +313,7 @@ void TrackRun::execute() {
sampler_m->generateParticles(Np, nr);
- /*
+ /*
reset the fieldsolver with correct hr_m
based on the distribution
*/
--
GitLab