GitLab

start setting up structures for a THICK Tracker. Reuse some of the PARALLEL-T trackers routines to get things started. Need to move common routines to Track if we will use them for more than the prototype. The THICK tracker is a MSc thesis and will reside in a own branch as soon as the structure is ready

- 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

src/AbstractObjects/OpalData.cpp
src/AbstractObjects/OpalData.h
src/Track/TrackRun.cpp

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!

- remove 'using namespace' from header files
- remove 'using std::string' and 'using std::abs' from header files

For reason see:
o http://stackoverflow.com/questions/5849457/using-namespace-in-c-headers

Number of impacts are not integrated anymore, now we have impacts per timestep
OpalData can be asked if a global Geometry is avaidable

In OPAL several different TRACK's can performed within one simulation (does not hold for OPAL-cycl yet) this together with 
the restart capabilities calls for a delicate logic.

Different tracks, looks like: 

.....

TRACK, LINE= Injector, BEAM=beam1, MAXSTEPS=100, DT=1.0e-12, ZSTOP=0.14;  
 RUN, METHOD = "PARALLEL-T", BEAM = beam1, FIELDSOLVER = Fs1, DISTRIBUTION = Dist1;
ENDTRACK;

TRACK,LINE= Injector, BEAM=beam1, MAXSTEPS=50, DT=1.0e-11, ZSTOP=0.20;
 RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1;
ENDTRACK;
STOP;

A run with the arguments -restart -1 will continue a track from the last dump in the h5 file. Other the from the last track will
at the moment certainly fail in the general case. 

Changes: 

- The h5 attribute TrackStep is not longer available anymore. Two new attributes: LocalTrackStep and GlobalTrackStep are introduced instead.

- LocalTrackStep refers to the track step in a track command (0 ... 99 and 0... 49 in teh above example), where the GlobalTrackStep is the 
accumulated number of steps i.e. 0 ... 149, shown in OPAL's screen output. Both local and global track steps are also written into the h5 file 
in order to properly restart the simulation.

- The PartBunch object has get/set and increment functions:

    inline void setGlobalTrackStep(long long n) {globalTrackStep_m = n;}
    inline long long getGlobalTrackStep() const {return globalTrackStep_m;}

    inline void setLocalTrackStep(long long n) {localTrackStep_m = n;}
    inline long long getLocalTrackStep() const {return localTrackStep_m;}
    inline void incLocalTrackStep() {localTrackStep_m++; globalTrackStep_m++;)

        
- In OPAL-cyc getTrackStep is replace by getLocalTrackStep assuming we only have one TRACK in the simulation.

- In the ParallelTTracker at the end of the main loop (in execute()) obsolet code is removed (cleanup monitors etc.)
  
For details see the diff :-)

Still some work todo: 

a) Need to remove: setLastStep in ParallelTTracker.cpp and in general

    getInstance()->getLastStep()
    getInstance()->getRestartStep() maybe not!

b) The get/set and increment functions could very well be in an other class!

c) ParallelPlate tests are broken but maybe also because of other changes need to fix this 
   together with Chuang and Achim

d) Make sure the restart works in OPAL-cycl we do not have yet a regression test for that.

Merge branch 'develop' into svn: more pretty printing; change variable names to comply with (unfortunately missing) coding style (Use descriptive names)

- use forward declaration where possible
- remove unused includes

    - removing unused file
    - moved fieldlayout, mesh and layout to OpalData
    - started using smart pointers, removed lots of issues with destructors