From 132ae101f6613cf12bc456ad09005bd079ca5842 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Oct 2020 19:00:35 +0200
Subject: [PATCH] COMP: avoid autoPtr copy assignment and implicit casting
---
.../icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C | 9 ++-------
.../mesh/generation/snappyHexMesh/snappyHexMesh.C | 2 +-
.../AMIInterpolation/AMIInterpolation/AMIInterpolation.C | 6 +++---
src/meshTools/PatchFunction1/MappedFile/rawIOField.C | 5 +++--
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
index 6296b29bf9e..c7c1a4ac4e9 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 95a6829c105..22b905f42e6 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 642f844f62d..7e3f5cd883b 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 76defd3c02c..15e6fdd85e3 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
--
GitLab