From 0ca81df231ba87182431ff1aeb80fa49b0f7805e Mon Sep 17 00:00:00 2001
From: Pierre Blanchard <pierre.blanchard@inria.fr>
Date: Tue, 15 Jul 2014 19:09:25 +0200
Subject: [PATCH] Minor fix in DirectAlgorithm.
---
Tests/Kernels/DirectAlgorithm.cpp | 6 +++---
Tests/Utils/testFastDiscreteConvolution.cpp | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Tests/Kernels/DirectAlgorithm.cpp b/Tests/Kernels/DirectAlgorithm.cpp
index dcee6285a..d1a96e4ad 100755
--- a/Tests/Kernels/DirectAlgorithm.cpp
+++ b/Tests/Kernels/DirectAlgorithm.cpp
@@ -43,6 +43,7 @@
#include "../../Src/Components/FSimpleLeaf.hpp"
#include "../../Src/Kernels/P2P/FP2PParticleContainerIndexed.hpp"
+#include "../../Src/Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
@@ -50,7 +51,6 @@
#ifdef ScalFMM_USE_BLAS
// chebyshev kernel
#include "../../Src/Kernels/Chebyshev/FChebCell.hpp"
-#include "../../Src/Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "../../Src/Kernels/Chebyshev/FChebKernel.hpp"
#include "../../Src/Kernels/Chebyshev/FChebSymKernel.hpp"
#endif
@@ -71,14 +71,14 @@ int main(int argc, char ** argv){
typedef FP2PParticleContainerIndexed<> ContainerClass;
typedef FSimpleLeaf< ContainerClass > LeafClass;
+ typedef FInterpMatrixKernelR MatrixKernelClass;
+ const MatrixKernelClass MatrixKernel;
#ifdef ScalFMM_USE_BLAS
// begin Chebyshev kernel
// accuracy
const unsigned int ORDER = 12;
// typedefs
- typedef FInterpMatrixKernelR MatrixKernelClass;
- const MatrixKernelClass MatrixKernel;
typedef FChebCell<ORDER> CellClass;
typedef FOctree<CellClass,ContainerClass,LeafClass> OctreeClass;
typedef FChebSymKernel<CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
diff --git a/Tests/Utils/testFastDiscreteConvolution.cpp b/Tests/Utils/testFastDiscreteConvolution.cpp
index 2f97289be..8b38d7352 100644
--- a/Tests/Utils/testFastDiscreteConvolution.cpp
+++ b/Tests/Utils/testFastDiscreteConvolution.cpp
@@ -16,6 +16,7 @@
// ==== CMAKE =====
// @FUSE_FFT
+// @FUSE_BLAS
// ================
--
GitLab