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

STYLE: finiteArea: add/fix comments

Browse Source 
STYLE: finiteArea: consistent use of =delete for removed ctors/assignments
This commit is contained in:
Kutalmis Bercin
2024-01-19 15:44:04 +00:00
committed by Andrew Heather
parent 9de77857a6
commit b393d6eca1
63 changed files with 423 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/finiteArea/areaMesh/areaFaMesh.H
View File

@ -69,22 +69,13 @@ public:
// Member Functions
//- Return size. Number of faces
static label size(const Mesh& mesh)
{
return mesh.nFaces();
}
static label size(const Mesh& mesh) { return mesh.nFaces(); }
//- Return size. Number of faces
label size() const
{
return size(mesh_);
}
label size() const { return size(mesh_); }
//- Field of face centres
const areaVectorField& C() const
{
return mesh_.areaCentres();
}
const areaVectorField& C() const { return mesh_.areaCentres(); }
};

1
src/finiteArea/distributed/faMeshDistributor.H
View File

@ -99,6 +99,7 @@ class faMeshDistributor
//- Debug: check addressing
void checkAddressing() const;
//- Construct reconstruct mapping
static mapDistributePolyMesh createReconstructMap
(
const faMesh& mesh,

16
src/finiteArea/edgeMesh/edgeFaMesh.H
View File

@ -65,25 +65,17 @@ public:
GeoMesh<faMesh>(mesh)
{}
// Member Functions
//- Return size. Number of internal edges
static label size(const Mesh& mesh)
{
return mesh.nInternalEdges();
}
static label size(const Mesh& mesh) { return mesh.nInternalEdges(); }
//- Return size. Number of internal edges
label size() const
{
return size(mesh_);
}
label size() const { return size(mesh_); }
//- Field of edge centres
const edgeVectorField& C() const
{
return mesh_.edgeCentres();
}
const edgeVectorField& C() const { return mesh_.edgeCentres(); }
};

4
src/finiteArea/faMatrices/faMatrix/faMatrix.C
View File

@ -50,7 +50,7 @@ void Foam::faMatrix<Type>::addToInternalField
{
FatalErrorInFunction
<< "addressing (" << addr.size()
<< ") and field (" << pf.size() << ") are different sizes" << endl
<< ") and field (" << pf.size() << ") are different sizes"
<< abort(FatalError);
}
@ -88,7 +88,7 @@ void Foam::faMatrix<Type>::subtractFromInternalField
{
FatalErrorInFunction
<< "addressing (" << addr.size()
<< ") and field (" << pf.size() << ") are different sizes" << endl
<< ") and field (" << pf.size() << ") are different sizes"
<< abort(FatalError);
}

14
src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H
View File

@ -77,7 +77,13 @@ class faGlobalMeshData
labelList sharedPointAddr_;
// Private Member Functions
public:
//- Runtime type information
ClassName("faGlobalMeshData");
// Generated Methods
//- No copy construct
faGlobalMeshData(const faGlobalMeshData&) = delete;
@ -86,12 +92,6 @@ class faGlobalMeshData
void operator=(const faGlobalMeshData&) = delete;
public:
//- Runtime type information
ClassName("faGlobalMeshData");
// Constructors
//- Construct from mesh

15
src/finiteArea/faMesh/faMesh.H
View File

@ -332,12 +332,6 @@ class faMesh
// Private Member Functions
//- No copy construct
faMesh(const faMesh&) = delete;
//- No copy assignment
void operator=(const faMesh&) = delete;
//- Set indirect patch, removing any old one.
// No communication
void initPatch() const;
@ -524,6 +518,15 @@ public:
static word meshSubDir;
// Generated Methods
//- No copy construct
faMesh(const faMesh&) = delete;
//- No copy assignment
void operator=(const faMesh&) = delete;
// Constructors
//- Read construct from polyMesh, using its IOobject properties

6
src/finiteArea/faMesh/faMeshLduAddressing.H
View File

@ -73,7 +73,9 @@ class faMeshLduAddressing
const lduSchedule& patchSchedule_;
// Private Member Functions
public:
// Generated Methods
//- No copy construct
faMeshLduAddressing(const faMeshLduAddressing&) = delete;
@ -82,8 +84,6 @@ class faMeshLduAddressing
void operator=(const faMeshLduAddressing&) = delete;
public:
// Constructors
//- Construct from components

17
src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H
View File

