Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 54a989b4 authored by Olivier COULAUD's avatar Olivier COULAUD
Browse files

end merge

parent f1c73fe2
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ int main(int argc, char* argv[]) ...@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
///////// PARAMETERS HANDLING ////////////////////////////////////// ///////// PARAMETERS HANDLING //////////////////////////////////////
const FParameterNames localIncreaseBox = { {"ratio","-L"}, "Increase teh Box size by a factor L:= ratio"}; const FParameterNames localIncreaseBox = { {"ratio","-L"}, "Increase teh Box size by a factor L:= ratio"};
FHelpDescribeAndExit(argc, argv, FHelpDescribeAndExit(argc, argv,
"Driver for Chebyshev Interpolation kernel using MPI (1/r kernel). " "Driver for Chebyshev Interpolation kernel using MPI (1/r kernel).\n "
"Usully run using : mpirun -np nb_proc_needed ./ChebyshevInterpolationAlgorithm [params].", "Usully run using : mpirun -np nb_proc_needed ./ChebyshevInterpolationAlgorithm [params].",
FParameterDefinitions::OctreeHeight, FParameterDefinitions::OctreeHeight,
FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::OctreeSubHeight,
...@@ -136,7 +136,7 @@ int main(int argc, char* argv[]) ...@@ -136,7 +136,7 @@ int main(int argc, char* argv[])
FSize localParticlesNumber = 0 ; FSize localParticlesNumber = 0 ;
{ // ----------------------------------------------------- // -----------------------------------------------------
if(app.global().processId() == 0){ if(app.global().processId() == 0){
std::cout << "Loading & Inserting " << loader.getNumberOfParticles() std::cout << "Loading & Inserting " << loader.getNumberOfParticles()
<< " particles ..." << std::endl << " particles ..." << std::endl
...@@ -219,7 +219,7 @@ int main(int argc, char* argv[]) ...@@ -219,7 +219,7 @@ int main(int argc, char* argv[])
<< " readinsert-time-max:" << maxTime << " readinsert-time-max:" << maxTime
<< std::endl; << std::endl;
} }
}
// ----------------------------------------------------- // -----------------------------------------------------
std::vector<MortonIndex> mortonLeafDistribution(2*app.global().processCount()); std::vector<MortonIndex> mortonLeafDistribution(2*app.global().processCount());
FAbstractAlgorithm * algorithm = nullptr; FAbstractAlgorithm * algorithm = nullptr;
...@@ -257,8 +257,7 @@ int main(int argc, char* argv[]) ...@@ -257,8 +257,7 @@ int main(int argc, char* argv[])
// //
time.tac(); time.tac();
double timeUsed = time.elapsed(); timeUsed = time.elapsed();
double minTime,maxTime;
std::cout << "Done " << "(@Algorithm = " << time.elapsed() << " s)." << std::endl; std::cout << "Done " << "(@Algorithm = " << time.elapsed() << " s)." << std::endl;
MPI_Reduce(&timeUsed,&minTime,1,MPI_DOUBLE,MPI_MIN,0,app.global().getComm()); MPI_Reduce(&timeUsed,&minTime,1,MPI_DOUBLE,MPI_MIN,0,app.global().getComm());
MPI_Reduce(&timeUsed,&maxTime,1,MPI_DOUBLE,MPI_MAX,0,app.global().getComm()); MPI_Reduce(&timeUsed,&maxTime,1,MPI_DOUBLE,MPI_MAX,0,app.global().getComm());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment