Commit b3a7a551 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille
parents 9157b065 98d03bee
......@@ -7,6 +7,12 @@ Doc/html/
#ignore executables
*.exe
*.o
#ignore eclipse file
org.eclipse.core.resources.prefs
.cproject
.project
#ignore temporary files
tmp/
......@@ -17,6 +23,10 @@ tmp/
*TAGS
*#*#
*nogit*
*.swp
#ignore build repository
Build*
#ignore latex temporary files
*.out
......@@ -25,3 +35,10 @@ tmp/
*.log
*.aux
*.brf
*.bbl
*.blg
*.synctex.*
*_latexmk
*.fls
*-converted-*
......@@ -305,6 +305,7 @@ endif()
# Build - UTests
MESSAGE( STATUS "ScalFMM_BUILD_UTESTS = ${ScalFMM_BUILD_UTESTS}" )
if( ScalFMM_BUILD_UTESTS )
INCLUDE(CTEST)
ENABLE_TESTING()
add_subdirectory(UTests)
endif()
......@@ -346,6 +347,10 @@ INSTALL(FILES
${ScalFMM_BINARY_DIR}/ScalFMMConfig.cmake
DESTINATION lib/
)
INSTALL(FILES
${ScalFMM_SOURCE_DIR}/Data/test20k.fma
DESTINATION Data/
)
#
# Add CPACK Module
# ----------------
......
......@@ -82,7 +82,7 @@ void usage() {
// Simply create particles and try the kernels
int main(int argc, char* argv[])
{
const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma");
const std::string defaultFile(/*SCALFMMDataPath+*/"../Data/test20k.fma" );
const std::string filename = FParameters::getStr(argc,argv,"-f", defaultFile.c_str());
const unsigned int TreeHeight = FParameters::getValue(argc, argv, "-depth", 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, "-subdepth", 2);
......
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Berenger Bramas, Matthias Messner
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// This software is a computer program whose purpose is to compute the FMM.
//
......@@ -16,11 +16,10 @@
#ifndef FBLOCKALLOCATOR_HPP
#define FBLOCKALLOCATOR_HPP
#include <list>
#include <list>
#include <cstring>
#include "../Utils/FAssert.hpp"
#include "Utils/FAssert.hpp"
/**
* What a cell allocator should implement
......
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