diff --git a/Examples/ChebyshevInterpolationFMM.cpp b/Examples/ChebyshevInterpolationFMM.cpp index 5cfb58d14c523666794834a6713cf394fa1d10a7..b670be1116fba3821dd41d924d48f094b11882b3 100755 --- a/Examples/ChebyshevInterpolationFMM.cpp +++ b/Examples/ChebyshevInterpolationFMM.cpp @@ -45,7 +45,7 @@ #include "Core/FFmmAlgorithm.hpp" #endif -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" /** * This program runs the FMM Algorithm with the Chebyshev kernel and compares the results with a direct computation. @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) FParameterDefinitions::NbThreads); - const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/unitCubeXYZQ100.bfma" ); + const std::string defaultFile(/*SCALFMMDataPath+*/"Data/unitCubeXYZQ100.bfma" ); const std::string filename = FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, defaultFile.c_str()); const unsigned int TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); diff --git a/Examples/ChebyshevInterpolationMPIFMM.cpp b/Examples/ChebyshevInterpolationMPIFMM.cpp index 649644fb588032ec43dbb4cdfc46db8c423fc86b..79a635a192a1c1f7ebc05ab449a0997e8549eaf6 100644 --- a/Examples/ChebyshevInterpolationMPIFMM.cpp +++ b/Examples/ChebyshevInterpolationMPIFMM.cpp @@ -26,25 +26,25 @@ #include "ScalFmmConfig.h" -#include "../Src/Containers/FOctree.hpp" -#include "../Src/Utils/FMpi.hpp" -#include "../Src/Core/FFmmAlgorithmThreadProc.hpp" +#include "Containers/FOctree.hpp" +#include "Utils/FMpi.hpp" +#include "Core/FFmmAlgorithmThreadProc.hpp" -#include "../Src/Files/FFmaGenericLoader.hpp" -#include "../Src/Files/FMpiFmaGenericLoader.hpp" -#include "../Src/Files/FMpiTreeBuilder.hpp" +#include "Files/FFmaGenericLoader.hpp" +#include "Files/FMpiFmaGenericLoader.hpp" +#include "Files/FMpiTreeBuilder.hpp" -#include "../Src/BalanceTree/FLeafBalance.hpp" +#include "BalanceTree/FLeafBalance.hpp" -#include "../Src/Kernels/Interpolation/FInterpMatrixKernel.hpp" -#include "../Src/Kernels/Chebyshev/FChebSymKernel.hpp" -#include "../Src/Kernels/Chebyshev/FChebCell.hpp" +#include "Kernels/Interpolation/FInterpMatrixKernel.hpp" +#include "Kernels/Chebyshev/FChebSymKernel.hpp" +#include "Kernels/Chebyshev/FChebCell.hpp" -#include "../Src/Components/FSimpleLeaf.hpp" -#include "../Src/Kernels/P2P/FP2PParticleContainerIndexed.hpp" +#include "Components/FSimpleLeaf.hpp" +#include "Kernels/P2P/FP2PParticleContainerIndexed.hpp" -#include "../Src/Utils/FParameters.hpp" -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameters.hpp" +#include "Utils/FParameterNames.hpp" /// \file ChebyshevInterpolationMPIFMM @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile, FParameterDefinitions::NbThreads); - const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma"); + const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma"); const std::string filename = FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, defaultFile.c_str()); const unsigned int TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); diff --git a/Examples/DirectComputation.cpp b/Examples/DirectComputation.cpp index f76b57fcc0bd09f1d920cb8e87ccd3f27aee6ef2..5778c6049a36a10dd1e53223b12c82d5435edc68 100755 --- a/Examples/DirectComputation.cpp +++ b/Examples/DirectComputation.cpp @@ -31,7 +31,7 @@ #include "Kernels/P2P/FP2P.hpp" #include "Kernels/Interpolation/FInterpMatrixKernel.hpp" -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" // /// \file DirectComputation.cpp //! @@ -52,7 +52,7 @@ int main(int argc, char ** argv){ FHelpDescribeAndExit(argc, argv, ">> This executable has to be used to compute interaction either for periodic or non periodic system.\n" ">> Example -fin filenameIN.{fma or bfma) -fout filenameOUT{fma or bfma) \n" - ">> Default input file : ../Data/unitCubeXYZQ20k.fma\n" + ">> Default input file : Data/unitCubeXYZQ20k.fma\n" ">> Only our FMA (.bma, .bfma) is allowed as input.\n" ">> Output file with extension (default output.bfma).", FParameterDefinitions::InputFile, FParameterDefinitions::OutputFile, @@ -60,7 +60,7 @@ int main(int argc, char ** argv){ ////////////////////////////////////////////////////////////// - const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/unitCubeXYZQ20k.fma"); + const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/unitCubeXYZQ20k.fma"); const std::string filenameIn(FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, defaultFile.c_str())); const std::string filenameOut(FParameters::getStr(argc,argv,FParameterDefinitions::OutputFile.options, "output.bfma")); // diff --git a/Examples/RotationFMM.cpp b/Examples/RotationFMM.cpp index 2fcab4b2c3c7945646e274d234733fe9d70240a3..84a17df9165c393d855a96dc00df641b697dd45e 100755 --- a/Examples/RotationFMM.cpp +++ b/Examples/RotationFMM.cpp @@ -43,7 +43,7 @@ #include "Core/FFmmAlgorithm.hpp" #endif -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" /// \file RotationFMM.cpp //! @@ -73,7 +73,7 @@ int main(int argc, char* argv[]) FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile, FParameterDefinitions::NbThreads); - const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma"); + const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma"); const std::string filename(FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, defaultFile.c_str())); const unsigned int TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); diff --git a/Examples/RotationMPIFMM.cpp b/Examples/RotationMPIFMM.cpp index 12e66e49e7bfb0ebbdfaacaa14f5bd5d67002b47..9d426120e9bb2fdbe7cdd6a98c44e06be8969d35 100644 --- a/Examples/RotationMPIFMM.cpp +++ b/Examples/RotationMPIFMM.cpp @@ -25,25 +25,25 @@ #include "ScalFmmConfig.h" -#include "../../Src/Containers/FOctree.hpp" -#include "../../Src/Utils/FMpi.hpp" -#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp" +#include "Containers/FOctree.hpp" +#include "Utils/FMpi.hpp" +#include "Core/FFmmAlgorithmThreadProc.hpp" -#include "../../Src/Files/FFmaGenericLoader.hpp" -#include "../../Src/Files/FMpiFmaGenericLoader.hpp" -#include "../../Src/Files/FMpiTreeBuilder.hpp" +#include "Files/FFmaGenericLoader.hpp" +#include "Files/FMpiFmaGenericLoader.hpp" +#include "Files/FMpiTreeBuilder.hpp" -#include "../../Src/BalanceTree/FLeafBalance.hpp" +#include "BalanceTree/FLeafBalance.hpp" -#include "../../Src/Kernels/Rotation/FRotationKernel.hpp" -#include "../../Src/Kernels/Rotation/FRotationCell.hpp" +#include "Kernels/Rotation/FRotationKernel.hpp" +#include "Kernels/Rotation/FRotationCell.hpp" -#include "../../Src/Components/FSimpleLeaf.hpp" -#include "../../Src/Kernels/P2P/FP2PParticleContainerIndexed.hpp" +#include "Components/FSimpleLeaf.hpp" +#include "Kernels/P2P/FP2PParticleContainerIndexed.hpp" -#include "../../Src/Utils/FParameters.hpp" +#include "Utils/FParameters.hpp" -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" /// \file RotationFMMProc.cpp //! diff --git a/Examples/compareAllPoissonKernels.cpp b/Examples/compareAllPoissonKernels.cpp index c1fe9d9aa09e34c2256f89771a0b42024d7f8896..c5ddba9f4432d9ded8e238c11bb8ac0555eb4190 100644 --- a/Examples/compareAllPoissonKernels.cpp +++ b/Examples/compareAllPoissonKernels.cpp @@ -60,8 +60,8 @@ #include "Kernels/P2P/FP2PParticleContainerIndexed.hpp" //Classical Spherical kernel -#include "../../Src/Kernels/Spherical/FSphericalCell.hpp" -#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp" +#include "Kernels/Spherical/FSphericalCell.hpp" +#include "Kernels/Spherical/FSphericalKernel.hpp" //Rotation kernel #include "Kernels/Rotation/FRotationKernel.hpp" @@ -75,7 +75,7 @@ #include "Kernels/Uniform/FUnifKernel.hpp" #endif -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" /** * This program compares two different kernels, eg., the Chebyshev kernel with diff --git a/Examples/generateDistributions.cpp b/Examples/generateDistributions.cpp index cffab37cdd8f1b7344783991e3005d63680a1fec..255845db8a4cf72751ec8ec7979ffc2e8fffaa1f 100644 --- a/Examples/generateDistributions.cpp +++ b/Examples/generateDistributions.cpp @@ -17,7 +17,7 @@ #include "Utils/FGenerateDistribution.hpp" #include "Files/FFmaGenericLoader.hpp" -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" // /// \file generateDistributions.cpp diff --git a/Examples/statisticsOnOctree.cpp b/Examples/statisticsOnOctree.cpp index 6621acbe64ca4dcaf0e92cb99a1021d0322d0e77..24071b91b178051a85687e9bc643758f42618988 100755 --- a/Examples/statisticsOnOctree.cpp +++ b/Examples/statisticsOnOctree.cpp @@ -18,18 +18,18 @@ #include <iostream> #include <fstream> -#include "../../Src/Utils/FParameters.hpp" -#include "../../Src/Containers/FOctree.hpp" +#include "Utils/FParameters.hpp" +#include "Containers/FOctree.hpp" -#include "../../Src/Components/FBasicCell.hpp" -#include "../../Src/Components/FSimpleLeaf.hpp" -#include "../../Src/Components/FBasicParticleContainer.hpp" +#include "Components/FBasicCell.hpp" +#include "Components/FSimpleLeaf.hpp" +#include "Components/FBasicParticleContainer.hpp" -#include "../../Src/Utils/FMath.hpp" -#include "../../Src/Files/FFmaGenericLoader.hpp" +#include "Utils/FMath.hpp" +#include "Files/FFmaGenericLoader.hpp" -#include "../Src/Utils/FParameterNames.hpp" +#include "Utils/FParameterNames.hpp" /// \file statisticsOnOctree.cpp //!