@ -60,7 +60,7 @@ class faAreaMapper
:
public morphFieldMapper
{
// Private data
// Private Data
//- Reference to mesh mapper
const faMesh& mesh_;
@ -101,12 +101,6 @@ class faAreaMapper
// Private Member Functions
//- No copy construct
faAreaMapper(const faAreaMapper&) = delete;
//- No copy assignment
void operator=(const faAreaMapper&) = delete;
//- Calculate addressing
void calcAddressing() const;
@ -116,6 +110,15 @@ class faAreaMapper
public:
// Generated Methods
//- No copy construct
faAreaMapper(const faAreaMapper&) = delete;
//- No copy assignment
void operator=(const faAreaMapper&) = delete;
//- Construct from components
faAreaMapper
(

1
src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C
View File

@ -63,7 +63,6 @@ Foam::faEdgeMapper::faEdgeMapper
)
:
mesh_(mesh),
// mpm_(mpm),
sizeBeforeMapping_(mesh.nInternalEdges()),
hasUnmapped_(false),
directAddrPtr_(nullptr)

20
src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H
View File

@ -61,14 +61,11 @@ class faEdgeMapper
:
public morphFieldMapper
{
// Private data
// Private Data
//- Reference to mesh
const faMesh& mesh_;
//- Reference to mapPolyMesh
//const mapPolyMesh& mpm_;
//- Old mesh size
label sizeBeforeMapping_;
@ -83,12 +80,6 @@ class faEdgeMapper
// Private Member Functions
//- No copy construct
faEdgeMapper(const faEdgeMapper&) = delete;
//- No copy assignment
void operator=(const faEdgeMapper&) = delete;
//- Calculate addressing
void calcAddressing() const;
@ -98,6 +89,15 @@ class faEdgeMapper
public:
// Generated Methods
//- No copy construct
faEdgeMapper(const faEdgeMapper&) = delete;
//- No copy assignment
void operator=(const faEdgeMapper&) = delete;
//- Construct from components
faEdgeMapper
(

8
src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
View File

@ -68,7 +68,7 @@ class mapPolyMesh;
class faMeshMapper
{
// Private data
// Private Data
//- Reference to mesh
const faMesh& mesh_;
@ -110,7 +110,9 @@ class faMeshMapper
faBoundaryMeshMapper boundaryMap_;
// Private Member Functions
public:
// Generated Methods
//- No copy construct
faMeshMapper(const faMeshMapper&) = delete;
@ -119,8 +121,6 @@ class faMeshMapper
void operator=(const faMeshMapper&) = delete;
public:
// Constructors
//- Construct from components

18
src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H
View File

@ -64,7 +64,7 @@ class faPatchMapper
:
public faPatchFieldMapper
{
// Private data
// Private Data
//- Reference to patch
const faPatch& patch_;
@ -89,13 +89,6 @@ class faPatchMapper
// Private Member Functions
//- No copy construct
faPatchMapper(const faPatchMapper&) = delete;
//- No copy assignment
void operator=(const faPatchMapper&) = delete;
//- Calculate addressing for mapping with inserted cells
void calcAddressing() const;
@ -105,6 +98,15 @@ class faPatchMapper
public:
// Generated Methods
//- No copy construct
faPatchMapper(const faPatchMapper&) = delete;
//- No copy assignment
void operator=(const faPatchMapper&) = delete;
//- Construct from mappers
faPatchMapper
(

14
src/finiteArea/faMesh/faMeshSubset/faMeshSubset.H
View File

@ -102,12 +102,6 @@ protected:
//- FatalError if subset has not been performed
bool checkHasSubMesh() const;
//- No copy construct
faMeshSubset(const faMeshSubset&) = delete;
//- No copy assignment
void operator=(const faMeshSubset&) = delete;
public:
@ -116,6 +110,14 @@ public:
//- Name for exposed internal edges (default: oldInternalEdges)
static word exposedPatchName;
// Generated Methods
//- No copy construct
faMeshSubset(const faMeshSubset&) = delete;
//- No copy assignment
void operator=(const faMeshSubset&) = delete;
// Constructors

10
src/finiteArea/faSolution/faSolution.H
View File

@ -61,11 +61,13 @@ class faSolution
{
public:
//- No copy construct
faSolution(const faSolution&) = delete;
// Generated Methods
//- No copy assignment
void operator=(const faSolution&) = delete;
//- No copy construct
faSolution(const faSolution&) = delete;
//- No copy assignment
void operator=(const faSolution&) = delete;
// Constructors

2
src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
View File

@ -68,7 +68,7 @@ class cyclicFaPatchField
const cyclicFaPatch& cyclicPatch_;
// Private member functions
// Private Member Functions
//- Return neighbour side field given internal fields
template<class Type2>

2
src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H
View File

@ -48,7 +48,7 @@ class faPatchFieldMapperPatchRef
:
public faPatchFieldMapper
{
// Private data
// Private Data
const faPatch& sourcePatch_;
const faPatch& targetPatch_;

2
src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
View File

@ -59,7 +59,7 @@ class cyclicFaePatchField
:
public coupledFaePatchField<Type>
{
// Private data
// Private Data
//- Local reference cast into the cyclic patch
const cyclicFaPatch& cyclicPatch_;

27
src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H
View File

@ -48,6 +48,7 @@ SourceFiles
namespace Foam
{
// Forward Declarations
template<class Type>
class faMatrix;
@ -67,20 +68,12 @@ class convectionScheme
:
public refCount
{
// Private data
// Private Data
//- Reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy construct
convectionScheme(const convectionScheme&) = delete;
//- No copy assignment
void operator=(const convectionScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -99,6 +92,15 @@ public:
);
// Generated Methods
//- No copy construct
convectionScheme(const convectionScheme&) = delete;
//- No copy assignment
void operator=(const convectionScheme&) = delete;
// Constructors
//- Construct from mesh, flux and Istream
@ -130,10 +132,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const
{
return mesh_;
}
const faMesh& mesh() const noexcept { return mesh_; }
virtual tmp<GeometricField<Type, faePatchField, edgeMesh>> flux
(

21
src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H
View File

@ -60,26 +60,27 @@ class gaussConvectionScheme
:
public fa::convectionScheme<Type>
{
// Private data
// Private Data
//- Edge-interpolation scheme
tmp<edgeInterpolationScheme<Type>> tinterpScheme_;
// Private Member Functions
//- No copy construct
gaussConvectionScheme(const gaussConvectionScheme&) = delete;
//- No copy assignment
void operator=(const gaussConvectionScheme&) = delete;
public:
//- Runtime type information
TypeName("Gauss");
// Generated Methods
//- No copy construct
gaussConvectionScheme(const gaussConvectionScheme&) = delete;
//- No copy assignment
void operator=(const gaussConvectionScheme&) = delete;
// Constructors
//- Construct from flux and interpolation scheme

15
src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
View File

@ -67,12 +67,6 @@ class EulerFaD2dt2Scheme
//- Return the previous time-step
scalar deltaT0_() const;
//- No copy construct
EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&) = delete;
//- No copy assignment
void operator=(const EulerFaD2dt2Scheme&) = delete;
public:
@ -80,6 +74,15 @@ public:
TypeName("Euler");
// Generated Methods
//- No copy construct
EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&) = delete;
//- No copy assignment
void operator=(const EulerFaD2dt2Scheme&) = delete;
// Constructors
//- Construct from mesh

3
src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C
View File

@ -24,9 +24,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 area d2dt2 schemes.
\*---------------------------------------------------------------------------*/
#include "fa.H"

28
src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
View File

@ -49,6 +49,7 @@ SourceFiles
namespace Foam
{
// Forward Declarations
template<class Type>
class faMatrix;
@ -68,23 +69,14 @@ class faD2dt2Scheme
:
public refCount
{
protected:
// Protected data
// Protected Data
//- Reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy construct
faD2dt2Scheme(const faD2dt2Scheme&) = delete;
//- No copy assignment
void operator=(const faD2dt2Scheme&) = delete;
public:
//- Runtime type information
@ -103,6 +95,15 @@ public:
);
// Generated Methods
//- No copy construct
faD2dt2Scheme(const faD2dt2Scheme&) = delete;
//- No copy assignment
void operator=(const faD2dt2Scheme&) = delete;
// Constructors
//- Construct from mesh
@ -135,10 +136,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const
{
return mesh_;
}
const faMesh& mesh() const noexcept { return mesh_; }
virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
(

14
src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H
View File

@ -59,7 +59,13 @@ class EulerFaDdtScheme
:
public fa::faDdtScheme<Type>
{
// Private Member Functions
public:
//- Runtime type information
TypeName("Euler");
// Generated Methods
//- No copy construct
EulerFaDdtScheme(const EulerFaDdtScheme&) = delete;
@ -68,12 +74,6 @@ class EulerFaDdtScheme
void operator=(const EulerFaDdtScheme&) = delete;
public:
//- Runtime type information
TypeName("Euler");
// Constructors
//- Construct from mesh

15
src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H
View File

@ -72,12 +72,6 @@ class backwardFaDdtScheme
template<class GeoField>
scalar deltaT0_(const GeoField&) const;
//- No copy construct
backwardFaDdtScheme(const backwardFaDdtScheme&) = delete;
//- No copy assignment
void operator=(const backwardFaDdtScheme&) = delete;
public:
@ -85,6 +79,15 @@ public:
TypeName("backward");
// Generated Methods
//- No copy construct
backwardFaDdtScheme(const backwardFaDdtScheme&) = delete;
//- No copy assignment
void operator=(const backwardFaDdtScheme&) = delete;
// Constructors
//- Construct from mesh

14
src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H
View File

@ -83,6 +83,14 @@ class boundedBackwardFaDdtScheme
}
public:
//- Runtime type information
TypeName("boundedBackward");
// Generated Methods
//- No copy construct
boundedBackwardFaDdtScheme(const boundedBackwardFaDdtScheme&) = delete;
@ -90,12 +98,6 @@ class boundedBackwardFaDdtScheme
void operator=(const boundedBackwardFaDdtScheme&) = delete;
public:
//- Runtime type information
TypeName("boundedBackward");
// Constructors
//- Construct from mesh

28
src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H
View File

@ -49,6 +49,7 @@ SourceFiles
namespace Foam
{
// Forward Declarations
template<class Type>
class faMatrix;
@ -68,23 +69,14 @@ class faDdtScheme
:
public refCount
{
protected:
// Protected data
// Protected Data
//- Reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy construct
faDdtScheme(const faDdtScheme&) = delete;
//- No copy assignment
void operator=(const faDdtScheme&) = delete;
public:
//- Runtime type information
@ -103,6 +95,15 @@ public:
);
// Generated Methods
//- No copy construct
faDdtScheme(const faDdtScheme&) = delete;
//- No copy assignment
void operator=(const faDdtScheme&) = delete;
// Constructors
//- Construct from mesh
@ -135,10 +136,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const
{
return mesh_;
}
const faMesh& mesh() const noexcept { return mesh_; }
virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facDdt
(

14
src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H
View File

@ -58,7 +58,13 @@ class steadyStateFaDdtScheme
:
public fa::faDdtScheme<Type>
{
// Private Member Functions
public:
//- Runtime type information
TypeName("steadyState");
// Generated Methods
//- No copy construct
steadyStateFaDdtScheme(const steadyStateFaDdtScheme&) = delete;
@ -67,12 +73,6 @@ class steadyStateFaDdtScheme
void operator=(const steadyStateFaDdtScheme&) = delete;
public:
//- Runtime type information
TypeName("steadyState");
// Constructors
//- Construct from mesh

25
src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H
View File

@ -72,20 +72,13 @@ protected:
// Protected Data
//- Reference to mesh
const faMesh& mesh_;
//- Edge interpolation scheme
tmp<edgeInterpolationScheme<Type>> tinterpScheme_;
// Private Member Functions
//- No copy construct
divScheme(const divScheme&) = delete;
//- No copy assignment
void operator=(const divScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -100,6 +93,15 @@ public:
);
// Generated Methods
//- No copy construct
divScheme(const divScheme&) = delete;
//- No copy assignment
void operator=(const divScheme&) = delete;
// Constructors
//- Construct from mesh
@ -148,10 +150,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const
{
return mesh_;
}
const faMesh& mesh() const noexcept { return mesh_; }
virtual tmp
<

14
src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H
View File

@ -59,7 +59,13 @@ class gaussDivScheme
:
public fa::divScheme<Type>
{
// Private Member Functions
public:
//- Runtime type information
TypeName("Gauss");
// Generated Methods
//- No copy construct
gaussDivScheme(const gaussDivScheme&) = delete;
@ -68,12 +74,6 @@ class gaussDivScheme
void operator=(const gaussDivScheme&) = delete;
public:
//- Runtime type information
TypeName("Gauss");
// Constructors
//- Construct from mesh

10
src/finiteArea/finiteArea/faSchemes/faSchemes.H
View File

@ -61,11 +61,13 @@ class faSchemes
{
public:
//- No copy construct
faSchemes(const faSchemes&) = delete;
// Generated Methods
//- No copy assignment
void operator=(const faSchemes&) = delete;
//- No copy construct
faSchemes(const faSchemes&) = delete;
//- No copy assignment
void operator=(const faSchemes&) = delete;
// Constructors

1
src/finiteArea/finiteArea/fac/facAverage.H
View File

@ -34,7 +34,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facAverage_H
#define facAverage_H

1
src/finiteArea/finiteArea/fac/facDdt.H
View File

@ -37,7 +37,6 @@ Author
\*---------------------------------------------------------------------------*/
#ifndef facDdt_H
#define facDdt_H

1
src/finiteArea/finiteArea/fac/facDiv.H
View File

@ -34,7 +34,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facDiv_H
#define facDiv_H

1
src/finiteArea/finiteArea/fac/facEdgeIntegrate.H
View File

@ -35,7 +35,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facEdgeIntegrate_H
#define facEdgeIntegrate_H

1
src/finiteArea/finiteArea/fac/facGrad.H
View File

@ -34,7 +34,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facGrad_H
#define facGrad_H

1
src/finiteArea/finiteArea/fac/facLaplacian.H
View File

@ -34,7 +34,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facLaplacian_H
#define facLaplacian_H

1
src/finiteArea/finiteArea/fac/facLnGrad.H
View File

@ -34,7 +34,6 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef facLnGrad_H
#define facLnGrad_H

24
src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
View File

@ -50,6 +50,7 @@ SourceFiles
namespace Foam
{
// Forward Declarations
class faMesh;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -66,20 +67,12 @@ class gradScheme
:
public refCount
{
// Private data
// Private Data
//- Reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy construct
gradScheme(const gradScheme&) = delete;
//- No copy assignment
void operator=(const gradScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -94,6 +87,15 @@ public:
);
// Generated Methods
//- No copy construct
gradScheme(const gradScheme&) = delete;
//- No copy assignment
void operator=(const gradScheme&) = delete;
// Constructors
//- Construct from mesh
@ -120,7 +122,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const { return mesh_; }
const faMesh& mesh() const noexcept { return mesh_; }
//- Calculate and return the grad of the given field.
// Used by grad either to recalculate the cached gradient when it is

14
src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
View File

@ -69,7 +69,13 @@ class gaussGrad
tmp<edgeInterpolationScheme<Type>> tinterpScheme_;
// Private Member Functions
public:
//- Runtime type information
TypeName("Gauss");
// Generated Methods
//- No copy construct
gaussGrad(const gaussGrad&) = delete;
@ -78,12 +84,6 @@ class gaussGrad
void operator=(const gaussGrad&) = delete;
public:
//- Runtime type information
TypeName("Gauss");
// Constructors
//- Construct from mesh

14
src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
View File

@ -62,7 +62,13 @@ class leastSquaresFaGrad
:
public fa::gradScheme<Type>
{
// Private Member Functions
public:
//- Runtime type information
TypeName("leastSquares");
// Generated Methods
//- No copy construct
leastSquaresFaGrad(const leastSquaresFaGrad&) = delete;
@ -71,12 +77,6 @@ class leastSquaresFaGrad
void operator=(const leastSquaresFaGrad&) = delete;
public:
//- Runtime type information
TypeName("leastSquares");
// Constructors
//- Construct from mesh

4
src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H
View File

@ -58,14 +58,14 @@ class leastSquaresFaVectors
:
public MeshObject<faMesh, Foam::MoveableMeshObject, leastSquaresFaVectors>
{
// Private data
// Private Data
//- Least-squares gradient vectors
mutable edgeVectorField* pVectorsPtr_;
mutable edgeVectorField* nVectorsPtr_;
// Private member functions
// Private Member Functions
//- Construct Least-squares gradient vectors
void makeLeastSquaresVectors() const;

15
src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
View File

@ -66,6 +66,7 @@ class edgeLimitedGrad
{
// Private Data
//- Basic gradient scheme
tmp<fa::gradScheme<Type>> basicGradScheme_;
//- Limiter coefficient
@ -83,6 +84,14 @@ class edgeLimitedGrad
) const;
public:
//- RunTime type information
TypeName("edgeLimited");
// Generated Methods
//- No copy construct
edgeLimitedGrad(const edgeLimitedGrad&) = delete;
@ -90,12 +99,6 @@ class edgeLimitedGrad
void operator=(const edgeLimitedGrad&) = delete;
public:
//- RunTime type information
TypeName("edgeLimited");
// Constructors
//- Construct from mesh and schemeData

15
src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
View File

@ -69,13 +69,20 @@ class faceLimitedGrad
{
// Private Data
//- Basic gradient scheme
tmp<fa::gradScheme<Type>> basicGradScheme_;
//- Limiter coefficient
scalar k_;
// Private Member Functions
public:
//- RunTime type information
TypeName("faceLimited");
// Generated Methods
//- No copy construct
faceLimitedGrad(const faceLimitedGrad&) = delete;
@ -84,12 +91,6 @@ class faceLimitedGrad
void operator=(const faceLimitedGrad&) = delete;
public:
//- RunTime type information
TypeName("faceLimited");
// Constructors
//- Construct from mesh and schemeData

18
src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H
View File

@ -79,15 +79,6 @@ protected:
tmp<lnGradScheme<Type>> tlnGradScheme_;
// Private Member Functions
//- No copy construct
laplacianScheme(const laplacianScheme&) = delete;
//- No copy assignment
void operator=(const laplacianScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -102,6 +93,15 @@ public:
);
// Generated Methods
//- No copy construct
laplacianScheme(const laplacianScheme&) = delete;
//- No copy assignment
void operator=(const laplacianScheme&) = delete;
// Constructors
//- Construct from mesh

14
src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H
View File

@ -59,7 +59,13 @@ class gaussLaplacianScheme
:
public fa::laplacianScheme<Type>
{
// Private Member Functions
public:
//- Runtime type information
TypeName("Gauss");
// Generated Methods
//- No copy construct
gaussLaplacianScheme(const gaussLaplacianScheme&) = delete;
@ -68,12 +74,6 @@ class gaussLaplacianScheme
void operator=(const gaussLaplacianScheme&) = delete;
public:
//- Runtime type information
TypeName("Gauss");
// Constructors
//- Construct from mesh

15
src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H
View File

@ -58,18 +58,21 @@ class correctedLnGrad
:
public lnGradScheme<Type>
{
// Private Member Functions
//- No copy assignment
void operator=(const correctedLnGrad&) = delete;
public:
//- Runtime type information
TypeName("corrected");
// Generated Methods
//- No copy construct
correctedLnGrad(const correctedLnGrad&) = delete;
//- No copy assignment
void operator=(const correctedLnGrad&) = delete;
// Constructors
//- Construct from mesh

20
src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H
View File

@ -58,18 +58,21 @@ class fourthLnGrad
:
public lnGradScheme<Type>
{
// Private Member Functions
//- No copy assignment
void operator=(const fourthLnGrad&) = delete;
public:
//- Runtime type information
TypeName("fourth");
// Generated Methods
//- No copy construct
fourthLnGrad(const fourthLnGrad&) = delete;
//- No copy assignment
void operator=(const fourthLnGrad&) = delete;
// Constructors
//- Construct from mesh
@ -102,10 +105,7 @@ public:
}
//- Return true if this scheme uses an explicit correction
virtual bool corrected() const
{
return true;
}
virtual bool corrected() const { return true; }
//- Return the explicit correction to the fourthLnGrad
// for the given field

2
src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C
View File

@ -72,7 +72,7 @@ limitedLnGrad<Type>::correction
(1 - limitCoeff_)*mag(corr)
+ dimensionedScalar("small", corr.dimensions(), SMALL)
),
dimensionedScalar("one", dimless, 1.0)
dimensionedScalar(dimless, Foam::one{})
)
);

17
src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H
View File

@ -68,24 +68,27 @@ class limitedLnGrad
:
public lnGradScheme<Type>
{
// Private data
// Private Data
//- Limiter. 0 = no limiting, 1 = full limiting
scalar limitCoeff_;
// Private Member Functions
//- No copy assignment
void operator=(const limitedLnGrad&) = delete;
public:
//- Runtime type information
TypeName("limited");
// Generated Methods
//- No copy construct
limitedLnGrad(const limitedLnGrad&) = delete;
//- No copy assignment
void operator=(const limitedLnGrad&) = delete;
// Constructors
//- Construct from mesh

28
src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
View File

@ -48,6 +48,7 @@ SourceFiles
namespace Foam
{
// Forward Declarations
class faMesh;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -64,18 +65,12 @@ class lnGradScheme
:
public refCount
{
// Private data
// Private Data
//- Hold reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy assignment
void operator=(const lnGradScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -90,6 +85,15 @@ public:
);
// Generated Methods
//- No copy construct
lnGradScheme(const lnGradScheme&) = delete;
//- No copy assignment
void operator=(const lnGradScheme&) = delete;
// Constructors
//- Construct from mesh
@ -116,10 +120,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const
{
return mesh_;
}
const faMesh& mesh() const noexcept { return mesh_; }
//- Return the lnGrad of the given cell field
// with the given weighting factors
@ -138,10 +139,7 @@ public:
) const = 0;
//- Return true if this scheme uses an explicit correction
virtual bool corrected() const
{
return false;
}
virtual bool corrected() const { return false; }
//- Return the explicit correction to the lnGrad
// for the given field

20
src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H
View File

@ -58,18 +58,21 @@ class uncorrectedLnGrad
:
public lnGradScheme<Type>
{
// Private Member Functions
//- No copy assignment
void operator=(const uncorrectedLnGrad&) = delete;
public:
//- Runtime type information
TypeName("uncorrected");
// Generated Methods
//- No copy construct
uncorrectedLnGrad(const uncorrectedLnGrad&) = delete;
//- No copy assignment
void operator=(const uncorrectedLnGrad&) = delete;
// Constructors
//- Construct from mesh
@ -101,10 +104,7 @@ public:
}
//- Return true if this scheme uses an explicit correction
virtual bool corrected() const
{
return false;
}
virtual bool corrected() const { return false; }
//- Return the explicit correction to the uncorrectedLnGrad
//- for the given field

20
src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C
View File

@ -100,14 +100,14 @@ Foam::fac::interpolate
Istream& schemeData
)
{
# ifdef DEBUGInterpolations
#ifdef DEBUGInterpolations
if (edgeInterpolation::debug)
{
InfoInFunction
<< "interpolating GeometricField<Type, faPatchField, areaMesh> "
<< endl;
}
# endif
#endif
return scheme<Type>(faceFlux, schemeData)().interpolate(vf);
}
@ -122,7 +122,7 @@ Foam::fac::interpolate
const word& name
)
{
# ifdef DEBUGInterpolations
#ifdef DEBUGInterpolations
if (edgeInterpolation::debug)
{
InfoInFunction
@ -130,7 +130,7 @@ Foam::fac::interpolate
<< "using " << name
<< endl;
}
# endif
#endif
return scheme<Type>(faceFlux, name)().interpolate(vf);
}
@ -199,14 +199,14 @@ Foam::fac::interpolate
Istream& schemeData
)
{
# ifdef DEBUGInterpolations
#ifdef DEBUGInterpolations
if (edgeInterpolation::debug)
{
InfoInFunction
<< "interpolating GeometricField<Type, faPatchField, areaMesh> "
<< endl;
}
# endif
#endif
return scheme<Type>(vf.mesh(), schemeData)().interpolate(vf);
}
@ -220,7 +220,7 @@ Foam::fac::interpolate
const word& name
)
{
# ifdef DEBUGInterpolations
#ifdef DEBUGInterpolations
if (edgeInterpolation::debug)
{
InfoInFunction
@ -228,7 +228,7 @@ Foam::fac::interpolate
<< "using " << name
<< endl;
}
# endif
#endif
return scheme<Type>(vf.mesh(), name)().interpolate(vf);
}
@ -257,7 +257,7 @@ Foam::fac::interpolate
const GeometricField<Type, faPatchField, areaMesh>& vf
)
{
# ifdef DEBUGInterpolations
#ifdef DEBUGInterpolations
if (edgeInterpolation::debug)
{
InfoInFunction
@ -265,7 +265,7 @@ Foam::fac::interpolate
<< "using run-time selected scheme"
<< endl;
}
# endif
#endif
return interpolate(vf, "interpolate(" + vf.name() + ')');
}

14
src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H
View File

@ -129,6 +129,15 @@ public:
ClassName("edgeInterpolation");
// Generated Methods
//- No copy construct
edgeInterpolation(const edgeInterpolation&) = delete;
//- No copy assignment
void operator=(const edgeInterpolation&) = delete;
// Constructors
//- Construct given an faMesh
@ -142,10 +151,7 @@ public:
// Member Functions
//- Return mesh reference
const faMesh& mesh() const noexcept
{
return faMesh_;
}
const faMesh& mesh() const noexcept { return faMesh_; }
//- Return reference to PN geodesic distance
const edgeScalarField& lPN() const;

24
src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
View File

@ -59,18 +59,12 @@ class edgeInterpolationScheme
:
public refCount
{
// Private data
// Private Data
//- Hold reference to mesh
//- Reference to mesh
const faMesh& mesh_;
// Private Member Functions
//- No copy assignment
void operator=(const edgeInterpolationScheme&) = delete;
public:
// Declare run-time constructor selection tables
@ -101,6 +95,15 @@ public:
);
// Private Member Functions
//- No copy construct
edgeInterpolationScheme(const edgeInterpolationScheme&) = delete;
//- No copy assignment
void operator=(const edgeInterpolationScheme&) = delete;
// Constructors
//- Construct from mesh
@ -179,10 +182,7 @@ public:
) const = 0;
//- Return true if this scheme uses an explicit correction
virtual bool corrected() const
{
return false;
}
virtual bool corrected() const { return false; }
//- Return the explicit correction to the face-interpolate
// for the given field

6
src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
View File

@ -54,7 +54,11 @@ namespace Foam
class GammaWeight
{
scalar k_;
// Private Data
//- Model coefficient [0,1]
scalar k_;
public:

17
src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H
View File

@ -72,14 +72,6 @@ protected:
const edgeScalarField& edgeFlux_;
// Protected Member Functions
//- No copy construct
faNVDscheme(const faNVDscheme&) = delete;
//- No copy assignment
void operator=(const faNVDscheme&) = delete;
public:
@ -91,6 +83,15 @@ public:
TypeName("faNVDscheme");
// Generated Methods
//- No copy construct
faNVDscheme(const faNVDscheme&) = delete;
//- No copy assignment
void operator=(const faNVDscheme&) = delete;
// Constructors
//- Construct from mesh and edgeFlux and blendingFactor

21
src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H
View File

@ -56,26 +56,27 @@ class blendedEdgeInterpolation
public linearEdgeInterpolation<Type>,
public upwindEdgeInterpolation<Type>
{
// Private data
// Private Data
//- Blending factor
const scalar blendingFactor_;
// Private Member Functions
//- No copy construct
blendedEdgeInterpolation(const blendedEdgeInterpolation&) = delete;
//- No copy assignment
void operator=(const blendedEdgeInterpolation&) = delete;
public:
//- Runtime type information
TypeName("blended");
// Generated Methods
//- No copy construct
blendedEdgeInterpolation(const blendedEdgeInterpolation&) = delete;
//- No copy assignment
void operator=(const blendedEdgeInterpolation&) = delete;
// Constructors
//- Construct from mesh, faceFlux and blendingFactor

16
src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H
View File

@ -67,18 +67,22 @@ class leastSquaresEdgeInterpolation
:
virtual public edgeInterpolationScheme<Type>
{
// Private Member Functions
//- No copy assignment
void operator=(const leastSquaresEdgeInterpolation&) = delete;
public:
//- Runtime type information
TypeName("leastSquares");
// Generated Methods
//- No copy construct
leastSquaresEdgeInterpolation(const leastSquaresEdgeInterpolation&)
= delete;
//- No copy assignment
void operator=(const leastSquaresEdgeInterpolation&) = delete;
// Constructors
//- Construct from mesh

14
src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H
View File

@ -54,17 +54,21 @@ class linearEdgeInterpolation
:
virtual public edgeInterpolationScheme<Type>
{
// Private Member Functions
//- No copy assignment
void operator=(const linearEdgeInterpolation&) = delete;
public:
//- Runtime type information
TypeName("linear");
// Generated Methods
//- No copy construct
linearEdgeInterpolation(const linearEdgeInterpolation&) = delete;
//- No copy assignment
void operator=(const linearEdgeInterpolation&) = delete;
// Constructors
//- Construct from mesh

10
src/finiteArea/interpolation/edgeInterpolation/schemes/linearUpwind/linearUpwind.H
View File

@ -58,9 +58,17 @@ namespace Foam
class linearUpwindWeight
{
public:
// Generated Methods
//- No copy construct
linearUpwindWeight(const linearUpwindWeight&) = delete;
//- No copy assignment
void operator=(const linearUpwindWeight&) = delete;
linearUpwindWeight(Istream&)
{}

20
src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H
View File

@ -60,6 +60,7 @@ class skewCorrectedEdgeInterpolation
{
// Private Data
//- Edge-interpolation scheme
tmp<edgeInterpolationScheme<Type>> tScheme_;
@ -69,6 +70,16 @@ public:
TypeName("skewCorrected");
// Generated Methods
//- No copy construct
skewCorrectedEdgeInterpolation(const skewCorrectedEdgeInterpolation&)
= delete;
//- No copy assignment
void operator=(const skewCorrectedEdgeInterpolation&) = delete;
// Constructors
//- Construct from Istream
@ -96,13 +107,6 @@ public:
)
{}
//- No copy construct
skewCorrectedEdgeInterpolation(const skewCorrectedEdgeInterpolation&) =
delete;
//- No copy assignment
void operator=(const skewCorrectedEdgeInterpolation&) = delete;
// Member Functions
@ -115,7 +119,7 @@ public:
return tScheme_().weights(vf);
}
//- Return true if this scheme uses an explicit correction
//- Return true if this scheme uses an explicit correction
virtual bool corrected() const
{
return

18
src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H
View File

@ -55,23 +55,27 @@ class upwindEdgeInterpolation
:
virtual public edgeInterpolationScheme<Type>
{
// Private data
// Private Data
//- Face flux
const edgeScalarField& faceFlux_;
// Private Member Functions
//- No copy assignment
void operator=(const upwindEdgeInterpolation&) = delete;
public:
//- Runtime type information
TypeName("upwind");
// Generated Methods
//- No copy construct
upwindEdgeInterpolation(const upwindEdgeInterpolation&) = delete;
//- No copy assignment
void operator=(const upwindEdgeInterpolation&) = delete;
// Constructors
//- Construct from faceFlux

7
src/finiteArea/output/ensight/ensightFaMesh.H
View File

@ -85,6 +85,11 @@ class ensightFaMesh
//- Enforce consistent index/part numbering
void renumber();
public:
// Generated Methods
//- No copy construct
ensightFaMesh(const ensightFaMesh&) = delete;
@ -92,8 +97,6 @@ class ensightFaMesh
void operator=(const ensightFaMesh&) = delete;
public:
// Constructors
//- Construct from mesh with all default options