zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: avoid autoPtr copy assignment and implicit casting

Browse Source
This commit is contained in:
Mark Olesen
2020-10-13 19:00:35 +02:00
parent f0d4f7cdc5
commit 132ae101f6
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
View File

@ -593,8 +593,6 @@ void Foam::radiation::laserDTRM::calculate()
labelField reflectingCells(mesh_.nCells(), -1);
autoPtr<interpolationCellPoint<vector>> nHatIntrPtr;
UPtrList<reflectionModel> reflectionUPtr;
if (reflectionSwitch_)
@ -653,10 +651,7 @@ void Foam::radiation::laserDTRM::calculate()
}
}
nHatIntrPtr.reset
(
new interpolationCellPoint<vector>(nHat)
);
interpolationCellPoint<vector> nHatInterp(nHat);
DTRMParticle::trackingData td
(
@ -665,7 +660,7 @@ void Foam::radiation::laserDTRM::calculate()
eInterp,
EInterp,
TInterp,
nHatIntrPtr,
nHatInterp,
reflectingCells,
reflectionUPtr,
Q_

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -1754,7 +1754,7 @@ int main(int argc, char *argv[])
distributor,
globalToMasterPatch,
globalToSlavePatch,
setFormatter,
setFormatter(),
dryRun
);

6
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View File

@ -288,7 +288,7 @@ void Foam::AMIInterpolation::agglomerate
// Agglomerate weights and indices
if (targetMapPtr)
{
const mapDistribute& map = targetMapPtr();
const mapDistribute& map = *targetMapPtr;
// Get all restriction addressing.
labelList allRestrict(targetRestrictAddressing);
@ -828,8 +828,8 @@ void Foam::AMIInterpolation::reset
tgtWeightsSum_[facei] = sum(tgtWeights_[facei]);
}
srcMapPtr_ = srcToTgtMap;
tgtMapPtr_ = tgtToSrcMap;
srcMapPtr_ = std::move(srcToTgtMap);
tgtMapPtr_ = std::move(tgtToSrcMap);
upToDate_ = true;
}

5
src/meshTools/PatchFunction1/MappedFile/rawIOField.C
View File

@ -107,8 +107,9 @@ Foam::rawIOField<Type>::rawIOField(const IOobject& io, const bool readAverage)
{
if (io.readOpt() != IOobject::READ_IF_PRESENT)
{
FatalIOErrorInFunction(isPtr)
<< "Trying to read raw field" << exit(FatalIOError);
FatalIOErrorInFunction(*isPtr)
<< "Trying to read raw field" << endl
<< exit(FatalIOError);
}
}
else