Commit 2ad2328a authored by Berenger Bramas's avatar Berenger Bramas
parents f26dbfc1 31013676
......@@ -914,10 +914,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
set(PACK_PACKAGE_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}-${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "SCALFMM-${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}-${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_SOURCE_IGNORE_FILES "\\\\.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;scalfmm.pro*;org.eclipse.core.resources.prefs;.cproject;.project")
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/Utils/;Notes;Deprecated;/Build*;/noDist/;/Bench;ToRemove;Olivier;Addons/HMat")
set(CPACK_SOURCE_IGNORE_FILES "\\\\.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;scalfmm.pro*;org.eclipse.core.resources.prefs;.cproject;.project;/.settings/,/FmmApi/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/Utils/;Notes;Deprecated;/Build*;/noDist/;/Bench/;/Obsolete/;ToRemove;Olivier;Addons/HMat")
# Uniform;GroupTree;Adaptive;testUnif*;/*Lagrange*")
#list(APPEND CPACK_SOURCE_IGNORE_FILES "Stages;Uniform;Adaptive;testUnif*;*Lagrange*" )
#list(APPEND CPACK_SOURCE_IGNORE_FILES "Stages;Uniform;O;testUnif*;*Lagrange*" )
#
include(CPack)
#
......@@ -951,6 +951,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
# END #
##################################################################
else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/")
message(STATUS "MORSE_DISTRIB_DIR is not set")
......
......@@ -45,7 +45,7 @@ PROJECT_BRIEF =
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
PROJECT_LOGO = /home/berenger/Projets/ScalfmmGit/scalfmm/Doc/scalfmm.png
PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/scalfmm.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......
......@@ -6,8 +6,21 @@
*
* \section download Download ScalFMM
*
* To download ScalFmm go on https://gforge.inria.fr/frs/?group_id=4479 .
*
* YOu can download two versions of scalfmm either the lastest release or the current development distribution.
* The current release is available at
* <ul>
* <li> https://gforge.inria.fr/frs/?group_id=4479 .
* </ul>
* if you are interested by the the current development distribution you can clone the public release
* <ul>
* <li> git clone https://scm.gforge.inria.fr/anonscm/git/scalfmm-public/scalfmm-public.git
* </ul>
* or use spack to install ScalFMM and all its dependencies (fftw, hwloc,openmpi, )
* <ul>
* <li> git clone https://github.com/fpruvost/spack.git
* <li> cd spack
* <li> bin/spack install scalfmm
* </ul>
* You can stay in touch of the updates and new version by registering
* to the users mailing list
* (scalfmm-public-users@lists.gforge.inria.fr) which has a very low
......@@ -18,9 +31,9 @@
*
* <ul>
* <li> CMake for compiling, ccmake for configuring the build. Version 2.8.12.1 or later </li>
* <li> Open MP </li>
* <li> MPI, if you want to use distributed version of the algorithm (Optional) </li>
* <li> A compiler supporting C++ 2011 </li>
* <li> OpenMP compiler</li>
* <li> MPI, if you want to use distributed version of the algorithm (Optional) </li>
* <li> BLAS, FFTW, ... (Optionals) </li>
* </ul>
*
......
......@@ -89,7 +89,7 @@ struct FInterpMatrixKernelR : FInterpAbstractMatrixKernel<FReal>
// returns coefficient of mutual interaction
// 1 for symmetric kernels
// -1 for antisymmetric kernels
// somethings else if other property of symmetry
// Something else if other property of symmetry
FReal getMutualCoefficient() const{ return FReal(1.); }
// evaluate interaction
......@@ -200,7 +200,7 @@ struct FInterpMatrixKernelRH :FInterpMatrixKernelR<FReal>{
// returns coefficient of mutual interaction
// 1 for symmetric kernels
// -1 for antisymmetric kernels
// somethings else if other property of symmetry
// Something else if other property of symmetry
FReal getMutualCoefficient() const{ return FReal(1.); }
template <class ValueClass>
......@@ -284,7 +284,7 @@ struct FInterpMatrixKernelRR : FInterpAbstractMatrixKernel<FReal>
// returns coefficient of mutual interaction
// 1 for symmetric kernels
// -1 for antisymmetric kernels
// somethings else if other property of symmetry
// Something else if other property of symmetry
FReal getMutualCoefficient() const{ return FReal(1.); }
// evaluate interaction
......@@ -493,7 +493,7 @@ struct FInterpMatrixKernelAPLUSRR : FInterpAbstractMatrixKernel<FReal>
// returns coefficient of mutual interaction
// 1 for symmetric kernels
// -1 for antisymmetric kernels
// somethings else if other property of symmetry
// something else if other property of symmetry
FReal getMutualCoefficient() const{ return FReal(1.); }
// evaluate interaction
......
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