COMP: use std::move() explicitly to avoid copying

This commit is contained in:
Mark Olesen
2019-01-02 15:56:54 +01:00
parent f67f36c63a
commit e2bc0b55b9
5 changed files with 15 additions and 15 deletions

View File

@ -98,7 +98,6 @@ Foam::labelList Foam::manualDecomp::decompose
);
// Check if the final decomposition is OK
if (finalDecomp.size() != points.size())
{
FatalErrorInFunction
@ -111,18 +110,21 @@ Foam::labelList Foam::manualDecomp::decompose
<< exit(FatalError);
}
if (min(finalDecomp) < 0 || max(finalDecomp) > nDomains_ - 1)
const label minVal = min(finalDecomp);
const label maxVal = max(finalDecomp);
if (minVal < 0 || maxVal >= nDomains_)
{
FatalErrorInFunction
<< "According to the decomposition, cells assigned to "
<< "impossible processor numbers. Min processor = "
<< min(finalDecomp) << " Max processor = " << max(finalDecomp)
<< minVal << " Max processor = " << maxVal
<< ".\n" << "Manual decomposition data read from file "
<< dataFile_ << "." << endl
<< exit(FatalError);
}
return finalDecomp;
return std::move(finalDecomp);
}

View File

@ -76,8 +76,7 @@ Foam::labelList Foam::manualRenumber::renumber
)
);
// check if the final renumbering is OK
// Check if the final renumbering is OK
if (newToOld.size() != points.size())
{
FatalErrorInFunction
@ -94,7 +93,7 @@ Foam::labelList Foam::manualRenumber::renumber
labelList oldToNew(points.size(), -1);
forAll(newToOld, i)
{
label origCelli = newToOld[i];
const label origCelli = newToOld[i];
if (origCelli < 0 || origCelli >= points.size())
{
@ -122,7 +121,7 @@ Foam::labelList Foam::manualRenumber::renumber
}
}
return newToOld;
return std::move(newToOld);
}