Change data in the /Data directory.

Put the unit test data into the /Data directory.
Put default file names in loaders/creaters pointing to /Data.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@282 2616d619-271b-44dc-8df4-d4a8f33a7222

.gitignore

@@ -16,7 +16,6 @@ tmp/
 *~
 *TAGS
 *#*#
-*.bin.*
 
 #ignore latex temporary files
 *.out

Data/testFMAlgorithm.fma

-5
-0.5	0.5	0.5	0.5
-0.840188	0.394383	0.783099	1
-0.79844	0.911647	0.197551	2
-0.335223	0.76823	0.277775	3
-0.55397	0.477397	0.628871	4
-0.364784	0.513401	0.95223	5

Src/CMakeLists.txt

@@ -10,12 +10,6 @@ endif(insource)
 project(Lib_scalfmm)
 set(LIBRARY_OUTPUT_PATH ../lib/${CMAKE_BUILD_TYPE})
 
-# Test if openmp is here
-include(FindOpenMP)
-if(OPENMP_FOUND)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-endif()
 
 # Searching all cpp file
 file(

Tests/testFmbAlgorithm.cpp

@@ -44,10 +44,10 @@ int main(int argc, char ** argv){
     std::cout << ">> This executable has to be used to test fmb algorithm.\n";
     //////////////////////////////////////////////////////////////
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     FTic counter;
-    const char* const defaultFilename = "testLoaderFMA.fma"; //../../Data/ "testLoaderFMA.fma" "testFMAlgorithm.fma" Sphere.fma
+    const char* const defaultFilename = "../Data/test20k.fma";
     const char* filename;
 
     if(argc == 1){

Tests/testFmbAlgorithmProc.cpp

@@ -191,10 +191,10 @@ int main(int argc, char ** argv){
 
     FMpi app( argc, argv);
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     FTic counter;
-    const char defaultFilename[] = "testLoaderFMA.fma"; //../../Data/ "testLoaderFMA.fma" "testFMAlgorithm.fma" Sphere.fma
+    const char defaultFilename[] = "../Data/test20k.fma";
     const char* filename;
 
     if(argc == 1){

Tests/testFmbBlasAlgorithm.cpp

@@ -52,10 +52,10 @@ int main(int argc, char ** argv){
     std::cout << ">> This executable has to be used to test fmb algorithm.\n";
     //////////////////////////////////////////////////////////////
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     FTic counter;
-    const char* const defaultFilename = "testLoaderFMA.fma"; //../../Data/ "testLoaderFMA.fma" "testFMAlgorithm.fma" Sphere.fma
+    const char* const defaultFilename = "../Data/test20k.fma";
     const char* filename;
 
     if(argc == 1){

Tests/testFmbTsmAlgorithm.cpp

@@ -45,10 +45,10 @@ int main(int argc, char ** argv){
     std::cout << ">> This executable has to be used to test Fmb on a Tsm system.\n";
     //////////////////////////////////////////////////////////////
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     FTic counter;
-    const char* const defaultFilename = "testLoaderFMA.tor.fma"; //../../Data/ "testLoaderFMA.fma" "testFMAlgorithm.fma" Sphere.fma
+    const char* const defaultFilename = "../Data/test20k.tsm.fma";
     const char* filename;
 
     if(argc == 1){

Tests/testFmbTsmNoTsm.cpp

@@ -62,7 +62,7 @@ int main(int argc, char ** argv){
     std::cout << ">> It compares the results between Tms and no Tms (except P2P & L2P).\n";
     //////////////////////////////////////////////////////////////
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     FTic counter;
     const long NbPart = 200000;//2000000

Tests/testFmmAlgorithmProc.cpp

@@ -326,9 +326,9 @@ int main(int argc, char ** argv){
 
     FMpi app( argc, argv);
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
-    char defaultFilename[] = "testLoaderFMA.fma"; //../../Data/ "testLoaderFMA.fma" "testFMAlgorithm.fma" Sphere.fma
+    char defaultFilename[] = "../Data/test20k.bin.fma";
     char* filename;
     FTic counter;
 

Tests/testFmmAlgorithmTsm.cpp

@@ -56,7 +56,7 @@ int main(int argc, char ** argv){
     std::cout << ">> This executable has to be used to test the FMM algorithm.\n";
     //////////////////////////////////////////////////////////////
 
-    const int NbLevels = FParameters::getValue(argc,argv,"-h", 9);
+    const int NbLevels = FParameters::getValue(argc,argv,"-h", 5);
     const int SizeSubLevels = FParameters::getValue(argc,argv,"-sh", 3);
     const long NbPart = 2000000;//2000000
     const FReal FRandMax = FReal(RAND_MAX);

Tests/testLoader.cpp

@@ -44,11 +44,9 @@ int main(int argc, char ** argv){
     std::cout << ">> how to use the basic loader.\n";
     //////////////////////////////////////////////////////////////
 
-    // we store all particles to be able to dealloc
-    FVector<FBasicParticle*> particles;
     // Use testLoaderCreate.exe to create this file
     FTic counter;
-    const char* const defaultFilename = "../../Data/testLoader.basic.temp";
+    const char* const defaultFilename = "../Data/test20k.basic";
     const char* filename;
 
     if(argc == 1){
@@ -70,7 +68,7 @@ int main(int argc, char ** argv){
 
     {
         // otree
-        OctreeClass tree(FParameters::getValue(argc,argv,"-h", 9), FParameters::getValue(argc,argv,"-sh", 3),
+        OctreeClass tree(FParameters::getValue(argc,argv,"-h", 5), FParameters::getValue(argc,argv,"-sh", 3),
                          loader.getBoxWidth(), loader.getCenterOfBox());
 
         // -----------------------------------------------------