From 46b768628cec06ac9b851c12741acbc1a86b7a27 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 16 May 2018 18:03:14 +0100
Subject: [PATCH] STYLE: use FieldBase for template invariant parts
- use refCount instead of the tmp<...>::refCount alias
---
src/OpenFOAM/Make/files | 22 +++---
.../DimensionedField/SubDimensionedFieldI.H | 2 +-
.../FieldFields/FieldField/FieldField.C | 5 +-
.../FieldFields/FieldField/FieldField.H | 2 +-
src/OpenFOAM/fields/Fields/Field/Field.C | 6 --
src/OpenFOAM/fields/Fields/Field/Field.H | 8 +-
src/OpenFOAM/fields/Fields/Field/FieldBase.C | 33 ++++++++
src/OpenFOAM/fields/Fields/Field/FieldBase.H | 77 +++++++++++++++++++
src/OpenFOAM/fields/Fields/Field/SubField.H | 2 +-
src/OpenFOAM/fields/Fields/Field/SubFieldI.H | 2 +-
.../functions/Function1/Function1/Function1.C | 17 ++--
.../functions/Function1/Function1/Function1.H | 9 +--
src/finiteArea/faMatrices/faMatrix/faMatrix.H | 2 +-
.../convectionScheme/convectionScheme.C | 2 +-
.../convectionScheme/convectionScheme.H | 2 +-
.../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C | 10 ---
.../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H | 14 ++--
.../ddtSchemes/ddtScheme/ddtScheme.C | 18 +----
.../ddtSchemes/ddtScheme/ddtScheme.H | 13 ++--
.../divSchemes/divScheme/divScheme.C | 10 ---
.../divSchemes/divScheme/divScheme.H | 12 +--
.../gradSchemes/gradScheme/gradScheme.C | 6 --
.../gradSchemes/gradScheme/gradScheme.H | 12 +--
.../laplacianScheme/laplacianScheme.C | 7 --
.../laplacianScheme/laplacianScheme.H | 12 +--
.../snGradSchemes/snGradScheme/snGradScheme.C | 7 --
.../snGradSchemes/snGradScheme/snGradScheme.H | 12 +--
.../fvMatrices/fvMatrix/fvMatrix.C | 2 +-
.../fvMatrices/fvMatrix/fvMatrix.H | 2 +-
.../multivariateSurfaceInterpolationScheme.C | 11 ---
.../multivariateSurfaceInterpolationScheme.H | 12 +--
.../surfaceInterpolationScheme.C | 10 +--
.../surfaceInterpolationScheme.H | 12 +--
33 files changed, 196 insertions(+), 177 deletions(-)
create mode 100644 src/OpenFOAM/fields/Fields/Field/FieldBase.C
create mode 100644 src/OpenFOAM/fields/Fields/Field/FieldBase.H
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index b0edac8799c..96fc8ca422b 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -627,36 +627,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/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index 93147ece1d1..215a5254219 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 d9778371b4a..ad98f6a02f1 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 19d4ff5cdc1..bae0375b681 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 7cc7c55e6fd..5422b19a134 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 e8a91b03066..ae4f2bfcdbc 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 00000000000..91157104f44
--- /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 00000000000..5de4169ad3a
--- /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 07ecd1443fc..1a7fb9cb913 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 4919f78fe1c..d0ed35b5dca 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/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index d03e6e84259..0f8cb617c5a 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 327a045ec22..0784f12e17f 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 82289005a6e..702a366d74d 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 ca63afc7882..c2384815978 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 aa409f3c265..543ec60ff01 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 ffdc4c25b8b..70208e97903 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 b00888c5779..f52dab06eed 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 fd4f502ed99..a7fa362d724 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 8a1dfbaa8de..55fcc68ca1c 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 8c71aafcb3d..66b7f83df2f 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 1f93d225c9e..3b5e948a0e0 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 1a055779f19..414fe7b8ce6 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 4e6ca98bf61..1ed984b2138 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 0a774bdf5dc..fefd5058761 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 cb9e02ab382..ea2d07bc95d 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 d5422e729d5..245a0140650 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 14821c17c28..5c9ad02d4c0 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 a312cd97f97..8a18e7446aa 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 4cad056ab2f..1acbb4300ea 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 e9400fbfee6..5a4a26285f8 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 4669b43d63c..a3c20cc7dd8 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 b35c82f8a7b..8e141791011 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 bf233ef3f91..871578b6264 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
--
GitLab