diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C index 6296b29bf9e681d5cd48f3c9c63269c7ba972f99..c7c1a4ac4e9b49de096f29b4044b6110d72c45cf 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C @@ -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_ diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 95a6829c105d7ad3e91567b11e3882b33119765d..22b905f42e6a4adcf60b44ddfe45bfa4cac92370 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -1754,7 +1754,7 @@ int main(int argc, char *argv[]) distributor, globalToMasterPatch, globalToSlavePatch, - setFormatter, + setFormatter(), dryRun ); diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C index 642f844f62d025441aaffde36a5d912ff6965d98..7e3f5cd883b4986ce6a7cf0b5e7c401a0b9114a2 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C @@ -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; } diff --git a/src/meshTools/PatchFunction1/MappedFile/rawIOField.C b/src/meshTools/PatchFunction1/MappedFile/rawIOField.C index 76defd3c02cf5adefb1a029657e6ed9e98e4d4e4..15e6fdd85e3ddcb2c1cac92e4fad4d151f6b9cf9 100644 --- a/src/meshTools/PatchFunction1/MappedFile/rawIOField.C +++ b/src/meshTools/PatchFunction1/MappedFile/rawIOField.C @@ -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