Commit 2afb6697 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille
Browse files

changing name of loader

parent 939bc329
/ =================================================================================== // ===================================================================================
// Copyright ScalFmm 2013 INRIA // Copyright ScalFmm 2013 INRIA
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr // olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// This software is a computer program whose purpose is to compute the FMM. // This software is a computer program whose purpose is to compute the FMM.
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#include "../../Src/Containers/FVector.hpp" #include "../../Src/Containers/FVector.hpp"
#include "../../Src/Files/FFmaScanfLoader.hpp" #include "../../Src/Files/FFmaScanfLoader.hpp"
#include "../../Src/Files/FFmaBinLoader.hpp" #include "../../Src/Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiFmaLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp" #include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/Core/FFmmAlgorithm.hpp" #include "../../Src/Core/FFmmAlgorithm.hpp"
...@@ -101,7 +100,7 @@ int main(int argc, char* argv[]) ...@@ -101,7 +100,7 @@ int main(int argc, char* argv[])
}; };
// open particle file // open particle file
FMpiFmaLoader loader(filename,app.global()); FMpiFmaGenericLoader loader(filename,app.global());
if(!loader.isOpen()) throw std::runtime_error("Particle file couldn't be opened!"); if(!loader.isOpen()) throw std::runtime_error("Particle file couldn't be opened!");
OctreeClass tree(TreeHeight, SubTreeHeight,loader.getBoxWidth(),loader.getCenterOfBox()); OctreeClass tree(TreeHeight, SubTreeHeight,loader.getBoxWidth(),loader.getCenterOfBox());
...@@ -113,12 +112,16 @@ int main(int argc, char* argv[]) ...@@ -113,12 +112,16 @@ int main(int argc, char* argv[])
} }
FVector<TestParticle> finalParticles; FVector<TestParticle> finalParticles;
FLeafBalance balancer; FLeafBalance balancer;
FMpiTreeBuilder< TestParticle >::ArrayToTree(app.global(), particles, loader.getNumberOfParticles(), // FMpiTreeBuilder< TestParticle >::ArrayToTree(app.global(), particles, loader.getNumberOfParticles(),
tree.getBoxCenter(), // tree.getBoxCenter(),
tree.getBoxWidth(), // tree.getBoxWidth(),
tree.getHeight(), &finalParticles, &balancer); // tree.getHeight(), &finalParticles, &balancer);
FMpiTreeBuilder< TestParticle >::DistributeArrayToContainer(app.global(),particles,
{ // ----------------------------------------------------- loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
tree.getBoxWidth(),tree.getHeight(),
&finalParticles, &balancer);
{ // -----------------------------------------------------
std::cout << "Creating & Inserting " << loader.getNumberOfParticles() std::cout << "Creating & Inserting " << loader.getNumberOfParticles()
<< " particles ..." << std::endl; << " particles ..." << std::endl;
std::cout << "\tHeight : " << TreeHeight << " \t sub-height : " << SubTreeHeight << std::endl; std::cout << "\tHeight : " << TreeHeight << " \t sub-height : " << SubTreeHeight << std::endl;
......
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