exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BUGFIX: options treatment in metisDecomp

Browse source
This commit is contained in:
Henrik Rusche 2013-11-30 13:58:02 +01:00
parent bdfab2bc48
commit 9f384472d4
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/decompositionMethods/metisDecomp/metisDecomp.C
View file

@ -70,7 +70,8 @@ Foam::label Foam::metisDecomp::decompose
int numCells = xadj.size()-1; int numCells = xadj.size()-1;
// decomposition options. 0 = use defaults // decomposition options. 0 = use defaults
List<int> options(5, 0); idx_t options[METIS_NOPTIONS];
METIS_SetDefaultOptions(options);
// processor weights initialised with no size, only used if specified in // processor weights initialised with no size, only used if specified in
// a file // a file
@ -139,18 +140,24 @@ Foam::label Foam::metisDecomp::decompose
<< nl << endl; << nl << endl;
} }
if (metisCoeffs.readIfPresent("options", options)) List<int> mOptions;
if (metisCoeffs.readIfPresent("options", mOptions))
{ {
if (options.size() != 5) if (mOptions.size() != METIS_NOPTIONS)
{ {
FatalErrorIn("metisDecomp::decompose()") FatalErrorIn("metisDecomp::decompose()")
<< "Number of options in metisCoeffs in dictionary : " << "Number of options in metisCoeffs in dictionary : "
<< decompositionDict_.name() << decompositionDict_.name()
<< " should be 5" << " should be " << METIS_NOPTIONS
<< exit(FatalError); << exit(FatalError);
} }
Info<< "metisDecomp : Using Metis options " << options forAll(mOptions, i)
{
options[i] = mOptions[i];
}
Info<< "metisDecomp : Using Metis options " << mOptions
<< nl << endl; << nl << endl;
} }
@ -232,7 +239,7 @@ Foam::label Foam::metisDecomp::decompose
&nProcs, &nProcs,
processorWeights.begin(), processorWeights.begin(),
NULL, NULL,
options.begin(), options,
&edgeCut, &edgeCut,
finalDecomp.begin() finalDecomp.begin()
); );
@ -251,7 +258,7 @@ Foam::label Foam::metisDecomp::decompose
&nProcs, &nProcs,
processorWeights.begin(), processorWeights.begin(),
NULL, NULL,
options.begin(), options,
&edgeCut, &edgeCut,
finalDecomp.begin() finalDecomp.begin()
); );