GitLab

first version of multi-slit/pepperpot/what ever aka flexible collimator. However way to slow to be practical

modified:   src/Classic/Algorithms/PartBunchBase.h
modified:   src/Classic/Algorithms/PartBunchBase.hpp
modified:   src/Structure/H5PartWrapperForPC.cpp

This reverts commit 69985bb1.

- remove potential timer in PartBunchBase since it's not used in PartBunch.
  Add timer to AmrObject instead.

- return earlier in "compute-self-field" methods if no solver attached.

- add cpp file for AmrObject class.

modified:   src/Amr/AmrBoxLib.cpp
new file:   src/Amr/AmrObject.cpp
modified:   src/Amr/AmrObject.h
modified:   src/Amr/CMakeLists.txt
modified:   src/Classic/Algorithms/AmrPartBunch.cpp
modified:   src/Classic/Algorithms/PartBunchBase.h

steps toward DC beams; don't double the size of the grid in z-direction and fix it to the wave length of the RF.
'

- add "allreduce" and "reduce" functions
- remove unused variable "minLocNum_m"
- use new communication methods in PartBunchBase<T, Dim>::calcMoments()
  and PartBunchBase<T, Dim>::calcBeamParameters()

modified:   CMakeLists.txt
modified:   GlobalComm.h
modified:   GlobalComm.hpp
new file:   Operations.h
modified:   ../../../src/Classic/Algorithms/PartBunchBase.h
modified:   ../../../src/Classic/Algorithms/PartBunchBase.hpp

- replace "allreduce" with gather.
- remove partPerNode_m

new file:   DataTypes.h
modified:   GlobalComm.h
modified:   GlobalComm.hpp
modified:   ../../../src/Classic/Algorithms/PartBunchBase.h
modified:   ../../../src/Classic/Algorithms/PartBunchBase.hpp

modified:   src/Amr/AmrBoxLib.cpp
modified:   src/Amr/AmrBoxLib.h
modified:   src/Amr/AmrObject.h
modified:   src/Classic/Algorithms/AmrPartBunch.cpp
modified:   src/Classic/Algorithms/AmrPartBunch.h
modified:   src/Classic/Algorithms/PartBunchBase.h

- avoid dynamic_cast every time self-field is computed
- OPAL coding style of enum

- additional OPAL input option: AMR

Modified files:

