Commit 51a1acac authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

Remove .. in include of examples

parent 332c94df
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "Core/FFmmAlgorithm.hpp" #include "Core/FFmmAlgorithm.hpp"
#endif #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. * 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[]) ...@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
FParameterDefinitions::NbThreads); 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 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 TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2);
......
...@@ -26,25 +26,25 @@ ...@@ -26,25 +26,25 @@
#include "ScalFmmConfig.h" #include "ScalFmmConfig.h"
#include "../Src/Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../Src/Utils/FMpi.hpp" #include "Utils/FMpi.hpp"
#include "../Src/Core/FFmmAlgorithmThreadProc.hpp" #include "Core/FFmmAlgorithmThreadProc.hpp"
#include "../Src/Files/FFmaGenericLoader.hpp" #include "Files/FFmaGenericLoader.hpp"
#include "../Src/Files/FMpiFmaGenericLoader.hpp" #include "Files/FMpiFmaGenericLoader.hpp"
#include "../Src/Files/FMpiTreeBuilder.hpp" #include "Files/FMpiTreeBuilder.hpp"
#include "../Src/BalanceTree/FLeafBalance.hpp" #include "BalanceTree/FLeafBalance.hpp"
#include "../Src/Kernels/Interpolation/FInterpMatrixKernel.hpp" #include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "../Src/Kernels/Chebyshev/FChebSymKernel.hpp" #include "Kernels/Chebyshev/FChebSymKernel.hpp"
#include "../Src/Kernels/Chebyshev/FChebCell.hpp" #include "Kernels/Chebyshev/FChebCell.hpp"
#include "../Src/Components/FSimpleLeaf.hpp" #include "Components/FSimpleLeaf.hpp"
#include "../Src/Kernels/P2P/FP2PParticleContainerIndexed.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 ChebyshevInterpolationMPIFMM /// \file ChebyshevInterpolationMPIFMM
...@@ -65,7 +65,7 @@ int main(int argc, char* argv[]) ...@@ -65,7 +65,7 @@ int main(int argc, char* argv[])
FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile, FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile,
FParameterDefinitions::NbThreads); 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 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 TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "Kernels/P2P/FP2P.hpp" #include "Kernels/P2P/FP2P.hpp"
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp" #include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "../Src/Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
// //
/// \file DirectComputation.cpp /// \file DirectComputation.cpp
//! //!
...@@ -52,7 +52,7 @@ int main(int argc, char ** argv){ ...@@ -52,7 +52,7 @@ int main(int argc, char ** argv){
FHelpDescribeAndExit(argc, argv, FHelpDescribeAndExit(argc, argv,
">> This executable has to be used to compute interaction either for periodic or non periodic system.\n" ">> 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" ">> 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" ">> Only our FMA (.bma, .bfma) is allowed as input.\n"
">> Output file with extension (default output.bfma).", ">> Output file with extension (default output.bfma).",
FParameterDefinitions::InputFile, FParameterDefinitions::OutputFile, FParameterDefinitions::InputFile, FParameterDefinitions::OutputFile,
...@@ -60,7 +60,7 @@ int main(int argc, char ** argv){ ...@@ -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 filenameIn(FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, defaultFile.c_str()));
const std::string filenameOut(FParameters::getStr(argc,argv,FParameterDefinitions::OutputFile.options, "output.bfma")); const std::string filenameOut(FParameters::getStr(argc,argv,FParameterDefinitions::OutputFile.options, "output.bfma"));
// //
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "Core/FFmmAlgorithm.hpp" #include "Core/FFmmAlgorithm.hpp"
#endif #endif
#include "../Src/Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
/// \file RotationFMM.cpp /// \file RotationFMM.cpp
//! //!
...@@ -73,7 +73,7 @@ int main(int argc, char* argv[]) ...@@ -73,7 +73,7 @@ int main(int argc, char* argv[])
FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile, FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::InputFile,
FParameterDefinitions::NbThreads); 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 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 TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2); const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2);
......
...@@ -25,25 +25,25 @@ ...@@ -25,25 +25,25 @@
#include "ScalFmmConfig.h" #include "ScalFmmConfig.h"
#include "../../Src/Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../../Src/Utils/FMpi.hpp" #include "Utils/FMpi.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp" #include "Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/Files/FFmaGenericLoader.hpp" #include "Files/FFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiFmaGenericLoader.hpp" #include "Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp" #include "Files/FMpiTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp" #include "BalanceTree/FLeafBalance.hpp"
#include "../../Src/Kernels/Rotation/FRotationKernel.hpp" #include "Kernels/Rotation/FRotationKernel.hpp"
#include "../../Src/Kernels/Rotation/FRotationCell.hpp" #include "Kernels/Rotation/FRotationCell.hpp"
#include "../../Src/Components/FSimpleLeaf.hpp" #include "Components/FSimpleLeaf.hpp"
#include "../../Src/Kernels/P2P/FP2PParticleContainerIndexed.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 /// \file RotationFMMProc.cpp
//! //!
......
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
#include "Kernels/P2P/FP2PParticleContainerIndexed.hpp" #include "Kernels/P2P/FP2PParticleContainerIndexed.hpp"
//Classical Spherical kernel //Classical Spherical kernel
#include "../../Src/Kernels/Spherical/FSphericalCell.hpp" #include "Kernels/Spherical/FSphericalCell.hpp"
#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp" #include "Kernels/Spherical/FSphericalKernel.hpp"
//Rotation kernel //Rotation kernel
#include "Kernels/Rotation/FRotationKernel.hpp" #include "Kernels/Rotation/FRotationKernel.hpp"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#include "Kernels/Uniform/FUnifKernel.hpp" #include "Kernels/Uniform/FUnifKernel.hpp"
#endif #endif
#include "../Src/Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
/** /**
* This program compares two different kernels, eg., the Chebyshev kernel with * This program compares two different kernels, eg., the Chebyshev kernel with
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "Utils/FGenerateDistribution.hpp" #include "Utils/FGenerateDistribution.hpp"
#include "Files/FFmaGenericLoader.hpp" #include "Files/FFmaGenericLoader.hpp"
#include "../Src/Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
// //
/// \file generateDistributions.cpp /// \file generateDistributions.cpp
......
...@@ -18,18 +18,18 @@ ...@@ -18,18 +18,18 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "../../Src/Utils/FParameters.hpp" #include "Utils/FParameters.hpp"
#include "../../Src/Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../../Src/Components/FBasicCell.hpp" #include "Components/FBasicCell.hpp"
#include "../../Src/Components/FSimpleLeaf.hpp" #include "Components/FSimpleLeaf.hpp"
#include "../../Src/Components/FBasicParticleContainer.hpp" #include "Components/FBasicParticleContainer.hpp"
#include "../../Src/Utils/FMath.hpp" #include "Utils/FMath.hpp"
#include "../../Src/Files/FFmaGenericLoader.hpp" #include "Files/FFmaGenericLoader.hpp"
#include "../Src/Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
/// \file statisticsOnOctree.cpp /// \file statisticsOnOctree.cpp
//! //!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment