Commit b0ecd593 authored by COULAUD Olivier's avatar COULAUD Olivier
Browse files

Fix typo and includes

parent c634eb11
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
// //
#include "Utils/FGlobal.hpp"
#include "Utils/FPoint.hpp"
#include "Files/FFmaGenericLoader.hpp" #include "Files/FFmaGenericLoader.hpp"
#include "Files/FDlpolyLoader.hpp" #include "Files/FDlpolyLoader.hpp"
//
#include "Utils/FGlobal.hpp"
#include "Utils/FPoint.hpp"
#include "Utils/FParameters.hpp" #include "Utils/FParameters.hpp"
#include "Utils/FGenerateDistribution.hpp" #include "Utils/FGenerateDistribution.hpp"
#include "Utils/FParameterNames.hpp"
#include "../Src/Utils/FParameterNames.hpp"
// //
/// \file changeFmaFormat.cpp /// \file changeFmaFormat.cpp
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
int main(int argc, char ** argv){ int main(int argc, char ** argv){
const FParameterNames LocalOptitionHist = { const FParameterNames LocalOptionHist = {
{"-histP", "--histogram-stat"} , {"-histP", "--histogram-stat"} ,
"Build the histogram of the particle number per leaf." "Build the histogram of the particle number per leaf."
}; };
...@@ -65,7 +65,7 @@ int main(int argc, char ** argv){ ...@@ -65,7 +65,7 @@ int main(int argc, char ** argv){
"Driver to obtain statistics on the octree.", "Driver to obtain statistics on the octree.",
FParameterDefinitions::InputFile, FParameterDefinitions::OctreeHeight, FParameterDefinitions::InputFile, FParameterDefinitions::OctreeHeight,
FParameterDefinitions::OctreeSubHeight, FParameterDefinitions::OctreeSubHeight,
FParameterDefinitions::OutputFile, LocalOptitionHist); FParameterDefinitions::OutputFile, LocalOptionHist);
typedef FBasicParticleContainer<0> ContainerClass; typedef FBasicParticleContainer<0> ContainerClass;
...@@ -161,7 +161,7 @@ int main(int argc, char ** argv){ ...@@ -161,7 +161,7 @@ int main(int argc, char ** argv){
// Histogram of particles per leaf // Histogram of particles per leaf
// //
if(FParameters::existParameter(argc, argv, LocalOptitionHist.options)){ if(FParameters::existParameter(argc, argv, LocalOptionHist.options)){
int size = maxParticles+1; int size = maxParticles+1;
int * hist = new int [size] ; int * hist = new int [size] ;
memset(hist,0,(size)*sizeof(int)); memset(hist,0,(size)*sizeof(int));
......
// =================================================================================== // ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner // Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Berenger Bramas, Matthias Messner
// 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.
// //
......
...@@ -152,15 +152,12 @@ static void Run(int argc, char* argv[]) ...@@ -152,15 +152,12 @@ static void Run(int argc, char* argv[])
{ // ----------------------------------------------------- { // -----------------------------------------------------
std::cout << "Creating & Inserting " << loader.getNumberOfParticles() std::cout << "Creating & Inserting " <<nbParticles
<< " 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;
time.tic(); time.tic();
// //
FPoint position; for(int idxPart = 0 ; idxPart < nbParticles; ++idxPart){
FReal physicalValue = 0.0;
//
for(int idxPart = 0 ; idxPart < loader.getNumberOfParticles() ; ++idxPart){
// //
// Read particle per particle from file // Read particle per particle from file
// //
...@@ -259,3 +256,5 @@ int main(int argc, char** argv){ ...@@ -259,3 +256,5 @@ int main(int argc, char** argv){
FRunIf::Run<unsigned int, 2, 13, 1, TempMainStruct>(order, argc, argv); FRunIf::Run<unsigned int, 2, 13, 1, TempMainStruct>(order, argc, argv);
return 0; return 0;
} }
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