modified:   src/AbstractObjects/OpalData.cpp
modified:   src/AbstractObjects/OpalData.h
modified:   src/Algorithms/AutophaseTracker.h
modified:   src/Algorithms/BeamBeam3D.cpp
modified:   src/Algorithms/BeamBeam3D.h
modified:   src/Algorithms/CavityAutophaser.cpp
modified:   src/Algorithms/MPSplitIntegrator.cpp
modified:   src/Algorithms/MPSplitIntegrator.h
modified:   src/Algorithms/NilTracker.h
modified:   src/Algorithms/ParallelCyclotronTracker.cpp
modified:   src/Algorithms/ParallelCyclotronTracker.h
modified:   src/Algorithms/ParallelTTracker.cpp
modified:   src/Algorithms/ParallelTTracker.h
modified:   src/Algorithms/ThickTracker.cpp
modified:   src/Algorithms/ThickTracker.h
modified:   src/Algorithms/bet/EnvelopeBunch.cpp
modified:   src/Algorithms/bet/EnvelopeBunch.h
modified:   src/BasicActions/Option.cpp
modified:   src/Classic/AbsBeamline/Collimator.cpp
modified:   src/Classic/AbsBeamline/Collimator.h
modified:   src/Classic/AbsBeamline/Component.cpp
modified:   src/Classic/AbsBeamline/Component.h
modified:   src/Classic/AbsBeamline/Integrator.h
modified:   src/Classic/AbsBeamline/Probe.cpp
modified:   src/Classic/AbsBeamline/Probe.h
modified:   src/Classic/AbsBeamline/Ring.cpp
modified:   src/Classic/AbsBeamline/Ring.h
modified:   src/Classic/AbsBeamline/Septum.cpp
modified:   src/Classic/AbsBeamline/Septum.h
modified:   src/Classic/AbsBeamline/Source.cpp
modified:   src/Classic/AbsBeamline/Stripper.cpp
modified:   src/Classic/AbsBeamline/Stripper.h
modified:   src/Classic/Algorithms/AmrPartBunch.cpp
modified:   src/Classic/Algorithms/AmrPartBunch.h
modified:   src/Classic/Algorithms/MapIntegrator.cpp
modified:   src/Classic/Algorithms/MapIntegrator.h
modified:   src/Classic/Algorithms/OrbitTracker.cpp
modified:   src/Classic/Algorithms/PBunchDefs.h
modified:   src/Classic/Algorithms/PartBunch.cpp
modified:   src/Classic/Algorithms/PartBunch.h
modified:   src/Classic/Algorithms/PartBunchBase.h
modified:   src/Classic/Algorithms/PartBunchBase.hpp
modified:   src/Classic/Algorithms/ThinTracker.cpp
modified:   src/Classic/Algorithms/ThinTracker.h
modified:   src/Classic/Algorithms/Tracker.cpp
modified:   src/Classic/Algorithms/Tracker.h
modified:   src/Classic/Solvers/CSRIGFWakeFunction.cpp
modified:   src/Classic/Solvers/CSRIGFWakeFunction.hh
modified:   src/Classic/Solvers/CSRWakeFunction.cpp
modified:   src/Classic/Solvers/CSRWakeFunction.hh
modified:   src/Classic/Solvers/CollimatorPhysics.cpp
modified:   src/Classic/Solvers/CollimatorPhysics.hh
modified:   src/Classic/Solvers/GreenWakeFunction.cpp
modified:   src/Classic/Solvers/GreenWakeFunction.hh
modified:   src/Classic/Solvers/SurfacePhysicsHandler.hh
modified:   src/Classic/Solvers/WakeFunction.hh
modified:   src/Classic/Utilities/Options.cpp
modified:   src/Classic/Utilities/Options.h
modified:   src/Distribution/Distribution.cpp
modified:   src/Distribution/Distribution.h
modified:   src/Expressions/Expressions.cpp
modified:   src/Solvers/AmrPoissonSolver.h
modified:   src/Solvers/FFTBoxPoissonSolver.h
modified:   src/Solvers/FFTPoissonSolver.h
modified:   src/Solvers/MGPoissonSolver.h
modified:   src/Solvers/P3MPoissonSolver.cpp
modified:   src/Solvers/P3MPoissonSolver.h
modified:   src/Solvers/PoissonSolver.h
modified:   src/Structure/BoundaryGeometry.cpp
modified:   src/Structure/BoundaryGeometry.h
modified:   src/Structure/DataSink.cpp
modified:   src/Structure/DataSink.h
modified:   src/Structure/FieldSolver.cpp
modified:   src/Structure/FieldSolver.h
modified:   src/Structure/H5PartWrapper.h
modified:   src/Structure/H5PartWrapperForPC.cpp
modified:   src/Structure/H5PartWrapperForPC.h
modified:   src/Structure/H5PartWrapperForPS.cpp
modified:   src/Structure/H5PartWrapperForPS.h
modified:   src/Structure/H5PartWrapperForPT.cpp
modified:   src/Structure/H5PartWrapperForPT.h
modified:   src/Track/Track.cpp
modified:   src/Track/Track.h
modified:   src/Track/TrackRun.cpp
modified:   src/Track/TrackSave.cpp
modified:   src/Track/TrackStart.cpp

Move

- boundp()
- boundp_destroy()
- boundp_destroyT()
- destroyT()

into PartBunchBase using helper functions

- updateDomainLength()
- updateFields(const Vector_t&, const Vector_t&)

modified:   ../../../src/AmrParticle/AmrParticleBase.h
new file:   ../../../src/Particle/AbstractParticle.h
modified:   ../../../src/Particle/IpplParticleBase.h
modified:   ../../../src/Particle/IpplParticleBase.hpp
new file:   ../../../../src/Classic/Algorithms/AbstractBunch.h
new file:   ../../../../src/Classic/Algorithms/PartBunchBase.h
new file:   ../../../../src/Classic/Algorithms/PartBunchBase.hpp

in src/ippl/Particle/IpplParticleBase:

- virtual void update();
- virtual void update(const ParticleAttrib<char>& canSwap);

in src/Classic/Algorithms/PartBunch:

- virtual void computeSelfFields();
- virtual void computeSelfFields(int b);
- virtual void computeSelfFields_cycl(double gamma);
- virtual void computeSelfFields_cycl(int b);

due to inherited class AmrPartBunch.

We need this abstract base class in order to either instantiate
a "normal" PartBunch or an AmrPartBunch.

new file:   AmrPartBunch.h
new file:   AmrPartBunch.cpp
new file:   PartBunchBase.h
new file:   PartBunchBase.cpp