diff --git a/Examples/ChebyshevInterpolationAdaptiveFMM.cpp b/Examples/ChebyshevInterpolationAdaptiveFMM.cpp index 745fa76324171a9920b02c9d74fcb9de60137e46..d9880c50c08f63bbf2408eafcb980a5a8c4e46b2 100644 --- a/Examples/ChebyshevInterpolationAdaptiveFMM.cpp +++ b/Examples/ChebyshevInterpolationAdaptiveFMM.cpp @@ -172,16 +172,16 @@ int main(int argc, char* argv[]) { loader.getBoxWidth(), loader.getCenterOfBox(), &MatrixKernel); - if(FParameters::existParameter(argc, argv, FPD::UseSequential.options)) { FmmClassSeq algo(&tree, &kernel); algo.execute(); // FMM algorithm call } else { +#ifndef __INTEL_COMPILER FmmClass algo(&tree, &kernel); - algo.execute(); // FMM algorithm call + algo.execute(); // FMM algorithm call +#endif } - // // time.tac(); @@ -273,7 +273,6 @@ int main(int argc, char* argv[]) { writer.writeArrayOfReal(particles, 8 , NbPoints); delete[] particles; - // // std::string name1( "output.fma"); // diff --git a/Examples/LagrangeInterpolationAdaptiveFMM.cpp b/Examples/LagrangeInterpolationAdaptiveFMM.cpp index ddf0b8f054f4e8918c0b07e322d8445addf01fab..6973959f7d0c25dc394952cc75dedf77b91193d8 100644 --- a/Examples/LagrangeInterpolationAdaptiveFMM.cpp +++ b/Examples/LagrangeInterpolationAdaptiveFMM.cpp @@ -199,8 +199,10 @@ int main(int argc, char* argv[]) { algo.execute(operations); // FMM algorithm call #endif } else { +#ifndef __INTEL_COMPILER FmmClass algo(&tree, &kernel); algo.execute(operations); // FMM algorithm call +#endif } diff --git a/Src/Components/FTypedLeaf.hpp b/Src/Components/FTypedLeaf.hpp index 05f8fc5a6cc6c388742ea7205d9c276d0b7470e6..1c8e69594dec29d2fc0aa053dba348c3548a0ac2 100644 --- a/Src/Components/FTypedLeaf.hpp +++ b/Src/Components/FTypedLeaf.hpp @@ -3,7 +3,7 @@ #define FTYPEDLEAF_HPP -#include "../Utils/FAssert.hpp" +#include "Utils/FAssert.hpp" #include "FAbstractLeaf.hpp" #include "FParticleType.hpp" @@ -37,8 +37,14 @@ public: */ template void push(const FPoint& inParticlePosition, const FParticleType type, Args ... args){ - if(type == FParticleType::FParticleTypeTarget) targets.push(inParticlePosition, FParticleType::FParticleTypeTarget, args...); - else sources.push(inParticlePosition, FParticleType::FParticleTypeSource, args...); + if(type == FParticleType::FParticleTypeTarget) { + targets.push(inParticlePosition, args...); + // targets.push(inParticlePosition, FParticleType::FParticleTypeTarget, args...); + } + else { + //sources.push(inParticlePosition, FParticleType::FParticleTypeSource, args...); + sources.push(inParticlePosition, args...); + } } /**