Commit 5eccb5e5 authored by COULAUD Olivier's avatar COULAUD Olivier

Add Intel flag to compile - Check error with TSM and task-based adaptive algorithm

parent ea5f1b4d
...@@ -172,16 +172,16 @@ int main(int argc, char* argv[]) { ...@@ -172,16 +172,16 @@ int main(int argc, char* argv[]) {
loader.getBoxWidth(), loader.getBoxWidth(),
loader.getCenterOfBox(), loader.getCenterOfBox(),
&MatrixKernel); &MatrixKernel);
if(FParameters::existParameter(argc, argv, FPD::UseSequential.options)) { if(FParameters::existParameter(argc, argv, FPD::UseSequential.options)) {
FmmClassSeq algo(&tree, &kernel); FmmClassSeq algo(&tree, &kernel);
algo.execute(); // FMM algorithm call algo.execute(); // FMM algorithm call
} else { } else {
#ifndef __INTEL_COMPILER
FmmClass algo(&tree, &kernel); FmmClass algo(&tree, &kernel);
algo.execute(); // FMM algorithm call algo.execute(); // FMM algorithm call
#endif
} }
// //
// //
time.tac(); time.tac();
...@@ -273,7 +273,6 @@ int main(int argc, char* argv[]) { ...@@ -273,7 +273,6 @@ int main(int argc, char* argv[]) {
writer.writeArrayOfReal(particles, 8 , NbPoints); writer.writeArrayOfReal(particles, 8 , NbPoints);
delete[] particles; delete[] particles;
// //
// std::string name1( "output.fma"); // std::string name1( "output.fma");
// //
......
...@@ -199,8 +199,10 @@ int main(int argc, char* argv[]) { ...@@ -199,8 +199,10 @@ int main(int argc, char* argv[]) {
algo.execute(operations); // FMM algorithm call algo.execute(operations); // FMM algorithm call
#endif #endif
} else { } else {
#ifndef __INTEL_COMPILER
FmmClass algo(&tree, &kernel); FmmClass algo(&tree, &kernel);
algo.execute(operations); // FMM algorithm call algo.execute(operations); // FMM algorithm call
#endif
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FTYPEDLEAF_HPP #define FTYPEDLEAF_HPP
#include "../Utils/FAssert.hpp" #include "Utils/FAssert.hpp"
#include "FAbstractLeaf.hpp" #include "FAbstractLeaf.hpp"
#include "FParticleType.hpp" #include "FParticleType.hpp"
...@@ -37,8 +37,14 @@ public: ...@@ -37,8 +37,14 @@ public:
*/ */
template<typename... Args> template<typename... Args>
void push(const FPoint<FReal>& inParticlePosition, const FParticleType type, Args ... args){ void push(const FPoint<FReal>& inParticlePosition, const FParticleType type, Args ... args){
if(type == FParticleType::FParticleTypeTarget) targets.push(inParticlePosition, FParticleType::FParticleTypeTarget, args...); if(type == FParticleType::FParticleTypeTarget) {
else sources.push(inParticlePosition, FParticleType::FParticleTypeSource, args...); targets.push(inParticlePosition, args...);
// targets.push(inParticlePosition, FParticleType::FParticleTypeTarget, args...);
}
else {
//sources.push(inParticlePosition, FParticleType::FParticleTypeSource, args...);
sources.push(inParticlePosition, args...);
}
} }
/** /**
......
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