From 03707989b71527528109984a628d228eca7c443d Mon Sep 17 00:00:00 2001 From: Olivier Coulaud <Olivier.Coulaud@inria.fr> Date: Thu, 21 Sep 2017 11:10:22 +0200 Subject: [PATCH] Indentation + Initialization --- Src/Core/FFmmAlgorithmThread.hpp | 3 +++ Src/Kernels/Interpolation/FInterpSymmetries.hpp | 5 +++-- Src/Kernels/Uniform/FUnifM2LHandler.hpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Src/Core/FFmmAlgorithmThread.hpp b/Src/Core/FFmmAlgorithmThread.hpp index 6d95f55ef..3d2b0e0c7 100644 --- a/Src/Core/FFmmAlgorithmThread.hpp +++ b/Src/Core/FFmmAlgorithmThread.hpp @@ -90,6 +90,9 @@ public: FAbstractAlgorithm::setNbLevelsInTree(tree->getHeight()); + for(int idxShape = 0 ; idxShape < SizeShape ; ++idxShape){ + this->shapeLeaf[idxShape] = 0; + } FLOG(FLog::Controller << "FFmmAlgorithmThread (Max Thread " << omp_get_max_threads() << ")\n"); FLOG(FLog::Controller << "\t static schedule " << (userChunkSize == -1 ? "static" : (userChunkSize == 0 ? "N/p^2" : std::to_string(userChunkSize))) << ")\n"); } diff --git a/Src/Kernels/Interpolation/FInterpSymmetries.hpp b/Src/Kernels/Interpolation/FInterpSymmetries.hpp index f1d76b100..3138664e2 100644 --- a/Src/Kernels/Interpolation/FInterpSymmetries.hpp +++ b/Src/Kernels/Interpolation/FInterpSymmetries.hpp @@ -47,8 +47,9 @@ class FInterpSymmetries unsigned int cones[8][nnodes]; // set quads and cones permutations - unsigned int evn[ORDER]; unsigned int odd[ORDER]; - for (unsigned int o=0; o<ORDER; ++o) {evn[o] = o; odd[o] = ORDER-1 - o;} + unsigned int evn[ORDER], odd[ORDER]; + for (unsigned int o=0; o<ORDER; ++o) + {evn[o] = o; odd[o] = ORDER-1 - o;} for (unsigned int i=0; i<ORDER; ++i) { for (unsigned int j=0; j<ORDER; ++j) { diff --git a/Src/Kernels/Uniform/FUnifM2LHandler.hpp b/Src/Kernels/Uniform/FUnifM2LHandler.hpp index 0b81ab5d6..23a8956cb 100644 --- a/Src/Kernels/Uniform/FUnifM2LHandler.hpp +++ b/Src/Kernels/Uniform/FUnifM2LHandler.hpp @@ -40,7 +40,7 @@ static void Compute(const MatrixKernelClass *const MatrixKernel, const FReal Cel TensorType::setRoots(FPoint<FReal>(0.,0.,0.), CellWidth, X); // allocate memory and compute 316 m2l operators (342 if separation equals 0, 343 if separation equals -1) - FReal *_C; + FReal *_C; FComplex<FReal> *_FC; // reduce storage from nnodes^2=order^6 to (2order-1)^3 -- GitLab