diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 3d51ee57cd00a44ec53fe35e00a9c46b7476a35e..2815e566905540eeb6a1b0e5f629a98ce77dfd50 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -426,7 +426,7 @@ Foam::multiphaseSystem::multiphaseSystem
iter(),
*phases_.lookup(iter.key().first()),
*phases_.lookup(iter.key().second())
- ).ptr()
+ )
);
}
@@ -664,7 +664,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
Foam::autoPtr<Foam::multiphaseSystem::dragCoeffFields>
Foam::multiphaseSystem::dragCoeffs() const
{
- autoPtr<dragCoeffFields> dragCoeffsPtr(new dragCoeffFields);
+ auto dragCoeffsPtr = autoPtr<dragCoeffFields>::New();
forAllConstIter(dragModelTable, dragModels_, iter)
{
@@ -706,7 +706,7 @@ Foam::multiphaseSystem::dragCoeffs() const
}
}
- dragCoeffsPtr().insert(iter.key(), Kptr);
+ dragCoeffsPtr().set(iter.key(), Kptr);
}
return dragCoeffsPtr;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 16d01d3a710516bff927367550d01d4673f2820b..b985ef2ad003e4becadb4e30153a2052fe9ce522 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -70,7 +70,7 @@ HeatAndMassTransferPhaseSystem
// Initially assume no mass transfer
- dmdt_.insert
+ dmdt_.set
(
pair,
new volScalarField
@@ -88,7 +88,7 @@ HeatAndMassTransferPhaseSystem
)
);
- dmdtExplicit_.insert
+ dmdtExplicit_.set
(
pair,
new volScalarField
@@ -107,7 +107,7 @@ HeatAndMassTransferPhaseSystem
volScalarField H1(heatTransferModels_[pair][pair.first()]->K());
volScalarField H2(heatTransferModels_[pair][pair.second()]->K());
- Tf_.insert
+ Tf_.set
(
pair,
new volScalarField
@@ -257,18 +257,12 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
{
- autoPtr<phaseSystem::heatTransferTable> eqnsPtr
- (
- new phaseSystem::heatTransferTable()
- );
+ auto eqnsPtr = autoPtr<phaseSystem::heatTransferTable>::New();
+ auto& eqns = *eqnsPtr;
- phaseSystem::heatTransferTable& eqns = eqnsPtr();
-
- forAll(this->phaseModels_, phasei)
+ for (const phaseModel& phase : this->phaseModels_)
{
- const phaseModel& phase = this->phaseModels_[phasei];
-
- eqns.insert
+ eqns.set
(
phase.name(),
new fvScalarMatrix(phase.thermo().he(), dimEnergy/dimTime)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 2654fce6f9bdcbdca59898d710ff8ff94355ae07..7f8b768c94187d0056962665d5f2bb0400018fe0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -107,18 +107,12 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
{
- autoPtr<phaseSystem::heatTransferTable> eqnsPtr
- (
- new phaseSystem::heatTransferTable()
- );
+ auto eqnsPtr = autoPtr<phaseSystem::heatTransferTable>::New();
+ auto& eqns = *eqnsPtr;
- phaseSystem::heatTransferTable& eqns = eqnsPtr();
-
- forAll(this->phaseModels_, phasei)
+ for (const phaseModel& phase : this->phaseModels_)
{
- const phaseModel& phase = this->phaseModels_[phasei];
-
- eqns.insert
+ eqns.set
(
phase.name(),
new fvScalarMatrix(phase.thermo().he(), dimEnergy/dimTime)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
index 54fec2f8ec8a302997d0310cbffc4e8d2516e99a..a68bd91745014a4f295e549cd29b25b7a58e3e30 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
@@ -62,22 +62,16 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem<BasePhaseSystem>::
massTransfer() const
{
// Create a mass transfer matrix for each species of each phase
- autoPtr<phaseSystem::massTransferTable> eqnsPtr
- (
- new phaseSystem::massTransferTable()
- );
+ auto eqnsPtr = autoPtr<phaseSystem::massTransferTable>::New();
+ auto& eqns = *eqnsPtr;
- phaseSystem::massTransferTable& eqns = eqnsPtr();
-
- forAll(this->phaseModels_, phasei)
+ for (const phaseModel& phase : this->phaseModels_)
{
- const phaseModel& phase = this->phaseModels_[phasei];
-
const PtrList<volScalarField>& Yi = phase.Y();
forAll(Yi, i)
{
- eqns.insert
+ eqns.set
(
Yi[i].name(),
new fvScalarMatrix(Yi[i], dimMass/dimTime)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 812fbce2ac9aa7e9afc1ceafed2a07c77a7613f6..619dbd16316bd0d3cec90dcfbae649917436735c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -87,7 +87,7 @@ MomentumTransferPhaseSystem
const phasePair& pair =
*(this->phasePairs_[dragModelIter.key()]);
- Kds_.insert
+ Kds_.set
(
pair,
new volScalarField
@@ -103,7 +103,7 @@ MomentumTransferPhaseSystem
const phasePair& pair =
*(this->phasePairs_[virtualMassModelIter.key()]);
- Vms_.insert
+ Vms_.set
(
pair,
new volScalarField
@@ -373,18 +373,12 @@ Foam::autoPtr<Foam::phaseSystem::momentumTransferTable>
Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
{
// Create a momentum transfer matrix for each phase
- autoPtr<phaseSystem::momentumTransferTable> eqnsPtr
- (
- new phaseSystem::momentumTransferTable()
- );
+ auto eqnsPtr = autoPtr<phaseSystem::momentumTransferTable>::New();
+ auto& eqns = *eqnsPtr;
- phaseSystem::momentumTransferTable& eqns = eqnsPtr();
-
- forAll(this->phaseModels_, phasei)
+ for (const phaseModel& phase : this->phaseModels_)
{
- const phaseModel& phase = this->phaseModels_[phasei];
-
- eqns.insert
+ eqns.set
(
phase.name(),
new fvVectorMatrix(phase.U(), dimMass*dimVelocity/dimTime)
@@ -492,11 +486,8 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::PtrList<Foam::volVectorField>>
Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
{
- autoPtr<PtrList<volVectorField>> tFs
- (
- new PtrList<volVectorField>(this->phases().size())
- );
- PtrList<volVectorField>& Fs = tFs();
+ auto tFs = autoPtr<PtrList<volVectorField>>::New(this->phases().size());
+ auto& Fs = *tFs;
// Add the lift force
forAllConstIters(liftModels_, modelIter)
@@ -570,11 +561,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
const PtrList<volScalarField>& rAUs
) const
{
- autoPtr<PtrList<surfaceScalarField>> tphiDs
- (
- new PtrList<surfaceScalarField>(this->phases().size())
- );
- PtrList<surfaceScalarField>& phiDs = tphiDs();
+ auto tphiDs =
+ autoPtr<PtrList<surfaceScalarField>>::New(this->phases().size());
+ auto& phiDs = *tphiDs;
// Add the turbulent dispersion force
forAllConstIters(turbulentDispersionModels_, turbulentDispersionModelIter)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 9ffa4a882f56b2cda4ca9e1c0aabf2b1eb53c7d2..d63ca7d058509397cd848d73fe2d0d1563014b68 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -52,7 +52,7 @@ ThermalPhaseChangePhaseSystem
}
// Initially assume no mass transfer
- iDmdt_.insert
+ iDmdt_.set
(
pair,
new volScalarField
@@ -186,22 +186,16 @@ Foam::autoPtr<Foam::phaseSystem::massTransferTable>
Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
{
// Create a mass transfer matrix for each species of each phase
- autoPtr<phaseSystem::massTransferTable> eqnsPtr
- (
- new phaseSystem::massTransferTable()
- );
+ auto eqnsPtr = autoPtr<phaseSystem::massTransferTable>::New();
+ auto& eqns = *eqnsPtr;
- phaseSystem::massTransferTable& eqns = eqnsPtr();
-
- forAll(this->phaseModels_, phasei)
+ for (const phaseModel& phase : this->phaseModels_)
{
- const phaseModel& phase = this->phaseModels_[phasei];
-
const PtrList<volScalarField>& Yi = phase.Y();
forAll(Yi, i)
{
- eqns.insert
+ eqns.set
(
Yi[i].name(),
new fvScalarMatrix(Yi[i], dimMass/dimTime)
diff --git a/applications/test/HashPtrTable/Make/files b/applications/test/HashPtrTable/Make/files
index 239bab4cd72a083f3d192dd49b91c88eb0138d51..00d71a823085cbe554c32c99a4ebfa8feb297a65 100644
--- a/applications/test/HashPtrTable/Make/files
+++ b/applications/test/HashPtrTable/Make/files
@@ -1,3 +1,3 @@
-Test-hashPtrTable.C
+Test-HashPtrTable.C
-EXE = $(FOAM_USER_APPBIN)/Test-hashPtrTable
+EXE = $(FOAM_USER_APPBIN)/Test-HashPtrTable
diff --git a/applications/test/HashPtrTable/Test-hashPtrTable.C b/applications/test/HashPtrTable/Test-HashPtrTable.C
similarity index 77%
rename from applications/test/HashPtrTable/Test-hashPtrTable.C
rename to applications/test/HashPtrTable/Test-HashPtrTable.C
index e62d59686983631413faa7c1f4d896548af65c1c..79ef9f3d39e39aa384f8136aa68b191500207b2f 100644
--- a/applications/test/HashPtrTable/Test-hashPtrTable.C
+++ b/applications/test/HashPtrTable/Test-HashPtrTable.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ Description
\*---------------------------------------------------------------------------*/
#include <iostream>
+#include "autoPtr.H"
#include "HashPtrTable.H"
using namespace Foam;
@@ -42,7 +43,7 @@ void printTable(const HashPtrTable<T>& table)
Info<< iter.key() << " = ";
if (ptr)
{
- Info<< *ptr;
+ Info<< *ptr << " (" << long(ptr) << ")";
}
else
{
@@ -77,11 +78,11 @@ void printTable(const HashPtrTable<T>& table)
int main()
{
HashPtrTable<double> myTable;
- myTable.insert("abc", new double(42.1));
- myTable.insert("def", nullptr);
- myTable.insert("pi", new double(3.14159));
- myTable.insert("natlog", new double(2.718282));
- myTable.insert("sqrt2", new double(1.414214));
+ myTable.set("abc", new double(42.1));
+ myTable.set("def", nullptr);
+ myTable.set("pi", new double(3.14159));
+ myTable.set("natlog", new double(2.718282));
+ myTable.insert("sqrt2", autoPtr<double>::New(1.414214));
// Info<< myTable << endl;
printTable(myTable);
@@ -105,6 +106,25 @@ int main()
printTable(myTable);
+ HashPtrTable<double> moved(std::move(copy));
+
+ Info<< nl << "test movable" << nl;
+ Info<<"input:" << nl;
+ printTable(copy);
+
+ Info<<"output:" << nl;
+ printTable(moved);
+
+ HashPtrTable<double> other;
+
+ Info<<"move assign" << nl;
+
+ other = std::move(moved);
+ printTable(other);
+
+ Info<<"old" << nl;
+ printTable(moved);
+
return 0;
}
diff --git a/applications/test/PtrMap/Make/files b/applications/test/PtrMap/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..7b281cd0fdec76848c13bb3cda11b1a288cf5b73
--- /dev/null
+++ b/applications/test/PtrMap/Make/files
@@ -0,0 +1,3 @@
+Test-PtrMap.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-PtrMap
diff --git a/applications/test/PtrMap/Make/options b/applications/test/PtrMap/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/applications/test/PtrMap/Test-PtrMap.C b/applications/test/PtrMap/Test-PtrMap.C
new file mode 100644
index 0000000000000000000000000000000000000000..6d5866bc6d30f7f211cfbccb33a5e45ab0503590
--- /dev/null
+++ b/applications/test/PtrMap/Test-PtrMap.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+
+
+\*---------------------------------------------------------------------------*/
+
+#include <iostream>
+#include "PtrMap.H"
+
+using namespace Foam;
+
+template<class T>
+void printTable(const PtrMap<T>& table)
+{
+ Info<< table.size() << nl << "(" << nl;
+
+ forAllConstIters(table, iter)
+ {
+ const T* ptr = iter.object();
+ Info<< iter.key() << " = ";
+ if (ptr)
+ {
+ Info<< *ptr << " (" << long(ptr) << ")";
+ }
+ else
+ {
+ Info<< "nullptr";
+ }
+ Info<< nl;
+ }
+
+ Info<< ")" << endl;
+
+ // Values only, with for-range
+ Info<< "values (";
+ for (auto val : table)
+ {
+ Info<< ' ';
+ if (val)
+ {
+ Info<< *val;
+ }
+ else
+ {
+ Info<< "nullptr";
+ }
+ }
+ Info<< " )" << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main()
+{
+ PtrMap<double> myTable;
+ myTable.set(1, new double(42.1));
+ myTable.set(2, nullptr);
+ myTable.set(3, new double(3.14159));
+ myTable.set(4, new double(2.718282));
+ myTable.set(4, new double(1.414214));
+
+ // Info<< myTable << endl;
+ printTable(myTable);
+
+ PtrMap<double> copy(myTable);
+
+ // Info<< copy << endl;
+ printTable(copy);
+ Info<< copy << endl;
+
+ Info<<"\nerase some existing and non-existing entries" << nl;
+
+ auto iter = myTable.find(3);
+ myTable.erase(iter);
+
+ iter = myTable.find(1000); // unknown key
+ myTable.erase(iter);
+
+ myTable.erase(1);
+ iter = myTable.find(100000); // unknown key
+
+ printTable(myTable);
+
+ PtrMap<double> moved(std::move(copy));
+
+ Info<< nl << "test movable" << nl;
+ Info<<"input:" << nl;
+ printTable(copy);
+
+ Info<<"output:" << nl;
+ printTable(moved);
+
+ PtrMap<double> other;
+
+ Info<<"move assign" << nl;
+
+ other = std::move(moved);
+ printTable(other);
+
+ Info<<"old" << nl;
+ printTable(moved);
+
+ return 0;
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 62d6a8cc4c4c8e75ed8a100f65f83bb22553c489..5fd3b34781b862184441253d85f584e91ce81f3b 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -813,28 +813,33 @@ int main(int argc, char *argv[])
// Read all fields in time and constant directories
IOobjectList objects(mesh, runTime.timeName());
- IOobjectList timeObjects(IOobjectList(mesh, mesh.facesInstance()));
- forAllConstIter(IOobjectList, timeObjects, iter)
{
- if
- (
- iter()->headerClassName() == volScalarField::typeName
- || iter()->headerClassName() == volVectorField::typeName
- || iter()->headerClassName() == volSphericalTensorField::typeName
- || iter()->headerClassName() == volTensorField::typeName
- || iter()->headerClassName() == volSymmTensorField::typeName
- || iter()->headerClassName() == surfaceScalarField::typeName
- || iter()->headerClassName() == surfaceVectorField::typeName
- || iter()->headerClassName()
- == surfaceSphericalTensorField::typeName
- || iter()->headerClassName() == surfaceSymmTensorField::typeName
- || iter()->headerClassName() == surfaceTensorField::typeName
- )
+ IOobjectList timeObjects(mesh, mesh.facesInstance());
+
+ // Transfer specific types
+ forAllIters(timeObjects, iter)
{
- objects.add(*iter());
+ autoPtr<IOobject> objPtr(timeObjects.remove(iter));
+ const auto& obj = *objPtr;
+
+ if
+ (
+ obj.headerClassName() == volScalarField::typeName
+ || obj.headerClassName() == volVectorField::typeName
+ || obj.headerClassName() == volSphericalTensorField::typeName
+ || obj.headerClassName() == volTensorField::typeName
+ || obj.headerClassName() == volSymmTensorField::typeName
+ || obj.headerClassName() == surfaceScalarField::typeName
+ || obj.headerClassName() == surfaceVectorField::typeName
+ || obj.headerClassName() == surfaceSphericalTensorField::typeName
+ || obj.headerClassName() == surfaceSymmTensorField::typeName
+ || obj.headerClassName() == surfaceTensorField::typeName
+ )
+ {
+ objects.add(objPtr);
+ }
}
}
-
// Read vol fields and subset.
wordList scalarNames(objects.names(volScalarField::typeName));
diff --git a/modules/catalyst b/modules/catalyst
index 5828d4510816948b034aa9afdf0b7b05659a9f59..d31e13e12b4d9b727b28d39bc34086f2cb75acfa 160000
--- a/modules/catalyst
+++ b/modules/catalyst
@@ -1 +1 @@
-Subproject commit 5828d4510816948b034aa9afdf0b7b05659a9f59
+Subproject commit d31e13e12b4d9b727b28d39bc34086f2cb75acfa
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 427791f2c2b1c35004bf6fdda3ee9cac7fdc456b..e46d4e02d734baf1409ed2bfdd62440825af2729 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -628,36 +628,36 @@ fields/cloud/cloud.C
Fields = fields/Fields
+$(Fields)/Field/FieldBase.C
$(Fields)/labelField/labelField.C
-$(Fields)/scalarField/scalarField.C
-$(Fields)/vectorField/vectorField.C
-$(Fields)/vector2DField/vector2DField.C
-$(Fields)/sphericalTensorField/sphericalTensorField.C
-$(Fields)/diagTensorField/diagTensorField.C
-$(Fields)/symmTensorField/symmTensorField.C
-$(Fields)/tensorField/tensorField.C
-$(Fields)/quaternionField/quaternionField.C
-$(Fields)/triadField/triadField.C
-$(Fields)/complexFields/complexFields.C
-
$(Fields)/labelField/labelIOField.C
$(Fields)/labelField/labelFieldIOField.C
+$(Fields)/scalarField/scalarField.C
$(Fields)/scalarField/scalarIOField.C
$(Fields)/scalarField/scalarFieldIOField.C
+$(Fields)/vectorField/vectorField.C
$(Fields)/vectorField/vectorIOField.C
$(Fields)/vectorField/vectorFieldIOField.C
+$(Fields)/vector2DField/vector2DField.C
$(Fields)/vector2DField/vector2DIOField.C
$(Fields)/vector2DField/vector2DFieldIOField.C
+$(Fields)/sphericalTensorField/sphericalTensorField.C
$(Fields)/sphericalTensorField/sphericalTensorIOField.C
$(Fields)/sphericalTensorField/sphericalTensorFieldIOField.C
+$(Fields)/diagTensorField/diagTensorField.C
$(Fields)/diagTensorField/diagTensorIOField.C
$(Fields)/diagTensorField/diagTensorFieldIOField.C
+$(Fields)/symmTensorField/symmTensorField.C
$(Fields)/symmTensorField/symmTensorIOField.C
$(Fields)/symmTensorField/symmTensorFieldIOField.C
+$(Fields)/tensorField/tensorField.C
$(Fields)/tensorField/tensorIOField.C
$(Fields)/tensorField/tensorFieldIOField.C
+$(Fields)/quaternionField/quaternionField.C
$(Fields)/quaternionField/quaternionIOField.C
+$(Fields)/triadField/triadField.C
$(Fields)/triadField/triadIOField.C
+$(Fields)/complexFields/complexFields.C
$(Fields)/transformField/transformField.C
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index e7ad07ec2fd6b06036e19ac952fd3bf46af10aa0..57c4b9bd378226b8b7045d8109d0103782508927 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -28,20 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template<class T, class Key, class Hash>
-Foam::HashPtrTable<T, Key, Hash>::HashPtrTable()
-:
- parent_type()
-{}
-
-
-template<class T, class Key, class Hash>
-Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
-:
- parent_type(size)
-{}
-
-
template<class T, class Key, class Hash>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
(
@@ -55,16 +41,26 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
const T* ptr = iter.object();
if (ptr)
{
- this->insert(iter.key(), new T(*ptr));
+ this->set(iter.key(), new T(*ptr));
}
else
{
- this->insert(iter.key(), nullptr);
+ this->set(iter.key(), nullptr);
}
}
}
+template<class T, class Key, class Hash>
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
+(
+ HashPtrTable<T, Key, Hash>&& ht
+)
+:
+ parent_type(std::move(ht))
+{}
+
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class T, class Key, class Hash>
@@ -77,13 +73,13 @@ Foam::HashPtrTable<T, Key, Hash>::~HashPtrTable()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class T, class Key, class Hash>
-T* Foam::HashPtrTable<T, Key, Hash>::remove(iterator& iter)
+Foam::autoPtr<T> Foam::HashPtrTable<T, Key, Hash>::remove(iterator& iter)
{
if (iter.found())
{
- T* ptr = iter.object();
+ autoPtr<T> aptr(iter.object());
this->parent_type::erase(iter);
- return ptr;
+ return aptr;
}
return nullptr;
@@ -140,11 +136,10 @@ void Foam::HashPtrTable<T, Key, Hash>::operator=
const HashPtrTable<T, Key, Hash>& rhs
)
{
- // Check for assignment to self
if (this == &rhs)
{
FatalErrorInFunction
- << "attempted assignment to self"
+ << "attempted copy assignment to self"
<< abort(FatalError);
}
@@ -155,16 +150,34 @@ void Foam::HashPtrTable<T, Key, Hash>::operator=
const T* ptr = iter.object();
if (ptr)
{
- this->insert(iter.key(), new T(*ptr));
+ this->set(iter.key(), new T(*ptr));
}
else
{
- this->insert(iter.key(), nullptr);
+ this->set(iter.key(), nullptr);
}
}
}
+template<class T, class Key, class Hash>
+void Foam::HashPtrTable<T, Key, Hash>::operator=
+(
+ HashPtrTable<T, Key, Hash>&& rhs
+)
+{
+ if (this == &rhs)
+ {
+ FatalErrorInFunction
+ << "attempted move assignment to self"
+ << abort(FatalError);
+ }
+
+ this->clear();
+ this->transfer(rhs);
+}
+
+
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
#include "HashPtrTableIO.C"
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index b705c27c9fab0e54cd281b44c63a53f6df23008a..9dedb2a0ff38080a13649a1bafd197fa02f18fe5 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -43,11 +43,12 @@ SourceFiles
namespace Foam
{
+// Forward declarations
+
class Istream;
class Ostream;
-// Forward declaration of friend functions and operators
-
+template<class T> class autoPtr;
template<class T, class Key, class Hash> class HashPtrTable;
template<class T, class Key, class Hash>
@@ -92,10 +93,10 @@ public:
// Constructors
//- Construct null with default table capacity
- HashPtrTable();
+ inline HashPtrTable();
//- Construct given initial table capacity
- explicit HashPtrTable(const label size);
+ explicit inline HashPtrTable(const label size);
//- Construct from Istream using given Istream constructor class
template<class INew>
@@ -107,9 +108,12 @@ public:
//- Construct from dictionary with default dictionary constructor class
explicit HashPtrTable(const dictionary& dict);
- //- Construct as copy
+ //- Copy construct
HashPtrTable(const this_type& ht);
+ //- Move construct
+ HashPtrTable(this_type&& ht);
+
//- Destructor
~HashPtrTable();
@@ -117,20 +121,22 @@ public:
// Member Functions
- // Edit
+ // Edit
//- Remove and return the pointer specified by given iterator.
// Includes a safeguard against the end-iterator.
- T* remove(iterator& iter);
+ autoPtr<T> remove(iterator& iter);
- //- Erase an entry specified by given iterator.
+ //- Erase an entry specified by given iterator and delete the
+ //- allocated pointer.
// Includes a safeguard against the end-iterator.
bool erase(iterator& iter);
- //- Erase an entry specified by the given key
+ //- Erase an entry specified by the given key and delete the
+ //- allocated pointer.
bool erase(const Key& key);
- //- Clear all entries from table and deleting any allocated pointers
+ //- Clear all entries from table and delete any allocated pointers
void clear();
//- Write
@@ -142,6 +148,9 @@ public:
//- Copy assignment
void operator=(const this_type& rhs);
+ //- Move assignment
+ void operator=(this_type&& rhs);
+
// IOstream Operators
@@ -156,6 +165,31 @@ public:
Ostream& os,
const HashPtrTable<T, Key, Hash>& tbl
);
+
+
+ // Housekeeping
+
+ //- No insert() with raw pointers (potential memory leaks)
+ // Use insert() with autoPtr or set()
+ inline bool insert(const Key&, T*) = delete;
+
+ //- Insert a new entry, not overwriting existing entries.
+ // \return True if the entry inserted, which means that it did
+ // not previously exist in the table.
+ inline bool insert(const Key& key, autoPtr<T>& aptr);
+
+ //- Insert a new entry, not overwriting existing entries.
+ inline bool insert(const Key& key, autoPtr<T>&& aptr);
+
+ //- Use set(), not insert() to avoid potential memory leaks
+ //- Assign a new entry, overwriting existing entries.
+ inline bool set(const Key& key, T* ptr);
+
+ //- Assign a new entry, overwriting existing entries.
+ inline bool set(const Key& key, autoPtr<T>& aptr);
+
+ //- Assign a new entry, overwriting existing entries.
+ inline bool set(const Key& key, autoPtr<T>&& aptr);
};
@@ -165,6 +199,10 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "HashPtrTableI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#ifdef NoRepository
#include "HashPtrTable.C"
#endif
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index fdf3e554a0234a54953f2a7ef12bda9d445acb63..fb123d50da0d8c8e1f8f0593f3ccbf6296fc935d 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -65,7 +65,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inew)
{
Key key;
is >> key;
- this->insert(key, inew(key, is).ptr());
+ this->set(key, inew(key, is).ptr());
is.fatalCheck
(
@@ -110,7 +110,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inew)
is.putBack(lastToken);
Key key;
is >> key;
- this->insert(key, inew(key, is).ptr());
+ this->set(key, inew(key, is).ptr());
is.fatalCheck
(
@@ -147,7 +147,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read
{
const word& k = iter().keyword();
- this->insert(k, inew(dict.subDict(k)).ptr());
+ this->set(k, inew(dict.subDict(k)).ptr());
}
}
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index b57be56135f2906d55c08c6f8e576724bf8e3ec7..7405064ffda37d9fb2f6d067f63c3de60befb167 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -298,7 +298,7 @@ Foam::label Foam::HashTable<T, Key, Hash>::countEntries
template<class T, class Key, class Hash>
-bool Foam::HashTable<T, Key, Hash>::set
+bool Foam::HashTable<T, Key, Hash>::setEntry
(
const Key& key,
const T& obj,
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 6d67ba326498cf1830bf2a22e1dbbb759a2fa462..cecd82083af962017b51338bb0e163abde6e98b1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -165,8 +165,10 @@ class HashTable
}
private:
- //- Disallow default bitwise copy construct / assignment
+ //- No copy construct
pair_entry(const pair_entry&) = delete;
+
+ //- No copy assignment
void operator=(const pair_entry&) = delete;
};
@@ -214,8 +216,10 @@ class HashTable
private:
- //- Disallow default bitwise copy construct / assignment
+ //- No copy construct
unary_entry(const unary_entry&) = delete;
+
+ //- No copy assignment
void operator=(const unary_entry&) = delete;
};
@@ -249,7 +253,7 @@ class HashTable
//- Assign a new hash-entry to a possibly already existing key.
// \return True if the new entry was set.
- bool set(const Key& key, const T& obj, const bool overwrite);
+ bool setEntry(const Key& key, const T& obj, const bool overwrite);
public:
@@ -606,10 +610,10 @@ public:
//- Return existing entry or insert a new entry.
inline T& operator()(const Key& key, const T& deflt);
- //- Copy assignment
+ //- Copy assign
void operator=(const HashTable<T, Key, Hash>& rhs);
- //- Copy assignment from an initializer list
+ //- Copy assign from an initializer list
void operator=(std::initializer_list<std::pair<Key, T>> rhs);
//- Move assign
@@ -640,7 +644,7 @@ protected:
class Iterator
{
public:
- // Typedefs
+ // Typedefs
using iterator_category = std::forward_iterator_tag;
using difference_type = this_type::difference_type;
@@ -672,7 +676,7 @@ protected:
>::type;
- // Member Functions
+ // Member Functions
//- True if iterator points to an entry
// This can be used directly instead of comparing to end()
@@ -681,7 +685,7 @@ protected:
//- The key associated with the iterator
inline const Key& key() const;
- // Member Operators
+ // Member Operators
//- Compare hash-entry element pointers.
// Independent of const/non-const access
@@ -695,7 +699,7 @@ protected:
protected:
friend class HashTable; // For begin/find constructors
- // Protected Data
+ // Protected Data
//- The selected entry.
// MUST be the first member for easy comparison between iterators
@@ -712,7 +716,7 @@ protected:
label index_;
- // Protected Constructors
+ // Protected Constructors
//- Construct null (end iterator)
inline Iterator();
@@ -724,7 +728,7 @@ protected:
Iterator(table_type* tbl, const Key& key);
- // Protected Member Functions
+ // Protected Member Functions
//- Increment to the next position
inline void increment();
@@ -756,7 +760,7 @@ public:
public Iterator<false>
{
public:
- // Typedefs
+ // Typedefs
using iterator_category = std::forward_iterator_tag;
using difference_type = this_type::difference_type;
@@ -766,7 +770,7 @@ public:
using pointer = this_type::pointer;
using reference = this_type::reference;
- // Constructors
+ // Constructors
//- Construct null (end iterator)
inline iterator() = default;
@@ -778,7 +782,7 @@ public:
{}
- // Member functions/operators
+ // Member functions/operators
//- Non-const access to referenced object
using Iterator<false>::object;
@@ -800,7 +804,7 @@ public:
public Iterator<true>
{
public:
- // Typedefs
+ // Typedefs
using iterator_category = std::forward_iterator_tag;
using difference_type = this_type::difference_type;
@@ -810,7 +814,7 @@ public:
using pointer = this_type::const_pointer;
using reference = this_type::const_reference;
- // Constructors
+ // Constructors
//- Construct null (end iterator)
inline const_iterator() = default;
@@ -837,7 +841,7 @@ public:
{}
- // Member functions/operators
+ // Member functions/operators
//- Const access to referenced object
using Iterator<true>::object;
@@ -849,7 +853,7 @@ public:
inline const_iterator& operator++();
inline const_iterator operator++(int);
- // Assignment
+ // Assignment
const_iterator& operator=(const const_iterator&) = default;
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 424d3db57de50a454021a018a2a6b9848c468cc0..47b1b0a91dd0ca9713a67407d91a1c6da67ff5f7 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -121,7 +121,7 @@ inline bool Foam::HashTable<T, Key, Hash>::insert
const T& obj
)
{
- return this->set(key, obj, false); // No overwrite
+ return this->setEntry(key, obj, false); // No overwrite
}
@@ -132,7 +132,7 @@ inline bool Foam::HashTable<T, Key, Hash>::set
const T& obj
)
{
- return this->set(key, obj, true); // Overwrite
+ return this->setEntry(key, obj, true); // Overwrite
}
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index 915edf49ad008ec89eb9ed69a0adec78365c70e2..ed639238d9088cd26b636600123856e1c0287832 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -80,11 +80,32 @@ public:
parent_type(is)
{}
- //- Construct as copy
+ //- Copy construct
PtrMap(const this_type& map)
:
parent_type(map)
{}
+
+ //- Move construct
+ PtrMap(this_type&& map)
+ :
+ parent_type(std::move(map))
+ {}
+
+
+ // Member Operators
+
+ //- Copy assignment
+ void operator=(const this_type& rhs)
+ {
+ parent_type::operator=(rhs);
+ }
+
+ //- Move assignment
+ void operator=(this_type&& rhs)
+ {
+ parent_type::operator=(std::move(rhs));
+ }
};
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index a91134d91c389462d989d6872fcb77e61ab26a83..e8f77d9d0ee47fc8d4548c09685876abb662f3b3 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -52,7 +52,7 @@ namespace Foam
InfoInFunction << "Found " << iter.key() << endl;
}
- results.insert
+ results.set
(
iter.key(),
new IOobject(*(iter.object()))
@@ -123,9 +123,27 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::IOobjectList::IOobjectList(const label nIoObjects)
+Foam::IOobjectList::IOobjectList()
:
- HashPtrTable<IOobject>(nIoObjects)
+ HashPtrTable<IOobject>()
+{}
+
+
+Foam::IOobjectList::IOobjectList(const label nObjects)
+:
+ HashPtrTable<IOobject>(nObjects) // Could also use 2*nObjects instead
+{}
+
+
+Foam::IOobjectList::IOobjectList(const IOobjectList& list)
+:
+ HashPtrTable<IOobject>(list)
+{}
+
+
+Foam::IOobjectList::IOobjectList(IOobjectList&& list)
+:
+ HashPtrTable<IOobject>(std::move(list))
{}
@@ -142,7 +160,7 @@ Foam::IOobjectList::IOobjectList
HashPtrTable<IOobject>()
{
word newInstance;
- fileNameList ObjectNames = fileHandler().readObjects
+ fileNameList objNames = fileHandler().readObjects
(
db,
instance,
@@ -150,9 +168,9 @@ Foam::IOobjectList::IOobjectList
newInstance
);
- for (const auto& objName : ObjectNames)
+ for (const auto& objName : objNames)
{
- IOobject* objectPtr = new IOobject
+ auto objectPtr = autoPtr<IOobject>::New
(
objName,
newInstance,
@@ -183,35 +201,35 @@ Foam::IOobjectList::IOobjectList
{
insert(objectPtr->name(), objectPtr);
}
- else
- {
- delete objectPtr;
- }
}
}
-Foam::IOobjectList::IOobjectList(const IOobjectList& iolist)
-:
- HashPtrTable<IOobject>(iolist)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::IOobjectList::~IOobjectList()
-{}
+bool Foam::IOobjectList::add(autoPtr<IOobject>& objectPtr)
+{
+ if (objectPtr.valid())
+ {
+ return insert(objectPtr->name(), objectPtr);
+ }
+ return false;
+}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool Foam::IOobjectList::add(IOobject& io)
+bool Foam::IOobjectList::add(autoPtr<IOobject>&& objectPtr)
{
- return insert(io.name(), &io);
+ if (objectPtr.valid())
+ {
+ return insert(objectPtr->name(), objectPtr);
+ }
+
+ return false;
}
-bool Foam::IOobjectList::remove(IOobject& io)
+bool Foam::IOobjectList::remove(const IOobject& io)
{
return erase(io.name());
}
@@ -219,7 +237,7 @@ bool Foam::IOobjectList::remove(IOobject& io)
Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const
{
- const_iterator iter = find(name);
+ const_iterator iter = cfind(name);
if (iter.found())
{
@@ -267,7 +285,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& clsName) const
InfoInFunction << "Found " << iter.key() << endl;
}
- results.insert
+ results.set
(
iter.key(),
new IOobject(*(iter.object()))
@@ -369,6 +387,14 @@ Foam::wordList Foam::IOobjectList::sortedNames
}
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
+void Foam::IOobjectList::operator=(IOobjectList&& list)
+{
+ transfer(list);
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
Foam::Ostream& Foam::operator<<(Ostream& os, const IOobjectList& list)
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 3478473db1517f7b6ade4158236bec31a1375194..247c6a0633a744cc2fccfea608285b0359dc9ea2 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ SourceFiles
namespace Foam
{
-// Forward declaration of friend functions and operators
+// Forward declarations
class IOobjectList;
Ostream& operator<<(Ostream& os, const IOobjectList& list);
@@ -58,18 +58,21 @@ class IOobjectList
:
public HashPtrTable<IOobject>
{
- // Private Member Functions
+public:
- //- No copy assignment
- void operator=(const IOobjectList&) = delete;
+ // Constructors
+ //- Construct null with default (128) table capacity
+ IOobjectList();
-public:
+ //- Construct given initial table capacity
+ explicit IOobjectList(const label nObjects);
- // Constructors
+ //- Copy construct
+ IOobjectList(const IOobjectList& list);
- //- Construct given an initial estimate for the number of entries
- explicit IOobjectList(const label nIoObjects = 128);
+ //- Move construct
+ IOobjectList(IOobjectList&& list);
//- Construct from objectRegistry and instance path
IOobjectList
@@ -82,12 +85,9 @@ public:
bool registerObject = true
);
- //- Construct as copy
- IOobjectList(const IOobjectList& iolist);
-
//- Destructor
- ~IOobjectList();
+ ~IOobjectList() = default;
// Member functions
@@ -95,10 +95,16 @@ public:
// Basic methods
//- Add an IOobject to the list
- bool add(IOobject& io);
+ bool add(autoPtr<IOobject>& objectPtr);
+
+ //- Add an IOobject to the list
+ bool add(autoPtr<IOobject>&& objectPtr);
+
+ //- Remove an IOobject from the list, by iterator
+ using HashPtrTable<IOobject>::remove;
//- Remove an IOobject from the list
- bool remove(IOobject& io);
+ bool remove(const IOobject& io);
// Lookup
@@ -230,6 +236,15 @@ public:
wordList sortedNames(const word& clsName, const wordRes& matcher) const;
+ // Member Operators
+
+ //- No copy assignment
+ void operator=(const IOobjectList&) = delete;
+
+ //- Move assignment
+ void operator=(IOobjectList&& list);
+
+
// Ostream Operator
friend Ostream& operator<<(Ostream& os, const IOobjectList& list);
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index 93147ece1d12c8d8a0e639d4ec847bbe3f11a267..215a52542192b7bee0f78948776c35c48217b5e6 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
@@ -63,7 +63,7 @@ inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
const SubDimensionedField<Type, GeoMesh>& sfield
)
:
- tmp<SubDimensionedField<Type, GeoMesh>>::refCount(),
+ refCount(),
SubField<Type>(sfield)
{}
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index d9778371b4a798ff135d0c53f9d671ddd2ede3f8..ad98f6a02f1b8759cfe077705874e7645331e7fe 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Generic fieldField type.
-
\*---------------------------------------------------------------------------*/
#include "FieldField.H"
@@ -137,7 +134,7 @@ FieldField<Field, Type>::FieldField
template<template<class> class Field, class Type>
FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
:
- tmp<FieldField<Field, Type>>::refCount(),
+ refCount(),
PtrList<Field<Type>>(f)
{}
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 19d4ff5cdc119b79413752cd5b0fdde182f9faa4..bae0375b68109a84832206b02c77a035405c4877 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -73,7 +73,7 @@ Ostream& operator<<
template<template<class> class Field, class Type>
class FieldField
:
- public tmp<FieldField<Field, Type>>::refCount,
+ public refCount,
public PtrList<Field<Type>>
{
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 7cc7c55e6fd6ffce46ee04430b6bd183fc7cd303..5422b19a134695175843bfe30aa91534cd8eeb08 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -29,12 +29,6 @@ License
#include "contiguous.H"
#include "mapDistributeBase.H"
-// * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * //
-
-template<class Type>
-const char* const Foam::Field<Type>::typeName("Field");
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index e8a91b03066386df43aacd5e89cd8a836728bd50..ae4f2bfcdbc8aa6fa1a615873150f47d5d16d93c 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -47,6 +47,7 @@ SourceFiles
#include "VectorSpace.H"
#include "scalarList.H"
#include "labelList.H"
+#include "FieldBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -73,7 +74,7 @@ Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
template<class Type>
class Field
:
- public tmp<Field<Type>>::refCount,
+ public FieldBase,
public List<Type>
{
@@ -86,11 +87,6 @@ public:
typedef SubField<Type> subField;
- // Static data members
-
- static const char* const typeName;
-
-
// Static Member Functions
//- Return nullObject reference field
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldBase.C b/src/OpenFOAM/fields/Fields/Field/FieldBase.C
new file mode 100644
index 0000000000000000000000000000000000000000..91157104f44b65c6c2031b856c850daab02e6284
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/Field/FieldBase.C
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FieldBase.H"
+
+// * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * //
+
+const char* const Foam::FieldBase::typeName("Field");
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldBase.H b/src/OpenFOAM/fields/Fields/Field/FieldBase.H
new file mode 100644
index 0000000000000000000000000000000000000000..5de4169ad3a2d53af803d251303c0db523f01bee
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/Field/FieldBase.H
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::FieldBase
+
+Description
+ Template invariant parts for Field
+
+SourceFiles
+ FieldBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FieldBase_H
+#define FieldBase_H
+
+#include "refCount.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class FieldBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class FieldBase
+:
+ public refCount
+{
+public:
+
+ // Static data members
+
+ //- Typename for Field
+ static const char* const typeName;
+
+
+ // Constructors
+
+ //- Construct null, with refCount zero
+ constexpr FieldBase() noexcept
+ :
+ refCount()
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index 07ecd1443fc936d10ba1815ed075def3b580ee89..1a7fb9cb91365e56c3d8e66e4806b7ac474c11f8 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -59,7 +59,7 @@ template<class Type> class SubField;
template<class Type>
class SubField
:
- public tmp<SubField<Type>>::refCount,
+ public refCount,
public SubList<Type>
{
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 4919f78fe1cf0526d370ebcedf8f0e98559da0fd..d0ed35b5dcadd9fb9a9b8323ab67692e24f04bc8 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -74,7 +74,7 @@ inline Foam::SubField<Type>::SubField
const SubField<Type>& sfield
)
:
- tmp<SubField<Type>>::refCount(),
+ refCount(),
SubList<Type>(sfield)
{}
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index b468eccbe285d175b2874bb60d0a51295dac3a6d..16c17b450332d38b5d0edefa9b65ae214cf118d9 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -2319,7 +2319,7 @@ Foam::instantList Foam::fileOperations::masterUncollatedFileOperation::findTimes
instantList* tPtr = new instantList(std::move(times));
- times_.insert(directory, tPtr);
+ times_.set(directory, tPtr);
if (debug)
{
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 26e03251293ddc28373c5208782b52127d3c3fd6..5e0d11579fce65d1e0f2b4225b15e3712be30e2f 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -66,7 +66,7 @@ void Foam::graph::readCurves(Istream& is)
y[i] = xyData[i].y_;
}
- insert
+ set
(
wordify(yName_),
new curve(wordify(yName_), curve::curveStyle::CONTINUOUS, y)
@@ -105,7 +105,11 @@ Foam::graph::graph
yName_(yName),
x_(x)
{
- insert(wordify(yName), new curve(yName, curve::curveStyle::CONTINUOUS, y));
+ set
+ (
+ wordify(yName),
+ new curve(yName, curve::curveStyle::CONTINUOUS, y)
+ );
}
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index d03e6e842597e4ee5e52ae2bc8836a5866b7c40d..0f8cb617c5a721c2d665bd0cd9f3741a72624cd7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -38,18 +38,11 @@ Foam::Function1<Type>::Function1(const word& entryName)
template<class Type>
Foam::Function1<Type>::Function1(const Function1<Type>& de)
:
- tmp<Function1<Type>>::refCount(),
+ refCount(),
name_(de.name_)
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1<Type>::~Function1()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
@@ -111,8 +104,8 @@ Foam::FieldFunction1<Function1Type>::value
const scalarField& x
) const
{
- tmp<Field<Type>> tfld(new Field<Type>(x.size()));
- Field<Type>& fld = tfld.ref();
+ auto tfld = tmp<Field<Type>>::New(x.size());
+ auto& fld = tfld.ref();
forAll(x, i)
{
@@ -152,8 +145,8 @@ Foam::FieldFunction1<Function1Type>::integrate
const scalarField& x2
) const
{
- tmp<Field<Type>> tfld(new Field<Type>(x1.size()));
- Field<Type>& fld = tfld.ref();
+ auto tfld = tmp<Field<Type>>::New(x1.size());
+ auto& fld = tfld.ref();
forAll(x1, i)
{
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 327a045ec22cef8b1da627b0d4dbb93d40081f6e..0784f12e17f5aa5f9657b6bf67f465607b397b98 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -61,11 +61,11 @@ template<class Type> Ostream& operator<<(Ostream&, const Function1<Type>&);
template<class Type>
class Function1
:
- public tmp<Function1<Type>>::refCount
+ public refCount
{
// Private Member Functions
- //- Disallow default bitwise assignment
+ //- No copy assignment
void operator=(const Function1<Type>&) = delete;
@@ -119,7 +119,7 @@ public:
//- Destructor
- virtual ~Function1();
+ virtual ~Function1() = default;
// Member Functions
@@ -194,8 +194,7 @@ public:
//- Destructor
- virtual ~FieldFunction1()
- {}
+ virtual ~FieldFunction1() = default;
// Member Functions
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
index 82289005a6e68bb1f8e33a37afde306f1f3b73ab..702a366d74df90bcab18897ee8cbf3f779bec2aa 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
@@ -71,7 +71,7 @@ Ostream& operator<<(Ostream&, const faMatrix<Type>&);
template<class Type>
class faMatrix
:
- public tmp<faMatrix<Type>>::refCount,
+ public refCount,
public lduMatrix
{
// Private data
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index ca63afc7882048563465dfed8cccefcc412496af..c2384815978abde9b54a19f412b5961fbb4874a2 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -46,7 +46,7 @@ namespace fv
template<class Type>
convectionScheme<Type>::convectionScheme(const convectionScheme& cs)
:
- tmp<convectionScheme<Type>>::refCount(),
+ refCount(),
mesh_(cs.mesh_)
{}
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index aa409f3c265f9a5bc55ffc045cb3850ab4a3ccde..543ec60ff01eddf8d7ad0d36b5420654bd602062 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -67,7 +67,7 @@ namespace fv
template<class Type>
class convectionScheme
:
- public tmp<convectionScheme<Type>>::refCount
+ public refCount
{
// Private data
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index ffdc4c25b8bfc5c9c2019f969248e2306460c957..70208e97903e96cf01e9aa026b6045cef5e2f4aa 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Abstract base class for finite volume calculus d2dt2 schemes.
-
\*---------------------------------------------------------------------------*/
#include "fv.H"
@@ -84,13 +81,6 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-d2dt2Scheme<Type>::~d2dt2Scheme()
-{}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace fv
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index b00888c5779f05f42a8ad4b6189574ac87f4f017..f52dab06eed185074186ce8dbdf73783efa6f444 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -25,7 +25,7 @@ Class
Foam::fv::d2dt2Scheme
Description
- Abstract base class for d2dt2 schemes.
+ Abstract base class for finite volume d2dt2 schemes.
SourceFiles
d2dt2Scheme.C
@@ -64,7 +64,7 @@ namespace fv
template<class Type>
class d2dt2Scheme
:
- public tmp<d2dt2Scheme<Type>>::refCount
+ public refCount
{
protected:
@@ -76,11 +76,11 @@ protected:
// Private Member Functions
- //- Disallow copy construct
- d2dt2Scheme(const d2dt2Scheme&);
+ //- No copy construct
+ d2dt2Scheme(const d2dt2Scheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const d2dt2Scheme&);
+ //- No copy assignment
+ void operator=(const d2dt2Scheme&) = delete;
public:
@@ -127,7 +127,7 @@ public:
//- Destructor
- virtual ~d2dt2Scheme();
+ virtual ~d2dt2Scheme() = default;
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 4b201d9d3bd81d27a0dffc443fc5d7116d3cf0a1..b90c786dcebed51913705e4a4a074d059c26aa55 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -84,13 +84,6 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-ddtScheme<Type>::~ddtScheme()
-{}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
@@ -120,14 +113,11 @@ tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
{
NotImplemented;
- return tmp<fvMatrix<Type>>
+ return tmp<fvMatrix<Type>>::New
(
- new fvMatrix<Type>
- (
- vf,
- alpha.dimensions()*rho.dimensions()
- *vf.dimensions()*dimVol/dimTime
- )
+ vf,
+ alpha.dimensions()*rho.dimensions()
+ *vf.dimensions()*dimVol/dimTime
);
}
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 3d293e0bdd14bf4b30c3a9863edf3973ad369c2b..0f5552cac8f2639ec1ec68a94884ed62c2bc85f3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -30,7 +30,6 @@ Group
Description
Abstract base class for ddt schemes.
-
SourceFiles
ddtScheme.C
@@ -68,7 +67,7 @@ namespace fv
template<class Type>
class ddtScheme
:
- public tmp<ddtScheme<Type>>::refCount
+ public refCount
{
protected:
@@ -83,11 +82,11 @@ protected:
// Private Member Functions
- //- Disallow copy construct
- ddtScheme(const ddtScheme&);
+ //- No copy construct
+ ddtScheme(const ddtScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const ddtScheme&);
+ //- No copy assignment
+ void operator=(const ddtScheme&) = delete;
public:
@@ -136,7 +135,7 @@ public:
//- Destructor
- virtual ~ddtScheme();
+ virtual ~ddtScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index 8c71aafcb3dc3b1b2422729a040a1e048113980a..66b7f83df2fa2ecc66fd4803d1f6e6aac0f77b27 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -85,16 +85,6 @@ tmp<divScheme<Type>> divScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-divScheme<Type>::~divScheme()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace fv
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 1f93d225c9e75b0de4766ac5ca0ed70d935879b4..3b5e948a0e0ee353edd0a811ac8292a3e8a3660d 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -67,7 +67,7 @@ namespace fv
template<class Type>
class divScheme
:
- public tmp<divScheme<Type>>::refCount
+ public refCount
{
protected:
@@ -80,11 +80,11 @@ protected:
// Private Member Functions
- //- Disallow copy construct
- divScheme(const divScheme&);
+ //- No copy construct
+ divScheme(const divScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const divScheme&);
+ //- No copy assignment
+ void operator=(const divScheme&) = delete;
public:
@@ -133,7 +133,7 @@ public:
//- Destructor
- virtual ~divScheme();
+ virtual ~divScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 1a055779f19bcd493cd7ebeae40feb01e736f595..414fe7b8ce6506506d8851b0915e8ecac255f22d 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -72,12 +72,6 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::fv::gradScheme<Type>::~gradScheme()
-{}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index 4e6ca98bf6135ba71dfbd648d8dad65d3cbc8392..1ed984b2138a2e5859215565c61c8ae9956f1494 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -60,7 +60,7 @@ namespace fv
template<class Type>
class gradScheme
:
- public tmp<gradScheme<Type>>::refCount
+ public refCount
{
// Private data
@@ -69,11 +69,11 @@ class gradScheme
// Private Member Functions
- //- Disallow copy construct
- gradScheme(const gradScheme&);
+ //- No copy construct
+ gradScheme(const gradScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const gradScheme&);
+ //- No copy assignment
+ void operator=(const gradScheme&) = delete;
public:
@@ -114,7 +114,7 @@ public:
//- Destructor
- virtual ~gradScheme();
+ virtual ~gradScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index 0a774bdf5dcf6a8f2680a829b2fc7f1bb0937ea0..fefd505876195f33093e1a50d2b0fdb2bdc4ee19 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -83,13 +83,6 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type, class GType>
-laplacianScheme<Type, GType>::~laplacianScheme()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type, class GType>
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index cb9e02ab382087cc7701bbce96362b69095f4984..ea2d07bc95d2a474c395b7a94a2f5d29df68405f 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -68,7 +68,7 @@ namespace fv
template<class Type, class GType>
class laplacianScheme
:
- public tmp<laplacianScheme<Type, GType>>::refCount
+ public refCount
{
protected:
@@ -84,11 +84,11 @@ private:
// Private Member Functions
- //- Disallow copy construct
- laplacianScheme(const laplacianScheme&);
+ //- No copy construct
+ laplacianScheme(const laplacianScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const laplacianScheme&);
+ //- No copy assignment
+ void operator=(const laplacianScheme&) = delete;
public:
@@ -162,7 +162,7 @@ public:
//- Destructor
- virtual ~laplacianScheme();
+ virtual ~laplacianScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index d5422e729d5a6b66488e43ff41e24371b62ef8dc..245a01406503f740e8d521ee884cbef681370e13 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -85,13 +85,6 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-snGradScheme<Type>::~snGradScheme()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index 14821c17c287bd4bcb521935a375f563a662908d..5c9ad02d4c0eda8fcdfff7141b8ba1d78213ca36 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -63,7 +63,7 @@ namespace fv
template<class Type>
class snGradScheme
:
- public tmp<snGradScheme<Type>>::refCount
+ public refCount
{
// Private data
@@ -73,11 +73,11 @@ class snGradScheme
// Private Member Functions
- //- Disallow copy construct
- snGradScheme(const snGradScheme&);
+ //- No copy construct
+ snGradScheme(const snGradScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const snGradScheme&);
+ //- No copy assignment
+ void operator=(const snGradScheme&) = delete;
public:
@@ -118,7 +118,7 @@ public:
//- Destructor
- virtual ~snGradScheme();
+ virtual ~snGradScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index d1e941c534f4207c66e088279f99fc2f48028a3e..6fc6924690862000f1debee82417cfad6d074553 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -321,7 +321,7 @@ Foam::fvMatrix<Type>::fvMatrix
template<class Type>
Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
:
- tmp<fvMatrix<Type>>::refCount(),
+ refCount(),
lduMatrix(fvm),
psi_(fvm.psi_),
dimensions_(fvm.dimensions_),
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 4cad056ab2f6ff08d27307b12618cb5b597d35f3..1acbb4300ea4159d6b970fc1cb69079fe3678ac2 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -114,7 +114,7 @@ template<class T> class UIndirectList;
template<class Type>
class fvMatrix
:
- public tmp<fvMatrix<Type>>::refCount,
+ public refCount,
public lduMatrix
{
// Private data
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index e9400fbfee6e191fb900a6edf7783a414a165431..5a4a26285f8e3ebc8e5ba2a93b228b66df5a8409 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Abstract base class for surface interpolation schemes.
-
\*---------------------------------------------------------------------------*/
#include "fv.H"
@@ -85,12 +82,4 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::multivariateSurfaceInterpolationScheme<Type>::
-~multivariateSurfaceInterpolationScheme()
-{}
-
-
// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 4669b43d63ce0cca5f22c32c47e52b4e1f6a96cc..a3c20cc7dd8cbf37a251018ba3cacf6c464972c5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -50,7 +50,7 @@ namespace Foam
template<class Type>
class multivariateSurfaceInterpolationScheme
:
- public tmp<multivariateSurfaceInterpolationScheme<Type>>::refCount
+ public refCount
{
public:
@@ -85,14 +85,14 @@ private:
// Private Member Functions
- //- Disallow default bitwise copy construct
+ //- No copy construct
multivariateSurfaceInterpolationScheme
(
const multivariateSurfaceInterpolationScheme&
- );
+ ) = delete;
- //- Disallow default bitwise assignment
- void operator=(const multivariateSurfaceInterpolationScheme&);
+ //- No copy assignment
+ void operator=(const multivariateSurfaceInterpolationScheme&) = delete;
public:
@@ -143,7 +143,7 @@ public:
//- Destructor
- virtual ~multivariateSurfaceInterpolationScheme();
+ virtual ~multivariateSurfaceInterpolationScheme() = default;
// Member Functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index b35c82f8a7b7952c550352ec4fac6d163ddcfd78..8e141791011957e2ae86ea54c7e4c6bc08dc3ff5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -123,13 +123,6 @@ Foam::surfaceInterpolationScheme<Type>::New
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::surfaceInterpolationScheme<Type>::~surfaceInterpolationScheme()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
@@ -147,8 +140,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
<< "Interpolating "
<< vf.type() << " "
<< vf.name()
- << " from cells to faces "
- "without explicit correction"
+ << " from cells to faces without explicit correction"
<< endl;
}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index bf233ef3f9131aef66855baa8be5e28065772163..871578b62640b06becae35ee92ddc99bbfe3eb80 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -55,7 +55,7 @@ class fvMesh;
template<class Type>
class surfaceInterpolationScheme
:
- public tmp<surfaceInterpolationScheme<Type>>::refCount
+ public refCount
{
// Private data
@@ -65,11 +65,11 @@ class surfaceInterpolationScheme
// Private Member Functions
- //- Disallow copy construct
- surfaceInterpolationScheme(const surfaceInterpolationScheme&);
+ //- No copy construct
+ surfaceInterpolationScheme(const surfaceInterpolationScheme&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const surfaceInterpolationScheme&);
+ //- No copy assignment
+ void operator=(const surfaceInterpolationScheme&) = delete;
public:
@@ -134,7 +134,7 @@ public:
//- Destructor
- virtual ~surfaceInterpolationScheme();
+ virtual ~surfaceInterpolationScheme() = default;
// Member Functions
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index d984e9f03bbea9d8ef5becaf8814d64dc334f4c4..e39f3010e57ab4a8d39e2926e4ad3ea7734cd687 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -122,11 +122,10 @@ void Foam::functionObjects::runTimePostPro::scene::readColours
const dictionary& dict
)
{
- const wordList colours = dict.toc();
- forAll(colours, i)
+ const wordList colours(dict.toc());
+ for (const word& c : colours)
{
- const word& c = colours[i];
- colours_.insert(c, Function1<vector>::New(c, dict).ptr());
+ colours_.insert(c, Function1<vector>::New(c, dict));
}
}
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
index 5d5e7ccc0459b08d06be4f8e1b9c17c6d49181c3..805e5c0e52c1cb87cb4d7b57c1a71a3cbcabda0c 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
@@ -109,7 +109,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
scalarFields_.insert
(
iter().keyword(),
- new scalarField(0)
+ autoPtr<scalarField>::New()
);
}
else
@@ -133,7 +133,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
== token::Compound<List<scalar>>::typeName
)
{
- scalarField* fPtr = new scalarField;
+ auto fPtr = autoPtr<scalarField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<scalar>>>
@@ -167,7 +168,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
== token::Compound<List<vector>>::typeName
)
{
- vectorField* fPtr = new vectorField;
+ auto fPtr = autoPtr<vectorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<vector>>>
@@ -201,7 +203,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
== token::Compound<List<sphericalTensor>>::typeName
)
{
- sphericalTensorField* fPtr = new sphericalTensorField;
+ auto fPtr = autoPtr<sphericalTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -238,7 +241,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
== token::Compound<List<symmTensor>>::typeName
)
{
- symmTensorField* fPtr = new symmTensorField;
+ auto fPtr = autoPtr<symmTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -275,7 +279,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
== token::Compound<List<tensor>>::typeName
)
{
- tensorField* fPtr = new tensorField;
+ auto fPtr = autoPtr<tensorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<tensor>>>
@@ -331,7 +336,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
scalarFields_.insert
(
iter().keyword(),
- new scalarField
+ autoPtr<scalarField>::New
(
this->size(),
fieldToken.number()
@@ -352,7 +357,11 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
vectorFields_.insert
(
iter().keyword(),
- new vectorField(this->size(), vs)
+ autoPtr<vectorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == sphericalTensor::nComponents)
@@ -362,7 +371,11 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
sphericalTensorFields_.insert
(
iter().keyword(),
- new sphericalTensorField(this->size(), vs)
+ autoPtr<sphericalTensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == symmTensor::nComponents)
@@ -372,7 +385,11 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
symmTensorFields_.insert
(
iter().keyword(),
- new symmTensorField(this->size(), vs)
+ autoPtr<symmTensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == tensor::nComponents)
@@ -387,7 +404,11 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
tensorFields_.insert
(
iter().keyword(),
- new tensorField(this->size(), vs)
+ autoPtr<tensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else
@@ -434,7 +455,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
scalarFields_.insert
(
iter.key(),
- new scalarField(*iter(), mapper)
+ autoPtr<scalarField>::New(*iter(), mapper)
);
}
@@ -448,7 +469,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
vectorFields_.insert
(
iter.key(),
- new vectorField(*iter(), mapper)
+ autoPtr<vectorField>::New(*iter(), mapper)
);
}
@@ -462,7 +483,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
sphericalTensorFields_.insert
(
iter.key(),
- new sphericalTensorField(*iter(), mapper)
+ autoPtr<sphericalTensorField>::New(*iter(), mapper)
);
}
@@ -476,7 +497,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
symmTensorFields_.insert
(
iter.key(),
- new symmTensorField(*iter(), mapper)
+ autoPtr<symmTensorField>::New(*iter(), mapper)
);
}
@@ -490,7 +511,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
tensorFields_.insert
(
iter.key(),
- new tensorField(*iter(), mapper)
+ autoPtr<tensorField>::New(*iter(), mapper)
);
}
}
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index d0a7f439d2025b3805c0d6b655fb2e3ced9c10f7..b47b219245c9d3230bc16bf4a1714bc4f6a9d4e6 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -109,7 +109,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
scalarFields_.insert
(
iter().keyword(),
- new scalarField(0)
+ autoPtr<scalarField>::New()
);
}
else
@@ -133,7 +133,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
== token::Compound<List<scalar>>::typeName
)
{
- scalarField* fPtr = new scalarField;
+ auto fPtr = autoPtr<scalarField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<scalar>>>
@@ -167,7 +168,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
== token::Compound<List<vector>>::typeName
)
{
- vectorField* fPtr = new vectorField;
+ auto fPtr = autoPtr<vectorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<vector>>>
@@ -201,7 +203,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
== token::Compound<List<sphericalTensor>>::typeName
)
{
- sphericalTensorField* fPtr = new sphericalTensorField;
+ auto fPtr = autoPtr<sphericalTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -238,7 +241,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
== token::Compound<List<symmTensor>>::typeName
)
{
- symmTensorField* fPtr = new symmTensorField;
+ auto fPtr = autoPtr<symmTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -275,7 +279,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
== token::Compound<List<tensor>>::typeName
)
{
- tensorField* fPtr = new tensorField;
+ auto fPtr = autoPtr<tensorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<tensor>>>
@@ -331,7 +336,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
scalarFields_.insert
(
iter().keyword(),
- new scalarField
+ autoPtr<scalarField>::New
(
this->size(),
fieldToken.number()
@@ -352,7 +357,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
vectorFields_.insert
(
iter().keyword(),
- new vectorField(this->size(), vs)
+ autoPtr<vectorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == sphericalTensor::nComponents)
@@ -362,7 +371,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
sphericalTensorFields_.insert
(
iter().keyword(),
- new sphericalTensorField(this->size(), vs)
+ autoPtr<sphericalTensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == symmTensor::nComponents)
@@ -372,7 +385,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
symmTensorFields_.insert
(
iter().keyword(),
- new symmTensorField(this->size(), vs)
+ autoPtr<symmTensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else if (l.size() == tensor::nComponents)
@@ -387,7 +404,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
tensorFields_.insert
(
iter().keyword(),
- new tensorField(this->size(), vs)
+ autoPtr<tensorField>::New
+ (
+ this->size(),
+ vs
+ )
);
}
else
@@ -434,7 +455,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
scalarFields_.insert
(
iter.key(),
- new scalarField(*iter(), mapper)
+ autoPtr<scalarField>::New(*iter(), mapper)
);
}
@@ -448,7 +469,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
vectorFields_.insert
(
iter.key(),
- new vectorField(*iter(), mapper)
+ autoPtr<vectorField>::New(*iter(), mapper)
);
}
@@ -462,7 +483,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
sphericalTensorFields_.insert
(
iter.key(),
- new sphericalTensorField(*iter(), mapper)
+ autoPtr<sphericalTensorField>::New(*iter(), mapper)
);
}
@@ -476,7 +497,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
symmTensorFields_.insert
(
iter.key(),
- new symmTensorField(*iter(), mapper)
+ autoPtr<symmTensorField>::New(*iter(), mapper)
);
}
@@ -490,7 +511,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
tensorFields_.insert
(
iter.key(),
- new tensorField(*iter(), mapper)
+ autoPtr<tensorField>::New(*iter(), mapper)
);
}
}
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 52744cdf3cd4a8b1d7f4449322b0d41baafc6b14..3ef8cf3b5138d789936a2d2e41d3bb7b79ab1b4f 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -87,7 +87,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
scalarFields_.insert
(
iter().keyword(),
- new scalarField(0)
+ autoPtr<scalarField>::New()
);
}
else
@@ -111,7 +111,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
== token::Compound<List<scalar>>::typeName
)
{
- scalarField* fPtr = new scalarField;
+ auto fPtr = autoPtr<scalarField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<scalar>>>
@@ -145,7 +146,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
== token::Compound<List<vector>>::typeName
)
{
- vectorField* fPtr = new vectorField;
+ auto fPtr = autoPtr<vectorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<vector>>>
@@ -179,7 +181,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
== token::Compound<List<sphericalTensor>>::typeName
)
{
- sphericalTensorField* fPtr = new sphericalTensorField;
+ auto fPtr = autoPtr<sphericalTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -216,7 +219,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
== token::Compound<List<symmTensor>>::typeName
)
{
- symmTensorField* fPtr = new symmTensorField;
+ auto fPtr = autoPtr<symmTensorField>::New();
+
fPtr->transfer
(
dynamicCast
@@ -253,7 +257,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
== token::Compound<List<tensor>>::typeName
)
{
- tensorField* fPtr = new tensorField;
+ auto fPtr = autoPtr<tensorField>::New();
+
fPtr->transfer
(
dynamicCast<token::Compound<List<tensor>>>
@@ -325,7 +330,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
scalarFields_.insert
(
iter.key(),
- new scalarField(*iter(), mapper)
+ autoPtr<scalarField>::New(*iter(), mapper)
);
}
@@ -339,7 +344,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
vectorFields_.insert
(
iter.key(),
- new vectorField(*iter(), mapper)
+ autoPtr<vectorField>::New(*iter(), mapper)
);
}
@@ -353,7 +358,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
sphericalTensorFields_.insert
(
iter.key(),
- new sphericalTensorField(*iter(), mapper)
+ autoPtr<sphericalTensorField>::New(*iter(), mapper)
);
}
@@ -367,7 +372,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
symmTensorFields_.insert
(
iter.key(),
- new symmTensorField(*iter(), mapper)
+ autoPtr<symmTensorField>::New(*iter(), mapper)
);
}
@@ -381,7 +386,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
tensorFields_.insert
(
iter.key(),
- new tensorField(*iter(), mapper)
+ autoPtr<tensorField>::New(*iter(), mapper)
);
}
}
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 562702f8c92aa9474d528453fdb7c3ca5270a305..427d038b9b41381d00d791b8f58839cba54abc30 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -217,13 +217,13 @@ Foam::label Foam::probes::prepare()
probeDir.clean(); // Remove unneeded ".."
// ignore known fields, close streams for fields that no longer exist
- forAllIter(HashPtrTable<OFstream>, probeFilePtrs_, iter)
+ forAllIters(probeFilePtrs_, iter)
{
if (!currentFields.erase(iter.key()))
{
DebugInfo<< "close probe stream: " << iter()->name() << endl;
- delete probeFilePtrs_.remove(iter);
+ probeFilePtrs_.remove(iter);
}
}
@@ -233,9 +233,8 @@ Foam::label Foam::probes::prepare()
// Create directory if does not exist.
mkDir(probeDir);
- OFstream* fPtr = new OFstream(probeDir/fieldName);
-
- OFstream& fout = *fPtr;
+ auto fPtr = autoPtr<OFstream>::New(probeDir/fieldName);
+ auto& fout = *fPtr;
DebugInfo<< "open probe stream: " << fout.name() << endl;
@@ -426,9 +425,8 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
DynamicList<label> elems(faceList_.size());
const labelList& reverseMap = mpm.reverseFaceMap();
- forAll(faceList_, i)
+ for (const label facei : faceList_)
{
- label facei = faceList_[i];
if (facei != -1)
{
label newFacei = reverseMap[facei];
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 9db567ba47910599a8918085521f867f5d38a9c9..784d38f20e6df2931aeeda9bbdefcebd24e13ad5 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -600,7 +600,7 @@ bool finishReaction = false;
speciesThermo_.insert
(
currentSpecieName,
- new gasHThermoPhysics
+ autoPtr<gasHThermoPhysics>::New
(
janafThermo<perfectGas<specie>>
(