src/AbsBeamline/Component.h

@@ -22,6 +22,30 @@
 // $Author: fci $
 //
 // ------------------------------------------------------------------------
+
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 #include "AbsBeamline/ElementBase.h"
 #include "Fields/EMField.h"
 #include "OPALTypes.h"

src/AbsBeamline/Corrector.cpp

@@ -20,7 +20,7 @@
 
 #include "AbsBeamline/Corrector.h"
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Utilities/GeneralClassicException.h"
 #include "Utilities/Util.h"

src/AbsBeamline/Drift.cpp

@@ -20,7 +20,7 @@
 
 #include "AbsBeamline/Drift.h"
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 
 extern Inform *gmsg;
 

src/AbsBeamline/Drift.h

@@ -23,6 +23,29 @@
 
 #include "AbsBeamline/Component.h"
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 // Class Drift
 // ------------------------------------------------------------------------
 /// Interface for drift space.
@@ -70,4 +93,4 @@ inline int Drift::getRequiredNumberOfTimeSteps() const {
     return 1;
 }
 
-#endif  // CLASSIC_Drift_HH
\ No newline at end of file
+#endif  // CLASSIC_Drift_HH

src/AbsBeamline/ElementBase.cpp

@@ -64,8 +64,54 @@
 
 #include "Channels/Channel.h"
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 #include <boost/filesystem.hpp>
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 const std::map<ElementType, std::string> ElementBase::elementTypeToString_s = {
     {ElementType::ANY, "Any"},
     {ElementType::BEAMLINE, "Beamline"},

src/AbsBeamline/ElementBase.h

@@ -63,6 +63,29 @@
 #ifndef CLASSIC_ElementBase_HH
 #define CLASSIC_ElementBase_HH
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 #include "AbsBeamline/AttributeSet.h"
 #include "Algorithms/CoordinateSystemTrafo.h"
 #include "Algorithms/Quaternion.hpp"

src/AbsBeamline/Monitor.cpp

@@ -19,7 +19,7 @@
 
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "AbstractObjects/OpalData.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Fields/Fieldmap.h"
 #include "Physics/Physics.h"
 #include "Structure/LossDataSink.h"
@@ -223,4 +223,4 @@ void Monitor::writeStatistics() {
     }
 
     statFileEntries_sm.clear();
-}
\ No newline at end of file
+}

src/AbsBeamline/Monitor.h

@@ -19,7 +19,7 @@
 #define CLASSIC_Monitor_HH
 
 #include "AbsBeamline/Component.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "BeamlineGeometry/StraightGeometry.h"
 #include "Structure/LossDataSink.h"
 
@@ -64,6 +64,10 @@ public:
     virtual bool apply(
         const size_t& i, const double& t, Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
 
+    virtual bool apply(
+        const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
+	Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
+
     virtual bool applyToReferenceParticle(
         const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
         Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
@@ -119,4 +123,4 @@ inline bool Monitor::isInside(const Vector_t<double, 3>& r) const {
     return std::abs(r(2)) <= 0.5 * length && isInsideTransverse(r);
 }
 
-#endif  // CLASSIC_Monitor_HH
\ No newline at end of file
+#endif  // CLASSIC_Monitor_HH

src/AbsBeamline/Multipole.cpp

@@ -19,7 +19,7 @@
 
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "Fields/Fieldmap.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Utilities/GeneralClassicException.h"
 

src/AbsBeamline/Multipole.h

@@ -23,6 +23,29 @@
 #include "BeamlineGeometry/StraightGeometry.h"
 #include "Fields/BMultipoleField.h"
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 class Fieldmap;
 
 // Class Multipole
@@ -160,4 +183,4 @@ inline size_t Multipole::getMaxSkewComponentIndex() const {
     return SkewComponents.size();
 }
 
-#endif  // CLASSIC_Multipole_HH
\ No newline at end of file
+#endif  // CLASSIC_Multipole_HH

src/AbsBeamline/MultipoleTBase.cpp

@@ -250,4 +250,4 @@ double MultipoleTBase::getFnDerivS(const std::size_t &n,
     deriv += -1. * getFn(n, x, s + 2. * stepSize);
     deriv /= 12 * stepSize;
     return deriv;
-}
\ No newline at end of file
+}

src/AbsBeamline/MultipoleTBase.h

@@ -79,6 +79,30 @@
 #include "AbsBeamline/Component.h"
 #include "AbsBeamline/EndFieldModel/Tanh.h"
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
+
 #include "Fields/BMultipoleField.h"
 
 class MultipoleTBase : public Component {

src/AbsBeamline/MultipoleTCurvedConstRadius.h

@@ -75,6 +75,29 @@
   * ---------------------------------------------------------------------
   */
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 #include "BeamlineGeometry/PlanarArcGeometry.h"
 #include "AbsBeamline/MultipoleTBase.h"
 #include "AbsBeamline/MultipoleTFunctions/RecursionRelation.h"

src/AbsBeamline/MultipoleTCurvedVarRadius.cpp

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-
+#include <experimental/source_location>
 #include <vector>
 #include "gsl/gsl_sf_pow_int.h"
 #include "MultipoleTCurvedVarRadius.h"

src/AbsBeamline/MultipoleTCurvedVarRadius.h

@@ -76,6 +76,31 @@
   * ---------------------------------------------------------------------
   */
 
+
+
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 #include "BeamlineGeometry/VarRadiusGeometry.h"
  
 #include "AbsBeamline/MultipoleTBase.h"

src/AbsBeamline/MultipoleTStraight.cpp

@@ -26,7 +26,6 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "gsl/gsl_sf_gamma.h"
 #include "gsl/gsl_sf_pow_int.h"
 #include "MultipoleTStraight.h"

src/AbsBeamline/MultipoleTStraight.h

@@ -79,6 +79,29 @@
 #include "AbsBeamline/MultipoleTBase.h"
 #include <vector>
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 class MultipoleTStraight: public MultipoleTBase {
 public: 
     /** Constructor