Merge pull request ComputationalRadiationPhysics#885 from BenjaminW3/refactorPMacc

Further refactor libPMacc

Author: psychocoderHPC

src/libPMacc/include/algorithms/ForEach.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2014 Axel Huebl, Heiko Burau, Rene Widera
+ * Copyright 2013-2015 Axel Huebl, Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -24,14 +24,7 @@
 #pragma once
 
 #include "compileTime/accessors/Identity.hpp"
-
-#include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/next_prior.hpp>
-#include <boost/mpl/deref.hpp>
-#include <boost/mpl/bind.hpp>
-#include <boost/type_traits.hpp>
-
-#include <boost/mpl/if.hpp>
+#include "forward.hpp"
 
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
@@ -46,7 +39,12 @@
 #include <boost/preprocessor/repetition/enum_trailing.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/transform.hpp>
-#include "forward.hpp"
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/begin_end.hpp>
+#include <boost/mpl/next_prior.hpp>
+#include <boost/mpl/deref.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/type_traits.hpp>
 
 
 /* Help to read this file:

src/libPMacc/include/communication/ICommunicator.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Rene Widera, Wolfgang Hoenig
+ * Copyright 2013, 2015 Rene Widera, Wolfgang Hoenig, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,14 +20,12 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
 
-#ifndef _ICOMMUNICATOR_HPP
-#define	_ICOMMUNICATOR_HPP
+#include "types.h"
 
 #include <mpi.h>
 
-#include "types.h"
-
 namespace PMacc
 {
 
@@ -82,7 +80,3 @@ class ICommunicator
 };
 
 } //namespace PMacc
-
-
-#endif	/* _ICOMMUNICATOR_HPP */
-

src/libPMacc/include/compileTime/AllCombinations.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Rene Widera
+ * Copyright 2014-2015 Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -22,22 +22,19 @@
 
 #pragma once
 
-#include "types.h"
 #include "compileTime/conversion/SeqToMap.hpp"
 #include "compileTime/conversion/TypeToAliasPair.hpp"
 #include "compileTime/conversion/TypeToPair.hpp"
 #include "compileTime/conversion/MakeSeqFromNestedSeq.hpp"
 #include "compileTime/conversion/MakeSeq.hpp"
+#include "math/Vector.hpp"
+#include "types.h"
+
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/copy.hpp>
-
-#include <boost/mpl/assert.hpp>
 #include <boost/mpl/pop_back.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include "math/Vector.hpp"
-
 namespace PMacc
 {
 namespace bmpl = boost::mpl;

src/libPMacc/include/compileTime/GetKeyFromAlias.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Rene Widera
+ * Copyright 2013, 2015 Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -22,22 +22,19 @@
 
 #pragma once
 
-#include "types.h"
 #include "compileTime/conversion/SeqToMap.hpp"
 #include "compileTime/conversion/TypeToAliasPair.hpp"
 #include "compileTime/conversion/TypeToPair.hpp"
+#include "static_assert.hpp"
+#include "types.h"
+
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/copy.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace PMacc
 {
 
-
-
 template<typename T_MPLSeq,
          typename T_Key
 >

src/libPMacc/include/cuSTL/algorithm/kernel/detail/SphericMapper.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Heiko Burau, Rene Widera
+ * Copyright 2013-2015 Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,11 +20,11 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ALGORITHM_KERNEL_DETAIL_SPHERICMAPPER_HPP
-#define ALGORITHM_KERNEL_DETAIL_SPHERICMAPPER_HPP
+#pragma once
 
-#include "types.h"
 #include "math/vector/Size_t.hpp"
+#include "types.h"
+
 #include <boost/mpl/void.hpp>
 
 namespace PMacc
@@ -216,5 +216,3 @@ struct SphericMapper<3, mpl::void_>
 } // kernel
 } // algorithm
 } // PMacc
-
-#endif // ALGORITHM_KERNEL_DETAIL_SPHERICMAPPER_HPP

src/libPMacc/include/cuSTL/algorithm/mpi/Gather.tpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013, 2015 Heiko Burau
+ * Copyright 2013, 2015 Heiko Burau, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -21,23 +21,24 @@
  */
 
 #include "mappings/simulation/GridController.hpp"
-#include <iostream>
 #include "cuSTL/container/copier/Memcopy.hpp"
 #include "communication/manager_common.h"
 
+#include <iostream>
+
 namespace PMacc
 {
 namespace algorithm
 {
 namespace mpi
 {
-    
+
 namespace GatherHelper
 {
-    
+
 /** @tparam dim dimension of mpi cluster
  *  @tparam memDim dimension of memory to be gathered
- * 
+ *
  * if memDim == dim - 1 then ``dir`` indicates the direction (orientation)
  * of the (meta)plane.
  */

src/libPMacc/include/cuSTL/container/compile-time/SharedBuffer.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Heiko Burau, Rene Widera
+ * Copyright 2013, 2015 Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,8 +20,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONTAINER_CT_SHAREDBUFFER_HPP
-#define CONTAINER_CT_SHAREDBUFFER_HPP
+#pragma once
 
 #include "CartBuffer.hpp"
 #include "../allocator/compile-time/SharedMemAllocator.hpp"
@@ -46,5 +45,3 @@ struct SharedBuffer
 } // CT
 } // container
 } // PMacc
-
-#endif // CONTAINER_CT_SHAREDBUFFER_HPP

src/libPMacc/include/cuSTL/container/copier/D2DCopier.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Heiko Burau, Rene Widera
+ * Copyright 2013, 2015 Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,8 +20,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COPIER_D2DCOPIER_HPP
-#define COPIER_D2DCOPIER_HPP
+#pragma once
 
 #include "Memcopy.hpp"
 #include <types.h>
@@ -47,5 +46,3 @@ struct D2DCopier
 
 } // copier
 } // PMacc
-
-#endif // COPIER_D2DCOPIER_HPP

src/libPMacc/include/cuSTL/container/copier/H2HCopier.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Heiko Burau, Rene Widera
+ * Copyright 2013, 2015 Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,8 +20,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COPIER_H2HCOPIER_HPP
-#define COPIER_H2HCOPIER_HPP
+#pragma once
 
 #include "Memcopy.hpp"
 #include <types.h>
@@ -47,5 +46,3 @@ struct H2HCopier
 
 } // copier
 } // PMacc
-
-#endif // COPIER_H2HCOPIER_HPP

src/libPMacc/include/cuSTL/container/copier/Memcopy.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Heiko Burau, Rene Widera
+ * Copyright 2013, 2015 Heiko Burau, Rene Widera, Benjamin Worpitz
  *
  * This file is part of libPMacc.
  *
@@ -20,8 +20,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CUDAWRAPPERMEMCOPY_HPP
-#define CUDAWRAPPERMEMCOPY_HPP
+#pragma once
 
 #include "math/vector/Size_t.hpp"
 #include <types.h>
@@ -105,5 +104,3 @@ struct Memcopy<3>
 
 } // cudaWrapper
 } // PMacc
-
-#endif //CUDAWRAPPERMEMCOPY_HPP