Skip to content

Changing Template variable in PicManager #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changing Template variable in PicManager #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions alpine/AlpineManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "LoadBalancer.hpp"
#include "Manager/BaseManager.h"
#include "Manager/PicManager.h"
#include "Manager/FieldSolverBase.h"
#include "ParticleContainer.hpp"
#include "Random/Distribution.h"
#include "Random/InverseTransformSampling.h"
Expand All @@ -19,7 +20,7 @@ using view_type = typename ippl::detail::ViewType<ippl::Vector<double, Dim>, 1>:
template <typename T, unsigned Dim>
class AlpineManager
: public ippl::PicManager<T, Dim, ParticleContainer<T, Dim>, FieldContainer<T, Dim>,
LoadBalancer<T, Dim>> {
LoadBalancer<T, Dim>, ippl::FieldSolverBase<T, Dim>> {
public:
using ParticleContainer_t = ParticleContainer<T, Dim>;
using FieldContainer_t = FieldContainer<T, Dim>;
Expand All @@ -35,7 +36,7 @@ class AlpineManager
std::string stepMethod_m;
public:
AlpineManager(size_type totalP_, int nt_, Vector_t<int, Dim>& nr_, double lbt_, std::string& solver_, std::string& stepMethod_)
: ippl::PicManager<T, Dim, ParticleContainer<T, Dim>, FieldContainer<T, Dim>, LoadBalancer<T, Dim>>()
: ippl::PicManager<T, Dim, ParticleContainer<T, Dim>, FieldContainer<T, Dim>, LoadBalancer<T, Dim>, ippl::FieldSolverBase<T, Dim>>()
, totalP_m(totalP_)
, nt_m(nt_)
, nr_m(nr_)
Expand Down
10 changes: 5 additions & 5 deletions src/Manager/PicManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <memory>
#include "Manager/BaseManager.h"
#include "Decomposition/OrthogonalRecursiveBisection.h"
#include "Manager/FieldSolverBase.h"

namespace ippl {

Expand All @@ -21,8 +20,9 @@
* @tparam pc The particle container type.
* @tparam fc The field container type.
* @tparam orb The load balancer type.
* @tparam fs The field solver type.
*/
template <typename T, unsigned Dim, class pc, class fc, class orb>
template <typename T, unsigned Dim, class pc, class fc, class orb, class fs>
class PicManager : public BaseManager {
public:
PicManager()
Expand Down Expand Up @@ -60,11 +60,11 @@
fcontainer_m = fcontainer;
}

std::shared_ptr<ippl::FieldSolverBase<T, Dim>> getFieldSolver() {
std::shared_ptr<fs> getFieldSolver() {
return fsolver_m;
}

void setFieldSolver(std::shared_ptr<ippl::FieldSolverBase<T, Dim>> fsolver) {
void setFieldSolver(std::shared_ptr<fs> fsolver) {
fsolver_m = fsolver;
}

Expand All @@ -83,7 +83,7 @@

std::shared_ptr<orb> loadbalancer_m;

std::shared_ptr<ippl::FieldSolverBase<T, Dim>> fsolver_m;
std::shared_ptr<fs> fsolver_m;

};
} // namespace ippl
Expand Down