GitLab

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

This reverts commit 69985bb1.

modified:   Algorithms/NilTracker.h
modified:   Algorithms/ParallelCyclotronTracker.cpp
modified:   Algorithms/ParallelCyclotronTracker.h
modified:   Algorithms/ParallelTTracker.cpp
modified:   Algorithms/ParallelTTracker.h
modified:   Algorithms/ThickTracker.cpp
modified:   Algorithms/ThickTracker.h
modified:   Classic/Algorithms/ThinTracker.cpp
modified:   Classic/Algorithms/ThinTracker.h
modified:   Classic/Algorithms/Tracker.cpp
modified:   Classic/Algorithms/Tracker.h
modified:   Track/TrackRun.cpp

adding option SCALABLE to distribution to make generation scalable. Time dependency and scalability can be chosen independently

- 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

this covers issue #71 to some extend in OPAL-1.6. A more thorrow solution should be discussed in Erice  Issue #47

fixing problem with 3D fieldmaps that start at z < 0; adjust its behavior in this respect to what the other fieldmap typed do

Transform particles first to the elements local coordinate system, then compute Particle-Matter interaction

ParallelTTracker. Particle-Matter interaction doesn't work either at the moment.

I hope that I didn't create too much of a mess when merging!

- There were some code changes done that were
  not part of Tulin's code. It got now also removed.
  All rest of AMR should be reusable.

modified:   src/Algorithms/ParallelTTracker.cpp
modified:   src/Algorithms/ParallelTTracker.h
modified:   src/Structure/FieldSolver.cpp
modified:   src/Structure/FieldSolver.h
modified:   src/Track/TrackRun.cpp
modified:   src/Track/TrackRun.h

modified:   CMakeLists.txt
modified:   src/Algorithms/ParallelTTracker.cpp
modified:   src/Algorithms/ParallelTTracker.h
modified:   src/CMakeLists.txt
deleted:    src/Solvers/amr/Accel.H
deleted:    src/Solvers/amr/Accel.cpp
deleted:    src/Solvers/amr/AccelBld.cpp
deleted:    src/Solvers/amr/AccelParticles.cpp
deleted:    src/Solvers/amr/Accel_F.H
deleted:    src/Solvers/amr/Accel_advance.cpp
deleted:    src/Solvers/amr/Accel_error.cpp
deleted:    src/Solvers/amr/Accel_error_F.H
deleted:    src/Solvers/amr/Accel_output.cpp
deleted:    src/Solvers/amr/Accel_setup.cpp
deleted:    src/Solvers/amr/BoundaryDomain.h
deleted:    src/Solvers/amr/CMakeLists.txt
deleted:    src/Solvers/amr/Derive_F.H
deleted:    src/Solvers/amr/ElectroMagneticParticleClass.H
deleted:    src/Solvers/amr/Electrostatic.H
deleted:    src/Solvers/amr/Electrostatic.cpp
deleted:    src/Solvers/amr/Electrostatic_F.H
deleted:    src/Solvers/amr/ExternalFields.cpp
deleted:    src/Solvers/amr/ParticleDerive.cpp
deleted:    src/Solvers/amr/Src_3d/Derive_3d.f90
deleted:    src/Solvers/amr/Src_3d/Electrostatic_3d.f90
deleted:    src/Solvers/amr/Src_3d/Make.package
deleted:    src/Solvers/amr/Src_3d/Nyx_3d.f90
deleted:    src/Solvers/amr/Src_3d/ProbInit.f90
deleted:    src/Solvers/amr/Src_3d/Tagging_3d.f90
deleted:    src/Solvers/amr/Src_3d/bc_fill_3d.f90
deleted:    src/Solvers/amr/TrilinosSolver.cpp
deleted:    src/Solvers/amr/TrilinosSolver.h
deleted:    src/Solvers/amr/init_trilinos.cpp
deleted:    src/Solvers/amr/main.cpp
modified:   src/Structure/FieldSolver.cpp
modified:   src/Structure/FieldSolver.h
modified:   src/Track/TrackRun.cpp