Mentions légales du service

Skip to content
Snippets Groups Projects
Commit f58ceac8 authored by Olivier COULAUD's avatar Olivier COULAUD
Browse files

Ready to push the modifications in OptiDis

Tests pass on MacOS X
parent e6421c6c
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@ SET(SCALFMM_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include")
SET(SCALFMM_LIBRARIES_DIR "@CMAKE_INSTALL_PREFIX@/lib")
SET(SCALFMM_LIBRARIES_ADD "@SCALFMM_LIBRARIES@")
SET(SCALFMM_LIBRARY_NAME "@scalfmm_lib@")
SET(ScaLFMM_CXX_FLAGS "@ScaLFMM_CXX_FLAGS@")
SET(ScaLFMM_CXX_FLAGS "@SCALFMM_CXX_FLAGS@")
#
SET(SCALFMM_SOURCE_DIR "@SCALFMM_SOURCE_DIR@")
SET(SCALFMM_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
......@@ -27,15 +27,14 @@ SET(SCALFMM_BUILD_TYPE "@CMAKE_BUILD_TYPE@")
# SCALFMM Options
#
SET(SCALFMM_USE_MPI "@SCALFMM_USE_MPI@")
SET(SCALFMM_USE_BLAS "@ScaLFMM_USE_BLAS@")
SET(SCALFMM_USE_BLAS "@SCALFMM_USE_BLAS@")
SET(SCALFMM_USE_FFT "@SCALFMM_USE_FFT@")
SET(SCALFMM_USE_MKL "@SCALFMM_USE_MKL_AS_BLAS@")
SET(SCALFMM_USE_DOUBLE_PRECISION "@SCALFMM_USE_DOUBLE_PRECISION@")
SET(SCALFMM_USE_MEM_STATS "@SCALFMM_USE_MEM_STATS@")
SET(SCALFMM_USE_SSE "@SCALFMM_USE_SSE@")
SET(SCALFMM_FLAGS "@ScaLFMM_FLAGS_OPTI@")
SET(SCALFMM_FLAGS "@SCALFMM_FLAGS_OPTI@")
SET(SCALFMM_USE_ADDONS "@SCALFMM_USE_ADDONS@")
SET(SCALFMM_USE_LOG "@SCALFMM_USE_LOG@")
SET(SCALFMM_USE_FFT "@SCALFMM_USE_FFT@")
SET(SCALFMM_USE_STARPU "@SCALFMM_USE_STARPU@")
SET(SCALFMM_USE_SSE "@SCALFMM_USE_SSE@")
SET(SCALFMM_USE_AVX "@SCALFMM_USE_AVX@")
......
// ===================================================================================
// 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.
//
......@@ -33,7 +33,7 @@ int main(int argc, char ** argv){
FLOG( FLog::Controller << "Hello Wordl\n");
// Print a variable (formated print)
int i = 50;
FLOG( int i = 50;)
FLOG( FLog::Controller.writeVariableFromLine( "i", i, __LINE__, __FILE__););
// Write a developer information
......
......@@ -92,6 +92,8 @@ class TestRotationDirectPeriodic : public FUTester<TestRotationDirectPeriodic> {
KernelClass *kernels = new KernelClass( algo.extendedTreeHeight(), algo.extendedBoxWidth(), algo.extendedBoxCenter());
algo.setKernel(kernels);
algo.execute();
//
delete kernels ;
// Run Direct
Print("Run direct...");
......@@ -134,7 +136,6 @@ class TestRotationDirectPeriodic : public FUTester<TestRotationDirectPeriodic> {
}
}
}
delete kernel ;
FReal energy= 0.0 , energyD = 0.0 ;
/////////////////////////////////////////////////////////////////////////////////////////////////
// Compute direct energy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment