Commit c6d8e73b authored by Quentin Khan's avatar Quentin Khan

testFMpiFmaDivider: changed default output filename

testFMpiFmaDividerArgs: modified help message to include dispatch policy
                        & refactorded dispatchPolicy member
parent 132f5145
......@@ -15,7 +15,8 @@ int main(int argc, char** argv)
FMpiFmaDivider<FReal>
divider(args.inFileName(),
args.outFileName() + "_" + std::to_string(args.zoneCount())
args.outFileName() + "_" + args.dispatchPolicyString()
+ "_" + std::to_string(args.zoneCount())
+ "z_h" + std::to_string(args.treeHeight()),
args.outFileExt(),
args.zoneCount(),
......
......@@ -16,7 +16,6 @@
class testFMpiFmaDividerArgs {
const int _treeHeightInit = 5;
const int _subTreeHeightInit = 1;
const int _zoneCountInit = omp_get_max_threads();
const int _verboseInit = 0;
const char* _inFileNameInit = "";
......@@ -53,14 +52,6 @@ public:
return getValue(_argc, _argv, OctreeHeight.options, _treeHeightInit);
}
int subTreeHeight() const {
using namespace FParameterDefinitions;
using namespace FParameters;
return getValue(_argc, _argv, OctreeSubHeight.options,
_subTreeHeightInit);
}
int zoneCount() const {
using namespace FParameterDefinitions;
using namespace FParameters;
......@@ -112,11 +103,17 @@ public:
return ext;
}
int dispatchPolicy() {
std::string dispatchPolicyString() const {
using namespace FParameterDefinitions;
using namespace FParameters;
std::string str = getStr(_argc, _argv, DispatchPolicy.options, _dispatchPolicyInit);
return str;
}
int dispatchPolicy() const {
std::string str = dispatchPolicyString();
if ( "particles" == str ) {
return 0;
} else {
......@@ -137,13 +134,12 @@ public:
"Loads an FMA file into a tree and runs a pseudo FMM algorithm "
"through it to compute load balancing.",
OctreeHeight,
OctreeSubHeight,
InputFile,
OutputFileBasename,
OutputFileExtension,
ZoneCount,
DispatchPolicy,
EnabledVerbose
DispatchPolicy
);
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