GitLab

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

This reverts commit 41047061.

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

CMakeLists fix for Intel compiler + DKS, ParaleTTracker DKS update for numparticlesinsimulation after material

don't rotate the bunch if you're in a follow-up track or in restart (though does not work inside bend)

removing 'using namespace', 'using somenamespace::function' and 'using somenamespace::class' from headerfiles

- moving the following classes over from OPAL to CLASSIC
  o OpalField       -> ClassicField
  o OpalRing        -> Ring
  o OpalRingSection -> RingSection
  o LossDataSink
- clean up
- splitting Options into classic and opal options

fix proplem when running in parallel RestartTest-1 was proken. Not sure I understand 100% why I need this

This allows to specify collimator losses as an objective. CHK wrote the original part, I did 
minor modifications. I tested with BeamLine-1 from the regressiontests so far only with one core.
 

- 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

- improve check if sections are glued together