COMP: Multiple changes - first clean build after latest merge - UNTESTED

This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions

View File

@ -78,10 +78,10 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
fvMeshFunctionObject(const fvMeshFunctionObject&);
fvMeshFunctionObject(const fvMeshFunctionObject&) = delete;
//- Disallow default bitwise assignment
void operator=(const fvMeshFunctionObject&);
void operator=(const fvMeshFunctionObject&) = delete;
public:

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -58,7 +58,7 @@ void Foam::functionObjects::volRegion::writeFileHeader
(
const writeFile& wf,
Ostream& file
)
) const
{
wf.writeCommented(file, "Region");
file<< setw(1) << ':' << setw(1) << ' '

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -85,7 +85,7 @@ namespace functionObjects
{
/*---------------------------------------------------------------------------*\
Class volRegion Declaration
Class volRegion Declaration
\*---------------------------------------------------------------------------*/
class volRegion
@ -106,8 +106,8 @@ public:
//- Region type enumeration
enum regionTypes
{
vrtCellZone,
vrtAll
vrtCellZone, //< cell zone
vrtAll //< all cells
};
//- Region type names
@ -131,7 +131,7 @@ protected:
// Protected Member Functions
//- Output file header information
void writeFileHeader(const writeFile& wf, Ostream& file);
void writeFileHeader(const writeFile& wf, Ostream& file) const;
public:
@ -143,11 +143,7 @@ public:
// Constructors
//- Construct from fvMesh and dictionary
volRegion
(
const fvMesh& mesh,
const dictionary& dict
);
volRegion(const fvMesh& mesh, const dictionary& dict);
//- Destructor