Move group file and update headers

Src/GroupTree/FGroupAttachedLeaf.hpp → Src/GroupTree/Core/FGroupAttachedLeaf.hpp

@@ -4,8 +4,8 @@
 #ifndef FGROUPATTACHEDLEAF_HPP
 #define FGROUPATTACHEDLEAF_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Utils/FAssert.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Utils/FAssert.hpp"
 
 /**
  * This class is "attached" to a buffer.

Src/GroupTree/FGroupOfCells.hpp → Src/GroupTree/Core/FGroupOfCells.hpp

@@ -4,10 +4,10 @@
 #ifndef FGROUPOFCELLS_HPP
 #define FGROUPOFCELLS_HPP
 
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <list>
 #include <functional>

Src/GroupTree/FGroupOfParticles.hpp → Src/GroupTree/Core/FGroupOfParticles.hpp

@@ -5,10 +5,10 @@
 #define FGROUPOFPARTICLES_HPP
 
 
-#include "../Utils/FAssert.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <list>
 #include <functional>

Src/GroupTree/FGroupSeqAlgorithm.hpp → Src/GroupTree/Core/FGroupSeqAlgorithm.hpp

@@ -4,12 +4,12 @@
 #ifndef FGROUPSEQALGORITHM_HPP
 #define FGROUPSEQALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 

Src/GroupTree/FGroupTaskAlgorithm.hpp → Src/GroupTree/Core/FGroupTaskAlgorithm.hpp

@@ -4,12 +4,12 @@
 #ifndef FGROUPTASKALGORITHM_HPP
 #define FGROUPTASKALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 

Src/GroupTree/FGroupTaskDepAlgorithm.hpp → Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp

@@ -5,12 +5,12 @@
 #define FGROUPTASKDEPALGORITHM_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 

Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp → Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp

@@ -3,13 +3,13 @@
 #ifndef FGROUPTASKSTARPUALGORITHM_HPP
 #define FGROUPTASKSTARPUALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
@@ -19,22 +19,22 @@
 #include <omp.h>
 
 #include <starpu.h>
-#include "FStarPUUtils.hpp"
+#include "../StarPUUtils/FStarPUUtils.hpp"
 
 #ifdef STARPU_USE_CPU
-#include "FStarPUCpuWrapper.hpp"
+#include "../StarPUUtils/FStarPUCpuWrapper.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_CUDA_KERNEL
-#include "FStarPUCudaWrapper.hpp"
-#include "Cuda/FCudaEmptyKernel.hpp"
-#include "Cuda/FCudaGroupAttachedLeaf.hpp"
-#include "Cuda/FCudaGroupOfParticles.hpp"
-#include "Cuda/FCudaGroupOfCells.hpp"
-#include "Cuda/FCudaEmptyCell.hpp"
+#include "../StarPUUtils/FStarPUCudaWrapper.hpp"
+#include "../Cuda/FCudaEmptyKernel.hpp"
+#include "../Cuda/FCudaGroupAttachedLeaf.hpp"
+#include "../Cuda/FCudaGroupOfParticles.hpp"
+#include "../Cuda/FCudaGroupOfCells.hpp"
+#include "../Cuda/FCudaEmptyCell.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
-#include "FStarPUOpenClWrapper.hpp"
-#include "OpenCl/FOpenCLDeviceWrapper.hpp"
+#include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
+#include "../OpenCl/FOpenCLDeviceWrapper.hpp"
 #endif
 
 

Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp → Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp

@@ -3,17 +3,17 @@
 #ifndef FGROUPTASKSTARPUMPIALGORITHM_HPP
 #define FGROUPTASKSTARPUMPIALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../../Utils/FMpi.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
@@ -24,21 +24,21 @@
 
 #include <starpu.h>
 #include <starpu_mpi.h>
-#include "FStarPUUtils.hpp"
+#include "../StarPUUtils/FStarPUUtils.hpp"
 
 #ifdef STARPU_USE_CPU
-#include "FStarPUCpuWrapper.hpp"
+#include "../StarPUUtils/FStarPUCpuWrapper.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_CUDA_KERNEL
-#include "FStarPUCudaWrapper.hpp"
-#include "Cuda/FCudaEmptyKernel.hpp"
-#include "Cuda/FCudaGroupAttachedLeaf.hpp"
-#include "Cuda/FCudaGroupOfParticles.hpp"
-#include "Cuda/FCudaGroupOfCells.hpp"
+#include "../StarPUUtils/FStarPUCudaWrapper.hpp"
+#include "../Cuda/FCudaEmptyKernel.hpp"
+#include "../Cuda/FCudaGroupAttachedLeaf.hpp"
+#include "../Cuda/FCudaGroupOfParticles.hpp"
+#include "../Cuda/FCudaGroupOfCells.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
-#include "FStarPUOpenClWrapper.hpp"
-#include "OpenCl/FOpenCLDeviceWrapper.hpp"
+#include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
+#include "../OpenCl/FOpenCLDeviceWrapper.hpp"
 #endif
 
 

Src/GroupTree/FGroupTree.hpp → Src/GroupTree/Core/FGroupTree.hpp

@@ -6,10 +6,10 @@
 #include <vector>
 #include <functional>
 
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FPoint.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FPoint.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
 
 #include "FGroupOfCells.hpp"
 #include "FGroupOfParticles.hpp"

Src/GroupTree/FOutOfBlockInteraction.hpp → Src/GroupTree/Core/FOutOfBlockInteraction.hpp

 #ifndef FOUTOFBLOCKINTERACTION_HPP
 #define FOUTOFBLOCKINTERACTION_HPP
 
-#include "../Utils/FGlobal.hpp"
+#include "../../Utils/FGlobal.hpp"
 
-#include "FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct  alignas(FStarPUDefaultAlign::StructAlign) OutOfBlockInteraction{
     MortonIndex outIndex;

Src/GroupTree/Cuda/FCudaDeviceWrapper.hpp

@@ -4,7 +4,7 @@
 
 
 #include "../../Utils/FGlobal.hpp"
-#include "../FOutOfBlockInteraction.hpp"
+#include "../Core/FOutOfBlockInteraction.hpp"
 #include "FCudaStructParams.hpp"
 
 template <class CellClass, class CellContainerClass, class ParticleContainerGroupClass, class ParticleGroupClass, class CudaKernelClass>

Src/GroupTree/Cuda/FCudaEmptyCell.hpp

@@ -3,7 +3,7 @@
 
 #include "../../Utils/FGlobal.hpp"
 #include "../../Containers/FTreeCoordinate.hpp"
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct alignas(FStarPUDefaultAlign::StructAlign) FCudaEmptyCell {
     MortonIndex mortonIndex;

Src/GroupTree/Cuda/FCudaGroupOfCells.hpp

@@ -4,7 +4,7 @@
 
 #include "FCudaGlobal.hpp"
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 /**
 * @brief The FCudaGroupOfCells class manages the cells in block allocation.

Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp

@@ -3,7 +3,7 @@
 #define FCUDAGROUPOFPARTICLES_HPP
 
 #include "FCudaGlobal.hpp"
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 template <unsigned NbAttributesPerParticle, class AttributeClass = FReal>
 class FCudaGroupOfParticles {

Src/GroupTree/Cuda/FCudaStructParams.hpp

@@ -2,7 +2,7 @@
 #ifndef FCUDASTRUCTPARAMS_HPP
 #define FCUDASTRUCTPARAMS_HPP
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 #include "FCudaGlobal.hpp"
 
 template <class ArrayType, const int Size>

Src/GroupTree/OpenCl/FEmptyOpenCLCode.hpp

@@ -4,7 +4,7 @@
 
 // Return the same thing as FEmptyKernel.cl
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 class FEmptyOpenCLCode{
 

Src/GroupTree/OpenCl/FOpenCLDeviceWrapper.hpp

@@ -12,11 +12,11 @@
 #include "../../Utils/FAlignedMemory.hpp"
 #include "../../Utils/FAssert.hpp"
 
-#include "../FOutOfBlockInteraction.hpp"
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #include "FEmptyOpenCLCode.hpp"
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <starpu.h>
 

Src/GroupTree/FStarPUCpuWrapper.hpp → Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp

@@ -4,20 +4,20 @@
 #define FSTARPUCPUWRAPPER_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>

Src/GroupTree/FStarPUCudaWrapper.hpp → Src/GroupTree/StarPUUtils/FStarPUCudaWrapper.hpp

@@ -2,20 +2,20 @@
 #ifndef FSTARPUCUDAWRAPPER_HPP
 #define FSTARPUCUDAWRAPPER_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>
@@ -29,7 +29,7 @@
 #include <starpu_mpi.h>
 #endif
 
-#include "Cuda/FCudaDeviceWrapper.hpp"
+#include "../Cuda/FCudaDeviceWrapper.hpp"
 
 #include "FStarPUUtils.hpp"
 

Src/GroupTree/FStarPUOpenClWrapper.hpp → Src/GroupTree/StarPUUtils/FStarPUOpenClWrapper.hpp

@@ -5,20 +5,20 @@
 #define FSTARPUOPENCLWRAPPER_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>

Src/GroupTree/FStarPUUtils.hpp → Src/GroupTree/StarPUUtils/FStarPUUtils.hpp

@@ -4,7 +4,7 @@
 #define FSTARPUUTILS_HPP
 
 /////////////////////////////////////////////////////
-#include "../Utils/FGlobal.hpp"
+#include "../../Utils/FGlobal.hpp"
 
 /////////////////////////////////////////////////////
 

Src/GroupTree/Cuda/FCudaTestKernels.hpp → Src/GroupTree/TestKernel/FCudaTestKernels.hpp

@@ -2,7 +2,7 @@
 #ifndef FCUDATESTKERNEL_HPP
 #define FCUDATESTKERNEL_HPP
 
-#include "FCudaGlobal.hpp"
+#include "../Cuda/FCudaGlobal.hpp"
 
 // We need to describe this cell
 #include "../../Components/FTestCell.hpp"

Src/GroupTree/FGroupTestParticleContainer.hpp → Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp

@@ -4,7 +4,7 @@
 #ifndef FGROUPTESTPARTICLECONTAINER_HPP
 #define FGROUPTESTPARTICLECONTAINER_HPP
 
-#include "FGroupAttachedLeaf.hpp"
+#include "../Core/FGroupAttachedLeaf.hpp"
 
 class FGroupTestParticleContainer : public FGroupAttachedLeaf<2, long long int> {
     typedef FGroupAttachedLeaf<2, long long int> Parent;

Src/GroupTree/FTestCellPOD.hpp → Src/GroupTree/TestKernel/FTestCellPOD.hpp

@@ -2,9 +2,9 @@
 #ifndef FTESTCELLPOD_HPP
 #define FTESTCELLPOD_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct alignas(FStarPUDefaultAlign::StructAlign) FTestCellPODCore {
     MortonIndex mortonIndex;

Src/GroupTree/OpenCl/FTestOpenCLCode.hpp → Src/GroupTree/TestKernel/FTestOpenCLCode.hpp

@@ -2,8 +2,8 @@
 #define FTESTOPENCLCODE_HPP
 
 #include "../../Utils/FGlobal.hpp"
-#include "../FStarPUDefaultAlign.hpp"
-#include "FTextReplacer.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
+#include "../OpenCl/FTextReplacer.hpp"
 
 // Initialize the types
 class FTestOpenCLCode{

Tests/noDist/testBlockedAlgorithm.cpp

@@ -5,7 +5,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -18,23 +18,23 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../../Src/GroupTree/FGroupTestParticleContainer.hpp"
+#include "../../Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 #include "../../Src/Core/FFmmAlgorithm.hpp"

Tests/noDist/testBlockedChebyshev.cpp

@@ -7,7 +7,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -25,23 +25,22 @@
 #include "../../Src/Files/FRandomLoader.hpp"
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 

Tests/noDist/testBlockedMpiAlgorithm.cpp

@@ -7,7 +7,7 @@
 #include "../../Src/Utils/FGlobal.hpp"
 #include "../../Src/Utils/FMpi.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -20,24 +20,23 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/BalanceTree/FLeafBalance.hpp"
 #include "../../Src/Files/FMpiTreeBuilder.hpp"
 
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 
 
 int getTreeCoordinate(const FReal inRelativePosition, const FReal boxWidth,

Tests/noDist/testBlockedMpiChebyshev.cpp

@@ -9,7 +9,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"