From 7069c5bd6e16d74a6a55f9df66d00ec7966bada2 Mon Sep 17 00:00:00 2001
From: Quentin Khan <quentin.khan@inria.fr>
Date: Mon, 16 Mar 2015 17:11:31 +0100
Subject: [PATCH] Adjustments to loadFMAAndRunFMM
---
Examples/loadFMAAndRunFMM.cpp | 9 +++------
Examples/loadFMAAndRunFMMArgs.hpp | 5 +++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Examples/loadFMAAndRunFMM.cpp b/Examples/loadFMAAndRunFMM.cpp
index bc3eb820d..cb6dc9aad 100644
--- a/Examples/loadFMAAndRunFMM.cpp
+++ b/Examples/loadFMAAndRunFMM.cpp
@@ -66,14 +66,11 @@ int main(int argc, char** argv)
// GCC versions before 5.0 have not implemented move constructors to streams
std::vector<std::unique_ptr<std::ofstream>> outfiles;
- for ( int i = 0; i < args.treeHeight(); i++ ) {
+ for ( int zoneIdx = 0; zoneIdx < args.treeHeight(); zoneIdx++ ) {
std::unique_ptr<std::ofstream> out(
new std::ofstream( args.outFileName()
- + "_"
- + std::to_string(args.zoneCount())
- + "z"
- + "."
- + std::to_string(i)
+ + "_" + std::to_string(args.zoneCount()) + "z"
+ + "." + std::to_string(zoneIdx)
+ args.outFileExt()));
*out << "x,y,z,zone" << std::endl;
outfiles.push_back(std::move(out));
diff --git a/Examples/loadFMAAndRunFMMArgs.hpp b/Examples/loadFMAAndRunFMMArgs.hpp
index e55bdef43..2f1285945 100644
--- a/Examples/loadFMAAndRunFMMArgs.hpp
+++ b/Examples/loadFMAAndRunFMMArgs.hpp
@@ -44,8 +44,9 @@ class loadFMAAndRunFMMArgs {
TCLAP::ValueArg <std::string>
_outFileExt { "x", "output-file-extension",
"Output files extension. One file is created for each level in the"
- " tree. Each file has a 'basename.$i.extension' extension where $i"
- " is the level. Default value is " + _outFileNameExtInit + ".",
+ " tree. Each file has a 'basename_$nbZones$z.$i$.extension' "
+ "extension where $i is the level. Default value is "
+ + _outFileNameExtInit + ".",
false, _outFileNameExtInit, "suffix", _cmd};
TCLAP::ValueArg <std::string>
--
GitLab