Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm

CMakeLists.txt

@@ -8,7 +8,7 @@ STRING(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" insource)
 if(insource)
     MESSAGE(FATAL_ERROR "${PROJECT_NAME} requires an out of source build. Goto ./Build and tapes cmake ../")
 endif(insource)
-SET(CMAKE_MODULE_PATH  ${CMAKE_SOURCE_DIR}/Modules)
+SET(CMAKE_MODULE_PATH  ${CMAKE_SOURCE_DIR}/CMakeModules)
 
 #
 # MPI option has to be set before project, cannot be changed in the cache!

README.txt

 
 ScalFmm, Inria, Please read the licence.
 
-To compile:
 ---------------------------------------------------
+---------------------------------------------------
+
+To compile:
+==========
 # Go to 
 cd scalfmm/Build
 # Use cmake first by
@@ -19,8 +22,11 @@ ccmake ..
 make
 # And access executables in scalfmm/Build/Tests/{Release,Debug}/.....
 
-Build the doc
 ---------------------------------------------------
+---------------------------------------------------
+
+Build the doc:
+=============
 In scalfmm/Doc you can find several pdf and .tex file about
 the implementation, kernels and data structure.
 
@@ -32,3 +38,28 @@ make doc
 browser scalfmm/Build/Doc/html/index.html
 
 
+---------------------------------------------------
+---------------------------------------------------
+
+Getting help and having news from us:
+====================================
+
+You can subscribe to the scalfmm users mailing list ( scalfmm-public-users@lists.gforge.inria.fr,  http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/scalfmm-public-users ). Very low trafic (~ 2 mails per year) just to know when a news version or an improvement is available.
+
+Contact the developers at : scalfmm-public-support@lists.gforge.inria.fr
+
+
+---------------------------------------------------
+---------------------------------------------------
+
+What inside :
+=============
+× Src : The Core of Scalfmm is under the Src directory. Users should not need to modify the source.
+One can want to implement its own kernel or even its own parallelization whithout modifying the sources.
+× Data : example of particles distributions
+× Examples : examples of very common usage of Scalfmm
+× Doc : should contains the generated Doc
+× UTests : contains some unit tests (it can be a good example to understand some features)
+× Tests : examples to know how to use scalfmm/put particles in the tree/iterate on the tree...
+× Utils : some scripts to work with the data files.
+

Src/Adaptative/FAbstractAdaptiveKernel.hpp → Src/Adaptive/FAbstractAdaptiveKernel.hpp

-#ifndef FABSTRACTADAPTATIVEKERNEL
-#define FABSTRACTADAPTATIVEKERNEL
+#ifndef FABSTRACTADAPTIVEKERNEL
+#define FABSTRACTADAPTIVEKERNEL
 
 /**
- * This class represent the method that an adaptative kernel must implement.
+ * This class represent the method that an adaptive kernel must implement.
  * There are two kinds of operators, the first one represent computation and the others
  * should return the cretiria to know when the P2M should be performed.
  */

Src/AdaptiveTree/FAdaptChebSymKernel.hpp → Src/Adaptive/FAdaptChebSymKernel.hpp

@@ -19,9 +19,9 @@
 
 #include "Utils/FPoint.hpp"
 
-#include "Adaptative/FAdaptiveCell.hpp"
-#include "Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "Adaptive/FAdaptiveCell.hpp"
+#include "Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "Adaptive/FAbstractAdaptiveKernel.hpp"
 #include "Kernels/Chebyshev/FChebSymKernel.hpp"
 
 class FTreeCoordinate;

Src/AdaptiveTree/FAdaptUnifKernel.hpp → Src/Adaptive/FAdaptUnifKernel.hpp

@@ -19,9 +19,9 @@
 
 #include "Utils/FPoint.hpp"
 
-#include "Adaptative/FAdaptiveCell.hpp"
-#include "Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "Adaptive/FAdaptiveCell.hpp"
+#include "Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "Adaptive/FAbstractAdaptiveKernel.hpp"
 #include "Kernels/Uniform/FUnifKernel.hpp"
 #include "Kernels/Uniform/FUnifM2LHandler.hpp"
 

Tests/noDist/testAdaptiveChebSymFMM.cpp

@@ -43,9 +43,9 @@
 #include "Kernels/Chebyshev/FChebCell.hpp"
 
 #include "AdaptiveTree/FAdaptChebSymKernel.hpp"
-#include "Adaptative/FAdaptiveCell.hpp"
-#include "Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "Adaptive/FAdaptiveCell.hpp"
+#include "Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "Adaptive/FAbstractAdaptiveKernel.hpp"
 //
 #include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
 #include "Kernels/Chebyshev/FChebCell.hpp"

Tests/noDist/testAdaptiveUnifFMM.cpp

@@ -40,14 +40,14 @@
 #include "Components/FSimpleIndexedLeaf.hpp"
 #include "Kernels/P2P/FP2PParticleContainerIndexed.hpp"
 
-#include "Adaptative/FAdaptiveCell.hpp"
-#include "Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "Adaptive/FAdaptiveCell.hpp"
+#include "Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "Adaptive/FAbstractAdaptiveKernel.hpp"
 //
 #include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
 #include "Kernels/Uniform/FUnifCell.hpp"
-#include "AdaptiveTree/FAdaptUnifKernel.hpp"
-#include "AdaptiveTree/FAdaptTools.hpp"
+#include "Adaptive/FAdaptUnifKernel.hpp"
+#include "Adaptive/FAdaptTools.hpp"
 //
 //
 #include "Core/FFmmAlgorithm.hpp"

Tests/noDist/testFmmAdaptiveAlgorithm.cpp

@@ -41,9 +41,9 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/Adaptative/FAdaptiveCell.hpp"
-#include "../../Src/Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "../../Src/Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "../../Src/Adaptive/FAdaptiveCell.hpp"
+#include "../../Src/Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "../../Src/Adaptive/FAbstractAdaptiveKernel.hpp"
 
 template< class CellClass, class ContainerClass>
 class FAdaptiveTestKernel : public FTestKernels<CellClass, ContainerClass>, public FAbstractAdaptiveKernel<CellClass, ContainerClass> {

Tests/noDist/testFmmAdaptiveStats.cpp

@@ -42,9 +42,9 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/Adaptative/FAdaptiveCell.hpp"
-#include "../../Src/Adaptative/FAdaptiveKernelWrapper.hpp"
-#include "../../Src/Adaptative/FAbstractAdaptiveKernel.hpp"
+#include "../../Src/Adaptive/FAdaptiveCell.hpp"
+#include "../../Src/Adaptive/FAdaptiveKernelWrapper.hpp"
+#include "../../Src/Adaptive/FAbstractAdaptiveKernel.hpp"
 
 template< class CellClass, class ContainerClass>
 class FAdaptiveStatsKernel : public FAbstractKernels<CellClass, ContainerClass>, public FAbstractAdaptiveKernel<CellClass, ContainerClass> {