Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 33701cb2 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille

Change to kernel constructor prototype for Chebyshev and Uniform. Changes...

Change to kernel constructor prototype for Chebyshev and Uniform. Changes propagated to all Test and UTest files (I hope)
parent c8140c4b
......@@ -79,8 +79,8 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FAbstractChebKernel(const int inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth)
const FReal inBoxWidth,
const FPoint& inBoxCenter)
: Interpolator(new InterpolatorClass()),
MatrixKernel(new MatrixKernelClass()),
TreeHeight(inTreeHeight),
......
......@@ -105,8 +105,8 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FChebFlopsSymKernel(const int _inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth,
const FPoint& inBoxCenter,
const FReal Epsilon)
: MatrixKernel(new MatrixKernelClass()),
SymHandler(new SymmetryHandler(MatrixKernel.getPtr(), Epsilon)), inTreeHeight(_inTreeHeight),
......
......@@ -61,12 +61,12 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FChebKernel(const int inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth,
const FPoint& inBoxCenter,
const FReal Epsilon)
: FAbstractChebKernel< CellClass, ContainerClass, MatrixKernelClass, ORDER, NVALS>(inTreeHeight,
inBoxCenter,
inBoxWidth),
inBoxWidth,
inBoxCenter),
M2LHandler(new M2LHandlerClass(Epsilon))
{
// read precomputed compressed m2l operators from binary file
......
......@@ -107,10 +107,10 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FChebSymKernel(const int inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth,
const FPoint& inBoxCenter,
const FReal Epsilon)
: AbstractBaseClass(inTreeHeight, inBoxCenter, inBoxWidth),
: AbstractBaseClass(inTreeHeight, inBoxWidth, inBoxCenter),
SymHandler(new SymmetryHandlerClass(AbstractBaseClass::MatrixKernel.getPtr(), Epsilon, inBoxWidth, inTreeHeight)),
Loc(NULL), Mul(NULL), countExp(NULL)
{
......
......@@ -79,8 +79,8 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FAbstractUnifKernel(const int inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth)
const FReal inBoxWidth,
const FPoint& inBoxCenter)
: Interpolator(new InterpolatorClass()),
MatrixKernel(new MatrixKernelClass()),
TreeHeight(inTreeHeight),
......
......@@ -61,11 +61,11 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FUnifKernel(const int inTreeHeight,
const FPoint& inBoxCenter,
const FReal inBoxWidth)
const FReal inBoxWidth,
const FPoint& inBoxCenter)
: FAbstractUnifKernel< CellClass, ContainerClass, MatrixKernelClass, ORDER, NVALS>(inTreeHeight,
inBoxCenter,
inBoxWidth),
inBoxWidth,
inBoxCenter),
M2LHandler(new M2LHandlerClass())
{
// read precomputed compressed m2l operators from binary file
......
......@@ -158,7 +158,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nChebyshev FMM (ORDER="<< ORDER << ",EPS="<< epsilon <<") ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algorithm(&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -134,7 +134,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nChebyshev FMM (ORDER="<< ORDER << ",EPS="<< epsilon <<") ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algorithm(app.global(),&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -153,7 +153,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nChebyshev FMM ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algorithm(&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
// -----------------------------------------------------
std::cout << "\nChebyshev FMM ... " << std::endl;
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(TreeHeight, loader.getBoxWidth(),loader.getCenterOfBox(), epsilon);
FmmClass algorithm(&tree,&kernels);
time.tic();
algorithm.execute();
......
......@@ -152,7 +152,7 @@ int main(int argc, char* argv[])
typedef FOctree<CellClass,ContainerClass,LeafClass> OctreeClass;
typedef FChebSymKernel<CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
// typedef FChebKernel<CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
// typedef FChebKernDel<CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
typedef FFmmAlgorithm<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
......@@ -178,7 +178,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nChebyshev FMM ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algorithm(&tree, &kernels);
algorithm.execute();
time.tac();
......@@ -333,7 +333,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nLagrange FMM ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth());
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox());
FmmClass algorithm(&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -158,7 +158,7 @@ int main(int argc, char ** argv){
#ifndef ScalFMM_USE_BLAS
KernelClass kernels( DevP, NbLevels, loader.getBoxWidth(), loader.getCenterOfBox());
#else
KernelClass kernels( NbLevels, loader.getCenterOfBox(), loader.getBoxWidth(),epsilon);
KernelClass kernels( NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
#endif
FmmClassNoPer algo(&tree,&kernels);
algo.execute();
......@@ -170,7 +170,7 @@ int main(int argc, char ** argv){
KernelClass kernels( DevP, algo.extendedTreeHeight(), algo.extendedBoxWidth(),algo.extendedBoxCenter());
// KernelClass kernels( DevP, algo.extendedTreeHeight(), algo.extendedBoxWidth(),algo.extendedBoxCenter());
#else
KernelClass kernels(algo.extendedTreeHeight(), algo.extendedBoxCenter(), algo.extendedBoxWidth(),epsilon);
KernelClass kernels(algo.extendedTreeHeight(), algo.extendedBoxWidth(),algo.extendedBoxCenter(), epsilon);
#endif
algo.setKernel(&kernels);
algo.execute();
......
......@@ -156,7 +156,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nLagrange/Uniform grid FMM (ORDER="<< ORDER << ") ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth());
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox());
FmmClass algorithm(&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -133,7 +133,7 @@ int main(int argc, char* argv[])
{ // -----------------------------------------------------
std::cout << "\nChebyshev FMM (ORDER="<< ORDER << ",EPS="<< epsilon <<") ... " << std::endl;
time.tic();
KernelClass kernels(TreeHeight, loader.getCenterOfBox(), loader.getBoxWidth());
KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox());
FmmClass algorithm(app.global(),&tree, &kernels);
algorithm.execute();
time.tac();
......
......@@ -22,10 +22,10 @@
#include <stdlib.h>
// include for libfftw3
//#include <fftw3.h>
#include <fftw3.h>
// include for mkl_fftw3
#include <fftw/fftw3.h>
//#include <fftw/fftw3.h>
#include "../../Src/Utils/FGlobal.hpp"
#include "../../Src/Utils/FComplexe.hpp"
......
......@@ -105,7 +105,7 @@ class TestChebyshevDirect : public FUTester<TestChebyshevDirect> {
// Run FMM
Print("Fmm...");
KernelClass kernels(NbLevels, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algo(&tree,&kernels);
algo.execute();
......
......@@ -96,8 +96,8 @@ class TestChebyshevDirect : public FUTester<TestChebyshevDirect> {
// Run FMM
Print("Fmm...");
FmmClass algo(&tree,PeriodicDeep );
KernelClass kernels(algo.extendedTreeHeight(), algo.extendedBoxCenter(),
algo.extendedBoxWidth(), epsilon);
KernelClass kernels(algo.extendedTreeHeight(), algo.extendedBoxWidth(),
algo.extendedBoxCenter(), epsilon);
algo.setKernel(&kernels);
algo.execute();
......
......@@ -105,7 +105,7 @@ class TestChebyshevDirect : public FUTester<TestChebyshevDirect> {
// Run FMM
Print("Fmm...");
KernelClass kernels(NbLevels, loader.getCenterOfBox(), loader.getBoxWidth(), epsilon);
KernelClass kernels(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), epsilon);
FmmClass algo(&tree,&kernels);
algo.execute();
......
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