Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
f58ceac8
Commit
f58ceac8
authored
Mar 27, 2015
by
COULAUD Olivier
Browse files
Ready to push the modifications in OptiDis
Tests pass on MacOS X
parent
e6421c6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
ScalFMMConfig.cmake.in
View file @
f58ceac8
...
...
@@ -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 "@S
ca
LFMM_CXX_FLAGS@")
SET(ScaLFMM_CXX_FLAGS "@S
CA
LFMM_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 "@S
ca
LFMM_FLAGS_OPTI@")
SET(SCALFMM_FLAGS "@S
CA
LFMM_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@")
...
...
Tests/Utils/testDebug.cpp
View file @
f58ceac8
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
é
renger Bramas, Matthias Messner
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
e
renger 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
...
...
UTests/utestRotationDirectPeriodic.cpp
View file @
f58ceac8
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment