rename runtime twistVectorAxes to twistComponents

Author: Heikman

src/libPMacc/include/cuSTL/cursor/accessor/TwistAxesAccessor.hpp

@@ -23,7 +23,7 @@
 #pragma once
 
 #include "types.h"
-#include "math/vector/tools/twistVectorAxes.hpp"
+#include "math/vector/twistComponents.hpp"
 
 namespace PMacc
 {
@@ -33,7 +33,7 @@ namespace cursor
 template<typename TCursor, typename Axes>
 struct TwistAxesAccessor
 {
-    typedef typename math::tools::result_of::TwistVectorAxes<
+    typedef typename math::result_of::TwistComponents<
         Axes, typename TCursor::pureType>::type type;
 
     /** Returns a reference to the result of '*cursor' (with twisted axes).
@@ -43,7 +43,7 @@ struct TwistAxesAccessor
      */
     HDINLINE type operator()(TCursor& cursor)
     {
-        return math::tools::twistVectorAxes<Axes>(*cursor);
+        return math::twistComponents<Axes>(*cursor);
     }
 
     ///\todo: implement const method here with a const TCursor& argument and 'type' as return type.

…de/math/vector/tools/twistVectorAxes.hpp …/include/math/vector/twistComponents.hppsrc/libPMacc/include/math/vector/tools/twistVectorAxes.hpp renamed to src/libPMacc/include/math/vector/twistComponents.hpp src/libPMacc/include/math/vector/tools/twistVectorAxes.hpp renamed to src/libPMacc/include/math/vector/twistComponents.hpp

@@ -29,25 +29,23 @@ namespace PMacc
 {
 namespace math
 {
-namespace tools
-{
 
 namespace result_of
 {
 
 template<typename T_Axes,
 typename T_Vector>
-struct TwistVectorAxes
+struct TwistComponents
 {
-    typedef typename TwistVectorAxes<T_Axes,typename T_Vector::This>::type type;
+    typedef typename TwistComponents<T_Axes,typename T_Vector::This>::type type;
     };
 
 template<typename T_Axes,
 typename T_Type, int T_Dim,
 typename T_Accessor,
 typename T_Navigator,
 template <typename, int> class T_Storage>
-struct TwistVectorAxes<T_Axes,math::Vector<T_Type,T_Dim,T_Accessor,T_Navigator,T_Storage> >
+struct TwistComponents<T_Axes,math::Vector<T_Type,T_Dim,T_Accessor,T_Navigator,T_Storage> >
 {
     typedef math::Vector<T_Type, T_Dim, T_Accessor,
             math::StackedNavigator<T_Navigator, math::PermutedNavigator<T_Axes> >,T_Storage >& type;
@@ -69,15 +67,14 @@ struct TwistVectorAxes<T_Axes,math::Vector<T_Type,T_Dim,T_Accessor,T_Navigator,T
  */
 template<typename T_Axes, typename T_Vector>
 HDINLINE
-typename result_of::TwistVectorAxes<T_Axes, T_Vector>::type
-twistVectorAxes(T_Vector& vector)
+typename result_of::TwistComponents<T_Axes, T_Vector>::type
+twistComponents(T_Vector& vector)
 {
     /* The reinterpret_cast is valid because the target type is the same as the
      * input type except its navigator policy which does not occupy any memory though.
      */
-    return reinterpret_cast<typename result_of::TwistVectorAxes<T_Axes, T_Vector>::type>(vector);
+    return reinterpret_cast<typename result_of::TwistComponents<T_Axes, T_Vector>::type>(vector);
 }
 
-} // tools
 } // math
 } // PMacc

src/picongpu/include/fields/MaxwellSolver/DirSplitting/DirSplitting.hpp

@@ -103,7 +103,7 @@ class DirSplitting : private ConditionCheck<fieldSolver::FieldSolver>
                               -GuardDim().toRT()));
 
         using namespace cursor::tools;
-        using namespace PMacc::math::tools;
+        using namespace PMacc::math;
 
         PMacc::math::Size_t<3> gridSize = fieldE_coreBorder.size();
 
@@ -117,15 +117,15 @@ class DirSplitting : private ConditionCheck<fieldSolver::FieldSolver>
         typedef PMacc::math::CT::Int<1,2,0> Orientation_Y;
         propagate(twistVectorFieldAxes<Orientation_Y>(fieldE_coreBorder.origin()),
                   twistVectorFieldAxes<Orientation_Y>(fieldB_coreBorder.origin()),
-                  twistVectorAxes<Orientation_Y>(gridSize));
+                  twistComponents<Orientation_Y>(gridSize));
 
         __setTransactionEvent(fieldE.asyncCommunication(__getTransactionEvent()));
         __setTransactionEvent(fieldB.asyncCommunication(__getTransactionEvent()));
 
         typedef PMacc::math::CT::Int<2,0,1> Orientation_Z;
         propagate(twistVectorFieldAxes<Orientation_Z>(fieldE_coreBorder.origin()),
                   twistVectorFieldAxes<Orientation_Z>(fieldB_coreBorder.origin()),
-                  twistVectorAxes<Orientation_Z>(gridSize));
+                  twistComponents<Orientation_Z>(gridSize));
 
         if (laserProfile::INIT_TIME > float_X(0.0))
             dc.getData<FieldE > (FieldE::getName(), true).laserManipulation(currentStep);

src/picongpu/include/plugins/SliceFieldPrinter.tpp

@@ -34,7 +34,6 @@
 #include "cuSTL/algorithm/host/Foreach.hpp"
 #include "lambda/Expression.hpp"
 #include "SliceFieldPrinter.hpp"
-#include <math/vector/tools/twistVectorAxes.hpp>
 #include <sstream>
 
 namespace picongpu
@@ -124,7 +123,6 @@ template<typename TField>
 void SliceFieldPrinter<Field>::printSlice(const TField& field, int nAxis, float slicePoint, std::string filename)
 {
     namespace vec = PMacc::math;
-    using namespace vec::tools;
 
     PMacc::GridController<simDim>& con = PMacc::Environment<simDim>::get().GridController();
     vec::Size_t<simDim> gpuDim = (vec::Size_t<simDim>)con.getGpuNodes();

src/picongpu/include/plugins/SliceFieldPrinterMulti.tpp

@@ -36,7 +36,6 @@
 #include "cuSTL/algorithm/host/Foreach.hpp"
 #include "lambda/Expression.hpp"
 #include "SliceFieldPrinterMulti.hpp"
-#include <math/vector/tools/twistVectorAxes.hpp>
 #include <sstream>
 
 namespace picongpu