diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
index 4b3d91b838369a7560bbb4d3df8258fa864b83e5..aa64c4e1094b5db31a72fd6184c151ffc2114af5 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- adjointOutletPressureFvPatchScalarField
+ Foam::adjointOutletPressureFvPatchScalarField
Description
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
index ad0a5179a3d47d31ce58296754909ce7ea1676b8..4778176581aefa856f94bd7be1c6144f93a8fbe4 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- adjointOutletVelocityFvPatchVectorField
+ Foam::adjointOutletVelocityFvPatchVectorField
Description
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
index 766e06215ef0a2dc185b05158094d177d59418e0..58341e6cad0dca6f1136e8bd258e8a0a3f60b75a 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- incompressibleThreePhaseMixture
+ Foam::incompressibleThreePhaseMixture
Description
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
index 266bedb470aa06535777385293900bd8c6e16ed0..51a28ad80d7fc53806d0e6e2412c35b25ad942c2 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- threePhaseInterfaceProperties
+ Foam::threePhaseInterfaceProperties
Description
Properties to aid interFoam :
diff --git a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
index 282e507058fad55f4e7db92b5e52e9f72137751f..801b0a86391af93dbf6b7da125cc19f02d0bb742 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::calcPointCells() const
+void Foam::sammMesh::calcPointCells() const
{
static const label UNIT_POINT_CELLS = 12;
@@ -125,7 +125,7 @@ void sammMesh::calcPointCells() const
}
-const labelListList& sammMesh::pointCells() const
+const Foam::labelListList& Foam::sammMesh::pointCells() const
{
if (!pointCellsPtr_)
{
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
index 7511a8d2cafc866aebca42eccfc1aa4ba3bc816a..a6ec4baf16d4f11771ddf04468c12f5b2743af09 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,9 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Specialist version of face comparison to deal with
-// PROSTAR boundary format idiosyncracies
-bool sammMesh::sammEqualFace
+bool Foam::sammMesh::sammEqualFace
(
const face& boundaryFace,
const face& cellFace
@@ -70,7 +68,7 @@ bool sammMesh::sammEqualFace
}
-void sammMesh::createBoundaryFaces()
+void Foam::sammMesh::createBoundaryFaces()
{
forAll(boundary_, patchI)
{
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
index 25f09764a9e07d27075b32b403620dd79a982764..1442909f3d7292ca780215a1c928bef7079f5571 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::createPolyBoundary()
+void Foam::sammMesh::createPolyBoundary()
{
label nBoundaryFacesFound = 0;
@@ -115,7 +115,10 @@ void sammMesh::createPolyBoundary()
}
-List<polyPatch* > sammMesh::polyBoundaryPatches(const polyMesh& pMesh)
+Foam::List<Foam::polyPatch* > Foam::sammMesh::polyBoundaryPatches
+(
+ const polyMesh& pMesh
+)
{
List<polyPatch* > p(boundary_.size());
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
index 90cf54162a2f01fb8ea5edf2f1355652805faa3a..ed1ecc23172e2b1c87bfb7f9576aa2303749a10c 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::createPolyCells()
+void Foam::sammMesh::createPolyCells()
{
// loop through all cell faces and create connectivity. This will produce
// a global face list and will describe all cells as lists of face labels
diff --git a/applications/utilities/mesh/conversion/sammToFoam/fillSammAddressingTable.C b/applications/utilities/mesh/conversion/sammToFoam/fillSammAddressingTable.C
index b2cdef938724e4082f8e844635dfcea9f4a52904..529d996d69d49a8e191c8613c377582fc8812720 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/fillSammAddressingTable.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/fillSammAddressingTable.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,15 +23,11 @@ License
\*---------------------------------------------------------------------------*/
-#include "error.H"
#include "sammMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void sammMesh::fillSammAddressingTable()
+void Foam::sammMesh::fillSammAddressingTable()
{
// SAMM trim type 1: 8 models
static label SammTrim1Rot0[10] = {1, 5, 6, 2, 8, 10, 4, 7, 3, 9};
diff --git a/applications/utilities/mesh/conversion/sammToFoam/fillSammCellShapeTable.C b/applications/utilities/mesh/conversion/sammToFoam/fillSammCellShapeTable.C
index 1784e2b275e0549d0cf35d2a4264ab68f573fc48..551d9aa745904e28817ac2744aa7a54635737804 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/fillSammCellShapeTable.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/fillSammCellShapeTable.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,16 +26,11 @@ Description
\*---------------------------------------------------------------------------*/
-#include "error.H"
-
#include "sammMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void sammMesh::fillSammCellShapeTable()
+void Foam::sammMesh::fillSammCellShapeTable()
{
// Fill the list by hand
diff --git a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
index ea8dd7e63f2793deb0865cf79c450e4f703cd733..307c74e57713d9abb785571564b1dfe2ce1647c6 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::fixCollapsedEdges()
+void Foam::sammMesh::fixCollapsedEdges()
{
cellFaces_.setSize(cellShapes_.size());
diff --git a/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C b/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C
index c7694a54b2914b928dc0b99534300fbb5295d040..f1a83194691ab3a1a12c5d7931d2d453680a515b 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void sammMesh::purgeCellShapes()
+void Foam::sammMesh::purgeCellShapes()
{
forAll(cellFaces_, cellI)
{
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index dc058f81c80c803fec2a0c2cadbbbbbb00163da9..e81bbae2335d0bf6fcdef9e7b0af1425ff5c254f 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::readBoundary()
+void Foam::sammMesh::readBoundary()
{
label nPatches=0, nFaces=0;
labelList nPatchFaces(1000);
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCells.C b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
index 81385923b84fee4a25ac9c6e3fda48d7242464bb..ea65b78b208f0dc3c816c25c24743bead276cff5 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::addRegularCell
+void Foam::sammMesh::addRegularCell
(
const labelList& labels,
const label nCreatedCells
@@ -135,7 +135,7 @@ void sammMesh::addRegularCell
}
-void sammMesh::addSAMMcell
+void Foam::sammMesh::addSAMMcell
(
const label typeFlag,
const labelList& globalLabels,
@@ -171,7 +171,7 @@ void sammMesh::addSAMMcell
}
-void sammMesh::readCells()
+void Foam::sammMesh::readCells()
{
label nCells = 0;
label maxLabel = -1;
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
index b1bcec57a6220bb370d52f6ff4d551e9bbda6f9c..eee39a4d4dfe4c6b6f0c7ff46f979a914c4d87c4 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::readCouples()
+void Foam::sammMesh::readCouples()
{
fileName couplesFileName(casePrefix_ + ".cpl");
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
index 0680a855be25fd84bff762a20271f63b84cc7323..3ec7358e0679eb6435ab94c3ddd57438b8d38355 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,21 +31,33 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// Cell shape models
-const cellModel* sammMesh::unknownPtr_ = cellModeller::lookup("unknown");
-const cellModel* sammMesh::hexPtr_ = cellModeller::lookup("hex");
-const cellModel* sammMesh::wedgePtr_ = cellModeller::lookup("wedge");
-const cellModel* sammMesh::prismPtr_ = cellModeller::lookup("prism");
-const cellModel* sammMesh::pyrPtr_ = cellModeller::lookup("pyr");
-const cellModel* sammMesh::tetPtr_ = cellModeller::lookup("tet");
-const cellModel* sammMesh::tetWedgePtr_ = cellModeller::lookup("tetWedge");
-
-const cellModel* sammMesh::sammTrim1Ptr_ = cellModeller::lookup("sammTrim1");
-const cellModel* sammMesh::sammTrim2Ptr_ = cellModeller::lookup("sammTrim2");
-const cellModel* sammMesh::sammTrim3Ptr_ = cellModeller::lookup("sammTrim3");
-const cellModel* sammMesh::sammTrim4Ptr_ = cellModeller::lookup("sammTrim4");
-const cellModel* sammMesh::sammTrim5Ptr_ = cellModeller::lookup("sammTrim5");
-const cellModel* sammMesh::sammTrim8Ptr_ =
- cellModeller::lookup("hexagonalPrism");
+const Foam::cellModel* Foam::sammMesh::unknownPtr_ =
+ Foam::cellModeller::lookup("unknown");
+const Foam::cellModel* Foam::sammMesh::hexPtr_ =
+ Foam::cellModeller::lookup("hex");
+const Foam::cellModel* Foam::sammMesh::wedgePtr_ =
+ Foam::cellModeller::lookup("wedge");
+const Foam::cellModel* Foam::sammMesh::prismPtr_ =
+ Foam::cellModeller::lookup("prism");
+const Foam::cellModel* Foam::sammMesh::pyrPtr_ =
+ Foam::cellModeller::lookup("pyr");
+const Foam::cellModel* Foam::sammMesh::tetPtr_ =
+ Foam::cellModeller::lookup("tet");
+const Foam::cellModel* Foam::sammMesh::tetWedgePtr_ =
+ Foam::cellModeller::lookup("tetWedge");
+
+const Foam::cellModel* Foam::sammMesh::sammTrim1Ptr_ =
+ Foam::cellModeller::lookup("sammTrim1");
+const Foam::cellModel* Foam::sammMesh::sammTrim2Ptr_ =
+ Foam::cellModeller::lookup("sammTrim2");
+const Foam::cellModel* Foam::sammMesh::sammTrim3Ptr_ =
+ Foam::cellModeller::lookup("sammTrim3");
+const Foam::cellModel* Foam::sammMesh::sammTrim4Ptr_ =
+ Foam::cellModeller::lookup("sammTrim4");
+const Foam::cellModel* Foam::sammMesh::sammTrim5Ptr_ =
+ Foam::cellModeller::lookup("sammTrim5");
+const Foam::cellModel* Foam::sammMesh::sammTrim8Ptr_ =
+ Foam::cellModeller::lookup("hexagonalPrism");
// lookup table giving OpenFOAM face number when looked up with shape index
// (first index) and STAR face number
@@ -59,7 +71,7 @@ const cellModel* sammMesh::sammTrim8Ptr_ =
// However, at the moment I haven't got enough info to complete the toble and
// there are no cases that break it. Please reconsider in the light of mode
// information.
-const label sammMesh::shapeFaceLookup[19][9] =
+const Foam::label Foam::sammMesh::shapeFaceLookup[19][9] =
{
{-1, -1, -1, -1, -1, -1, -1, -1, -1}, // shape 0 - empty+
{-1, -1, -1, -1, -1, -1, -1, -1, -1}, // shape 1 - empty+
@@ -87,22 +99,22 @@ const label sammMesh::shapeFaceLookup[19][9] =
// List of pointers used instead of pointer list o avoid
// de-allocation problems
-List<const cellModel*> sammMesh::sammShapeLookup
+Foam::List<const Foam::cellModel*> Foam::sammMesh::sammShapeLookup
(
256,
reinterpret_cast<cellModel*>(0)
);
-List<const label*> sammMesh::sammAddressingTable
+Foam::List<const Foam::label*> Foam::sammMesh::sammAddressingTable
(
256,
reinterpret_cast<label*>(0)
);
+
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Make polyhedral mesh data (packing)
-void sammMesh::createPolyMeshData()
+void Foam::sammMesh::createPolyMeshData()
{
Info<< "Creating a polyMesh" << endl;
@@ -146,10 +158,10 @@ void sammMesh::createPolyMeshData()
}
}
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-sammMesh::sammMesh
+Foam::sammMesh::sammMesh
(
const fileName& prefix,
const Time& rt,
@@ -199,13 +211,10 @@ sammMesh::sammMesh
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-sammMesh::~sammMesh()
+Foam::sammMesh::~sammMesh()
{
deleteDemandDrivenData(pointCellsPtr_);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
index 8c7c018c0a86f0aa63b64e1bc05d75030c859773..a00ff8d7e995d559f3d7ddd95710b648232617ee 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,14 +42,10 @@ SourceFiles
#include "cellList.H"
#include "polyPatchList.H"
-#ifndef namespaceFoam
-#define namespaceFoam
- using namespace Foam;
-#endif
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Forward declaration of classes
+namespace Foam
+{
/*---------------------------------------------------------------------------*\
Class sammMesh Declaration
@@ -224,9 +220,6 @@ class sammMesh
public:
- // Static data members
-
-
// Constructors
//- Construct from case name
@@ -246,17 +239,12 @@ public:
//- Write mesh
void writeMesh();
+};
- // Member Operators
-
- // Friend Functions
-
- // Friend Operators
- // IOstream Operators
- // Ostream Operator
-};
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index 55745b958ce7859eca1db2be4db6c825514b5c19..5bceed621fc2452cb53c4fc672395df3d8c01436 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,6 +33,8 @@ Description
#include "Time.H"
#include "sammMesh.H"
+using namespace Foam;
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
@@ -55,7 +57,7 @@ int main(int argc, char *argv[])
const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
-# include "createTime.H"
+ #include "createTime.H"
sammMesh makeMesh(args[1], runTime, scaleFactor);
diff --git a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
index f570552ce99abb1ae326e5cba5f4f9a806533d04..0afee5e84ace41946270153a993886da71dbd847 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void sammMesh::writeMesh()
+void Foam::sammMesh::writeMesh()
{
if (isShapeMesh_)
{
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
index 2f0056d015319ae6b40ed801a41b3dd5e2175b8d..668a452425fee7656602b129f94640165eadf34c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::calcPointCells() const
+void Foam::starMesh::calcPointCells() const
{
static const label UNIT_POINT_CELLS = 12;
@@ -125,7 +125,7 @@ void starMesh::calcPointCells() const
}
-const labelListList& starMesh::pointCells() const
+const Foam::labelListList& Foam::starMesh::pointCells() const
{
if (!pointCellsPtr_)
{
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C
index e9b90ac80b35b727d6cfcf0784b494ecc50d4d48..73490bd38d4e1cc451b6205e1102df4dae5106f5 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,17 +28,11 @@ Description
\*---------------------------------------------------------------------------*/
#include "coupledFacePair.H"
-#include "error.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-coupledFacePair::coupledFacePair
+Foam::coupledFacePair::coupledFacePair
(
const label coupleNo,
const label mC, const label mF,
@@ -55,12 +49,9 @@ coupledFacePair::coupledFacePair
{}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-Ostream& operator<<(Ostream& os, const coupledFacePair& c)
+Foam::Ostream& Foam::operator<<(Ostream& os, const coupledFacePair& c)
{
os << "Master cell: " << c.masterCellID_
<< " face: " << c.masterFaceID_ << endl
@@ -72,8 +63,4 @@ Ostream& operator<<(Ostream& os, const coupledFacePair& c)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
index fc1ed0dbd041c76606bd6fd5238bf600fa44095e..61dd9f7a0fb72ffbf816c50f7c9cb8ccd4673034 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
// Specialist version of face comparison to deal with
// PROSTAR boundary format idiosyncracies
-bool starMesh::starEqualFace
+bool Foam::starMesh::starEqualFace
(
const face& boundaryFace,
const face& cellFace
@@ -91,7 +91,7 @@ bool starMesh::starEqualFace
}
-void starMesh::markBoundaryFaces()
+void Foam::starMesh::markBoundaryFaces()
{
// set size of mark lists for the boundary
boundaryCellIDs_.setSize(boundary_.size());
@@ -175,7 +175,7 @@ void starMesh::markBoundaryFaces()
}
-void starMesh::collectBoundaryFaces()
+void Foam::starMesh::collectBoundaryFaces()
{
Info<< "Collecting boundary faces" << endl;
forAll(boundary_, patchI)
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 139aa65f9b3f69129bb1e52239da04454b70d4b5..6ded0c8426079cb6fb7a996e50c03ab7b042223c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::createCoupleMatches()
+void Foam::starMesh::createCoupleMatches()
{
// Loop through all couples and create intersection faces. Add all points
// of intersection faces to the couple points lists. The numbering of
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
index ae73ef28b483dfe676b34a5454aa653f5d558408..25b7bd9e4e5101954a2a06be84b5d516e01b6ca8 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::createPolyBoundary()
+void Foam::starMesh::createPolyBoundary()
{
label nBoundaryFacesFound = 0;
@@ -294,7 +294,8 @@ void starMesh::createPolyBoundary()
}
-List<polyPatch*> starMesh::polyBoundaryPatches(const polyMesh& pMesh)
+Foam::List<Foam::polyPatch*>
+Foam::starMesh::polyBoundaryPatches(const polyMesh& pMesh)
{
List<polyPatch*> p(boundary_.size());
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
index 5aba4dbe77d353accde41bf6ce34b323946bfac2..c74fcccd91327b0b009a45e7eac7115bb7e98a1a 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::createPolyCells()
+void Foam::starMesh::createPolyCells()
{
// loop through all cell faces and create connectivity. This will produce
// a global face list and will describe all cells as lists of face labels
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
index 4f067a429371a80c0b12f1f1ee22c2bd3eb4e2f8..422866f44c138deb8d427bc66425cf47f8a345ea 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::fixCollapsedEdges()
+void Foam::starMesh::fixCollapsedEdges()
{
cellFaces_.setSize(cellShapes_.size());
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
index 2efd1c4c0c8a9e4a9ffa9eb52ef8f3822b6ac9fb..2e7a3cfa9c63f3faa0595fd982227207d269a4f6 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void starMesh::mergeCoupleFacePoints()
+void Foam::starMesh::mergeCoupleFacePoints()
{
// mark all used points by looping through all faces in two goes.
// First, go into every cell and find min edge length. Use a
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C b/applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C
index 0f4b26669e026cf944b499e2273b955268bd012c..dbaf5b9f51a48661f1f254cf38583473637cc3f8 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void starMesh::purgeCellShapes()
+void Foam::starMesh::purgeCellShapes()
{
forAll(cellFaces_, cellI)
{
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
index 0b4fd11ddbc9043136de296d02fcb817a58ef180..63aa38e0282010da5b5681a0daf3f58a7d0e4d8b 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::readBoundary()
+void Foam::starMesh::readBoundary()
{
label nPatches=0, nFaces=0;
labelList nPatchFaces(1000);
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
index 9fba892ad1c0aa483b03f41a8c6a5f56c89de93d..b485a6115d59f566d80e851ea01366a200afaa4c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::addRegularCell
+void Foam::starMesh::addRegularCell
(
const labelList& labels,
const label nCreatedCells
@@ -116,7 +116,7 @@ void starMesh::addRegularCell
}
-void starMesh::addSAMMcell
+void Foam::starMesh::addSAMMcell
(
const labelList& labels,
const label nCreatedCells
@@ -205,7 +205,7 @@ void starMesh::addSAMMcell
}
-void starMesh::readCells()
+void Foam::starMesh::readCells()
{
label nCells = 0;
label maxLabel = -1;
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readCouples.C b/applications/utilities/mesh/conversion/star3ToFoam/readCouples.C
index 1c3815c85e57ee694cda14aafe67245bb89ff026..cca228ae167a5ac912215894ed664a886f0cdb57 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readCouples.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readCouples.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::readCouples()
+void Foam::starMesh::readCouples()
{
fileName couplesFileName(casePrefix_ + ".cpl");
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
index 1e9084b37324ef7ebbd08324fbbb7d19cd476abf..19138a30114ff800d84979e127cd02a2267db90d 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-label starMesh::readVtxLabel(IFstream& is)
+Foam::label Foam::starMesh::readVtxLabel(IFstream& is)
{
char lcs[16];
@@ -46,7 +46,7 @@ label starMesh::readVtxLabel(IFstream& is)
}
-scalar starMesh::readVtxCmpt(IFstream& is)
+Foam::scalar Foam::starMesh::readVtxCmpt(IFstream& is)
{
char lcs[17];
@@ -61,7 +61,7 @@ scalar starMesh::readVtxCmpt(IFstream& is)
}
-void starMesh::readToNl(IFstream& is)
+void Foam::starMesh::readToNl(IFstream& is)
{
char c;
do
@@ -71,7 +71,7 @@ void starMesh::readToNl(IFstream& is)
}
-void starMesh::readPoints(const scalar scaleFactor)
+void Foam::starMesh::readPoints(const scalar scaleFactor)
{
label nPoints = 0;
label maxLabel = -1;
@@ -117,12 +117,12 @@ void starMesh::readPoints(const scalar scaleFactor)
points_.setSize(nPoints);
-# ifdef starMesh_H
+ #ifdef starMesh_H
starPointID_.setSize(nPoints);
// Reset STAR point ID, just in case
starPointID_ = -1;
-# endif
+ #endif
starPointLabelLookup_.setSize(maxLabel+1);
@@ -146,9 +146,9 @@ void starMesh::readPoints(const scalar scaleFactor)
readToNl(pointsFile);
-# ifdef starMesh_H
+ #ifdef starMesh_H
starPointID_[p] = pointLabel;
-# endif
+ #endif
starPointLabelLookup_[pointLabel] = p;
}
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
index 5873cb1dc2e1031324512e4523331fec08e28fff..c13376dfd2dafe63b99cc74a93fabd2fff0755c5 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::readPoints(const scalar scaleFactor)
+void Foam::starMesh::readPoints(const scalar scaleFactor)
{
label nPoints = 0;
label maxLabel = -1;
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index 75b6e09edc95cb6d9f34e5838ae6da284726edd8..9668741305eebd18b3be63949a4f79a25703327e 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,6 +33,8 @@ Description
#include "Time.H"
#include "starMesh.H"
+using namespace Foam;
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C
index 4e699a5ccb56359980c1131bb07326ca5d33e89a..7f48b0518c33a4b5db0fd4db18f1ed9df7b3176c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,33 +31,41 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// Merge tolerances
-// Moni, tolerances:
-const scalar starMesh::smallMergeTol_ = 1e-3;
-const scalar starMesh::cpMergePointTol_ = 1e-4;
-
-// const scalar starMesh::smallMergeTol_ = 4e-4;
-// const scalar starMesh::cpMergePointTol_ = 1e-3;
+const Foam::scalar Foam::starMesh::smallMergeTol_ = 1e-3;
+const Foam::scalar Foam::starMesh::cpMergePointTol_ = 1e-4;
// Cell shape models
-const cellModel* starMesh::unknownPtr_ = cellModeller::lookup("unknown");
-const cellModel* starMesh::tetPtr_ = cellModeller::lookup("tet");
-const cellModel* starMesh::pyrPtr_ = cellModeller::lookup("pyr");
-const cellModel* starMesh::tetWedgePtr_ = cellModeller::lookup("tetWedge");
-const cellModel* starMesh::prismPtr_ = cellModeller::lookup("prism");
-const cellModel* starMesh::wedgePtr_ = cellModeller::lookup("wedge");
-const cellModel* starMesh::hexPtr_ = cellModeller::lookup("hex");
-
-const cellModel* starMesh::sammTrim1Ptr_ = cellModeller::lookup("sammTrim1");
-const cellModel* starMesh::sammTrim2Ptr_ = cellModeller::lookup("sammTrim2");
-const cellModel* starMesh::sammTrim3Ptr_ = cellModeller::lookup("sammTrim3");
-const cellModel* starMesh::sammTrim4Ptr_ = cellModeller::lookup("sammTrim4");
-const cellModel* starMesh::sammTrim5Ptr_ = cellModeller::lookup("sammTrim5");
-const cellModel* starMesh::sammTrim8Ptr_ =
- cellModeller::lookup("hexagonalPrism");
+const Foam::cellModel* Foam::starMesh::unknownPtr_ =
+ Foam::cellModeller::lookup("unknown");
+const Foam::cellModel* Foam::starMesh::tetPtr_ =
+ Foam::cellModeller::lookup("tet");
+const Foam::cellModel* Foam::starMesh::pyrPtr_ =
+ Foam::cellModeller::lookup("pyr");
+const Foam::cellModel* Foam::starMesh::tetWedgePtr_ =
+ Foam::cellModeller::lookup("tetWedge");
+const Foam::cellModel* Foam::starMesh::prismPtr_ =
+ Foam::cellModeller::lookup("prism");
+const Foam::cellModel* Foam::starMesh::wedgePtr_ =
+ Foam::cellModeller::lookup("wedge");
+const Foam::cellModel* Foam::starMesh::hexPtr_ =
+ Foam::cellModeller::lookup("hex");
+
+const Foam::cellModel* Foam::starMesh::sammTrim1Ptr_ =
+ Foam::cellModeller::lookup("sammTrim1");
+const Foam::cellModel* Foam::starMesh::sammTrim2Ptr_ =
+ Foam::cellModeller::lookup("sammTrim2");
+const Foam::cellModel* Foam::starMesh::sammTrim3Ptr_ =
+ Foam::cellModeller::lookup("sammTrim3");
+const Foam::cellModel* Foam::starMesh::sammTrim4Ptr_ =
+ Foam::cellModeller::lookup("sammTrim4");
+const Foam::cellModel* Foam::starMesh::sammTrim5Ptr_ =
+ Foam::cellModeller::lookup("sammTrim5");
+const Foam::cellModel* Foam::starMesh::sammTrim8Ptr_ =
+ Foam::cellModeller::lookup("hexagonalPrism");
// Regular cell point addressing
// SAMM point addressing
-const label starMesh::regularAddressingTable[6][8] =
+const Foam::label Foam::starMesh::regularAddressingTable[6][8] =
{
{ 0, 1, 2, 4, -1, -1, -1, -1}, // tet
{ 0, 1, 2, 3, 4, -1, -1, -1}, // pyramid
@@ -69,7 +77,7 @@ const label starMesh::regularAddressingTable[6][8] =
// SAMM point addressing
-const label starMesh::sammAddressingTable[9][12] =
+const Foam::label Foam::starMesh::sammAddressingTable[9][12] =
{
{-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // samm0 - empty
{ 3, 2, 6, 7, 11, 9, 1, 5, 4, 12, -1, -1}, // samm1+
@@ -97,7 +105,7 @@ const label starMesh::sammAddressingTable[9][12] =
// Additionally, have in mind that this silliness does not allow matches
// on face 7 and 8 of the samm cell.
-const label starMesh::sammFacePermutationTable[24][8] =
+const Foam::label Foam::starMesh::sammFacePermutationTable[24][8] =
{
{-1, 1, 2, 3, 4, 5, 6, 7}, // permutation 0
{-1, 3, 4, 5, 6, 1, 2, 7}, // permutation 1
@@ -125,7 +133,7 @@ const label starMesh::sammFacePermutationTable[24][8] =
{-1, 6, 5, 2, 1, 3, 4, 7} // permutation 23
};
-const label starMesh::shapeFaceLookup[19][9] =
+const Foam::label Foam::starMesh::shapeFaceLookup[19][9] =
{
{-1, -1, -1, -1, -1, -1, -1, -1, -1}, // shape 0 - empty+
{-1, -1, -1, -1, -1, -1, -1, -1, -1}, // shape 1 - empty+
@@ -185,8 +193,7 @@ const label starMesh::shapeFaceLookup[19][9] =
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Make polyhedral mesh data (packing)
-void starMesh::createPolyMeshData()
+void Foam::starMesh::createPolyMeshData()
{
Info<< "Creating a polyMesh" << endl;
@@ -199,9 +206,7 @@ void starMesh::createPolyMeshData()
}
-// Clear extra storage before creation of the mesh to remove
-// a memory peak
-void starMesh::clearExtraStorage()
+void Foam::starMesh::clearExtraStorage()
{
Info<< "Clearing extra storage" << endl;
@@ -218,10 +223,10 @@ void starMesh::clearExtraStorage()
deleteDemandDrivenData(pointCellsPtr_);
}
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-starMesh::starMesh
+Foam::starMesh::starMesh
(
const fileName& prefix,
const Time& rt,
@@ -281,13 +286,10 @@ starMesh::starMesh
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-starMesh::~starMesh()
+Foam::starMesh::~starMesh()
{
deleteDemandDrivenData(pointCellsPtr_);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
index 224bbb2d183aea4727cdf22fcdaf21dd1def950b..2bcec6115b8377eb1b7242f749de3df2b26c9428 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
+++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,11 +58,8 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#ifndef namespaceFoam
-#define namespaceFoam
- using namespace Foam;
-#endif
-
+namespace Foam
+{
/*---------------------------------------------------------------------------*\
Class starMesh Declaration
@@ -310,6 +307,10 @@ public:
};
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C b/applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C
index 6a1311290cd2f6de106dfa15c51b1b90482acffd..d78be0054061cabe12e1d3bd7763067786520e54 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void starMesh::writeMesh()
+void Foam::starMesh::writeMesh()
{
if (isShapeMesh_)
{
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/pointFeatureEdgesTypes.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/pointFeatureEdgesTypes.H
index 5e7f6a4ebb60c1783cbd7d6c80380c7d969b21a0..89703efdd8626ff105d2f25ac1d69e59f8a4fb81 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/pointFeatureEdgesTypes.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/pointFeatureEdgesTypes.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- pointFeatureEdgesTypes
+ Foam::pointFeatureEdgesTypes
Description
Holds information on the types of feature edges attached to feature points.
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index 14298c3dc7bb3653a28a072e031839bde78b6c57..a9f694ba29ac704f7d6cca5aec0af398249ca2be 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedCell
+ CGAL::indexedCell
Description
An indexed form of CGAL::Triangulation_cell_base_3<K> used to keep
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
index 2671a3bc1344f772bd020e9b6293adfe75f17707..d81deca00c938dc797003fb21fec8aa9416a915a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedCellEnum
+ Foam::indexedCellEnum
Description
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
index 2dbe4cb5fb7107de88a2c215a9fa17a78fd5a18a..09f42566cb12d5c747705e9416b581e94ebb1bee 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
@@ -21,8 +21,8 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Class
- indexedCellOps
+Namespace
+ CGAL::indexedCellOps
Description
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 3db67e8a11eff63d9d86a89f57ba1d4ea14a02ee..dd13623398e801e9db41222f97e6f2738b741724 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedVertex
+ CGAL::indexedVertex
Description
An indexed form of CGAL::Triangulation_vertex_base_3<K> used to keep
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
index 8f283867052a714b8e6922ac244a7b3d3917d5d0..cc3e2d85acbfeec8ce7a08256b111260bd3c6151 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedVertexEnum
+ Foam::indexedVertexEnum
Description
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
index b18cd8e86e68fe01bc4a91a5ed8178fa9ff50964..3794042d9c1cd0e73a7cd2883ab7174bbdf83a70 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
@@ -21,8 +21,8 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Class
- indexedVertexOps
+Namespace
+ CGAL::indexedVertexOps
Description
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index acce9a0d8a6ed092411e5aed0659952377dff875..fe799a31a31afab52d85b4a5d9f114aa1903d27c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- pointConversion
+ Foam::pointConversion
Description
Conversion functions between point (Foam::) and Point (CGAL::)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
index bb6480ea914cbfdbd996064927d9c08dee48cdbb..30d1ddfcf65a85d18778f0c3e4b0670d9992101a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- pointPairs
+ Foam::pointPairs
Description
HashSet of unique edges. The edges are stored as a pair of pairs:
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
index 0d9a4d0ebfa8ef147ccac8d6666772ca7fd5444c..da273a90d21caf845e51e72148d7f17c31100563 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- CV2D
+ Foam::CV2D
Description
Conformal-Voronoi 2D automatic mesher with grid or read initial points
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
index abada80dbc17ad75be5d2c53062903b3e05904f1..571273d1fdfc669b1be85dd7f42a4eaf9f6dbf38 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedFace
+ CGAL::indexedFace
Description
An indexed form of CGAL::Triangulation_face_base_2<K> used to keep
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
index 17cee7d9e5ee1187e838b1ea12ed5d1253847c62..83013847157f6ba24e5be7f684b6e2e6daad5372 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- indexedVertex
+ CGAL::indexedVertex
Description
An indexed form of CGAL::Triangulation_vertex_base_2<K> used to keep
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
index d1ac42b61505aa13dfaad5430302ef0f6275d9d3..ce3f98f3ec214318ec5b4305732a9cd643f967c2 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- meshDualiser
+ Foam::meshDualiser
Description
Creates dual of polyMesh. Every point becomes a cell (or multiple cells
@@ -40,7 +40,7 @@ Description
In same way you can also preserve internal faces (e.g. faceZones)
SourceFiles
- meshDualiser.C
+ Foam::meshDualiser.C
\*---------------------------------------------------------------------------*/
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index af0e41807444e573f4e65492e9cc60acbeea4bc3..18e4ab05ff6266abf8b495ce121b398d46752587 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- fileMonitor
+ Foam::fileMonitor
Description
Checking for changes to files.
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 821c1dd79602d59a23cad1a62ffebfa5a2528a71..a721eb2a05588544fbf5ff806783140751151dc2 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -451,32 +451,40 @@ Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
(
commsTypeNames.read(Foam::debug::optimisationSwitches().lookup("commsType"))
);
-// Register re-reader
-class addcommsTypeToOpt
-:
- public ::Foam::simpleRegIOobject
+
+namespace Foam
{
-public:
- addcommsTypeToOpt(const char* name)
+ // Register re-reader
+ class addcommsTypeToOpt
:
- ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
- {}
- virtual ~addcommsTypeToOpt()
- {}
- virtual void readData(Foam::Istream& is)
+ public ::Foam::simpleRegIOobject
{
- Foam::UPstream::defaultCommsType = Foam::UPstream::commsTypeNames.read
- (
- is
- );
- }
- virtual void writeData(Foam::Ostream& os) const
- {
- os << Foam::UPstream::commsTypeNames[Foam::UPstream::defaultCommsType];
- }
-};
-addcommsTypeToOpt addcommsTypeToOpt_("commsType");
+ public:
+
+ addcommsTypeToOpt(const char* name)
+ :
+ ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+ {}
+
+ virtual ~addcommsTypeToOpt()
+ {}
+ virtual void readData(Foam::Istream& is)
+ {
+ UPstream::defaultCommsType = UPstream::commsTypeNames.read
+ (
+ is
+ );
+ }
+
+ virtual void writeData(Foam::Ostream& os) const
+ {
+ os << UPstream::commsTypeNames[UPstream::defaultCommsType];
+ }
+ };
+
+ addcommsTypeToOpt addcommsTypeToOpt_("commsType");
+}
// Default communicator
Foam::label Foam::UPstream::worldComm(0);
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 847d7cdb32cff6b391ff988e98e5518896f12169..ac8cf38adff7622efc4b022794ca24920c16702c 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -74,35 +74,42 @@ Foam::regIOobject::fileCheckTypes Foam::regIOobject::fileModificationChecking
)
)
);
-// Register re-reader
-class addfileModificationCheckingToOpt
-:
- public ::Foam::simpleRegIOobject
+
+namespace Foam
{
-public:
- addfileModificationCheckingToOpt(const char* name)
+ // Register re-reader
+ class addfileModificationCheckingToOpt
:
- ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
- {}
- virtual ~addfileModificationCheckingToOpt()
- {}
- virtual void readData(Foam::Istream& is)
- {
- Foam::regIOobject::fileModificationChecking =
- Foam::regIOobject::fileCheckTypesNames.read(is);
- }
- virtual void writeData(Foam::Ostream& os) const
+ public ::Foam::simpleRegIOobject
{
- os << Foam::regIOobject::fileCheckTypesNames
- [
- Foam::regIOobject::fileModificationChecking
- ];
- }
-};
-addfileModificationCheckingToOpt addfileModificationCheckingToOpt_
-(
- "fileModificationChecking"
-);
+ public:
+
+ addfileModificationCheckingToOpt(const char* name)
+ :
+ ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+ {}
+
+ virtual ~addfileModificationCheckingToOpt()
+ {}
+
+ virtual void readData(Foam::Istream& is)
+ {
+ regIOobject::fileModificationChecking =
+ regIOobject::fileCheckTypesNames.read(is);
+ }
+
+ virtual void writeData(Foam::Ostream& os) const
+ {
+ os << regIOobject::fileCheckTypesNames
+ [regIOobject::fileModificationChecking];
+ }
+ };
+
+ addfileModificationCheckingToOpt addfileModificationCheckingToOpt_
+ (
+ "fileModificationChecking"
+ );
+}
bool Foam::regIOobject::masterOnlyReading = false;
diff --git a/src/OpenFOAM/global/debug/registerSwitch.H b/src/OpenFOAM/global/debug/registerSwitch.H
index 9c5cd26275cb094b713b3b71aea799d23c2819a8..9e6d3580e4c4107bb048224f0c12b47c6cb35327 100644
--- a/src/OpenFOAM/global/debug/registerSwitch.H
+++ b/src/OpenFOAM/global/debug/registerSwitch.H
@@ -21,6 +21,9 @@ License
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::RegisterSwitch
+
Description
Class and registration macros for InfoSwitches and OptimisationSwitches
to support reading from system/controlDict and dynamic update.
@@ -34,10 +37,17 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class RegisterSwitch Declaration
+\*---------------------------------------------------------------------------*/
+
template<class Type>
class RegisterSwitch
:
- public ::Foam::simpleRegIOobject
+ public simpleRegIOobject
{
Type& optSwitch_;
@@ -50,7 +60,7 @@ public:
Type& optSwitch
)
:
- ::Foam::simpleRegIOobject(registryFn, name),
+ simpleRegIOobject(registryFn, name),
optSwitch_(optSwitch)
{}
@@ -69,17 +79,23 @@ public:
};
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#define CONCAT(x, y) x ## y
#define CONCAT2(x, y) CONCAT(x, y)
#define FILE_UNIQUE(x) CONCAT2(x, __LINE__)
#define registerOptSwitch(Name, Type, Switch) \
- static RegisterSwitch<Type> FILE_UNIQUE(_addToOpt_) \
+ static Foam::RegisterSwitch<Type> FILE_UNIQUE(_addToOpt_) \
(Foam::debug::addOptimisationObject, Name, Switch)
#define registerInfoSwitch(Name, Type, Switch) \
- static RegisterSwitch<Type> FILE_UNIQUE(_addToOpt_) \
+ static Foam::RegisterSwitch<Type> FILE_UNIQUE(_addToOpt_) \
(Foam::debug::addInfoObject, Name, Switch)
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
index 9dbdb8b65d9a4efa04472b5b1155935b5c547581..f01a46f1e0b30f30974d99361b69bc961fab64a8 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- scalarMatrices
+ Foam::scalarMatrices
Description
Scalar matrices
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index f4abc331febeb570d33ef0cef3caef7e5ed618cd..49f4072dd927bc41f89b37d7984e98a930a6e77c 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -25,7 +25,7 @@ Typedef
Foam::Scalar
Description
- Single floating point number
+ Single floating point number (float or double)
SourceFiles
Scalar.C
@@ -34,6 +34,11 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
// template specialisation for pTraits<Scalar>
template<>
class pTraits<Scalar>
@@ -314,5 +319,8 @@ Scalar readScalar(Istream&);
Istream& operator>>(Istream&, Scalar&);
Ostream& operator<<(Ostream&, const Scalar);
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
index 80687f6f0727bf6995512abe50189b8cfad40f37..2498f5f9cc84bfdc6fd781fbe7182a3d539ca0b6 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -85,8 +85,21 @@ inline Scalar func(const Scalar s) \
return ::func(s); \
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#include "Scalar.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
inline Scalar hypot(const Scalar x, const Scalar y)
{
return ::hypot(x, y);
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
index c379e0fbdabec466662ad8a0f34e41343b5b6845..31ae9891dd0a50d1811a8de12cadf95c847d80db 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -85,8 +85,21 @@ inline Scalar func(const Scalar s) \
return ::func##f(s); \
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#include "Scalar.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
inline Scalar hypot(const Scalar x, const Scalar y)
{
return ::hypotf(x, y);
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 3f79add31b3135947d9815ddca991c407cf5f0b6..eb313e51ec8ca207a6146389572bb6647b5f8bcc 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -25,7 +25,7 @@ License
#include "error.H"
#include "products.H"
-#include "VectorSpaceM.H"
+#include "VectorSpaceOps.H"
#include "ops.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceM.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
similarity index 55%
rename from src/OpenFOAM/primitives/VectorSpace/VectorSpaceM.H
rename to src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
index 45ba4f40cd8e79fd394d80c628d615bf5979512c..7f6d3e1199b8b3b6ad53d579240c00c26c2a3435 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceM.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
@@ -1,3 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\/ 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::VectorSpaceOps
+
+Description
+ Operator functions for VectorSpace.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef VectorSpaceOps_H
+#define VectorSpaceOps_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<int N, int I>
class VectorSpaceOps
@@ -81,3 +121,14 @@ public:
static inline void op(V& vs, const V1&, const V1&, Op)
{}
};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 7385c39df26863cf138699ae5fa8b7a7189c8ce8..186ed39eecc52e30f17dd9b7b3ce5e3ff1d15632 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- temperatureCoupledBase
+ Foam::temperatureCoupledBase
Description
Common functions for use in temperature coupled boundaries. For now only
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index 862abc1852239d0d313dd4b7e5ed0277c5465f1c..18d1d4cb4a0844f7eed72c43a365c55124b59834 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -22,9 +22,8 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::
- compressible::
- turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+ Foam::compressible::
+ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
Description
Mixed boundary condition for temperature, to be used for heat-transfer
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index 8c332402e920c329ef223d37b4701bcb337d6da1..6bd2aaa6e9959c3ff56023a30c1dc4b88e6cd911 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -22,9 +22,8 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::
- compressible::
- turbulentTemperatureRadCoupledMixedFvPatchScalarField
+ Foam::compressible::
+ turbulentTemperatureRadCoupledMixedFvPatchScalarField
Description
Mixed boundary condition for temperature and radiation heat transfer
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
index 6fc480b1bd2ec2e9f2bb4fcf0d2382c867d0e71a..4f0cb123b5cfa04a4165a21c911b85e49144787c 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- extrudePatchMesh
+ Foam::extrudePatchMesh
Description
Mesh at a patch created on the fly. The following entry should be used
@@ -194,4 +194,3 @@ public:
#endif
// ************************************************************************* //
-
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index 8485f3cd8db94890c8d87c6891fb23149a040128..eef84e25daf418d2a07cf9170b6ba4762d9bd9e7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- tetDecomposer
+ Foam::tetDecomposer
Description
Decomposes polyMesh into tets.
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
index c4ec83ed4b8e4e2f3f01bc991955d4f8a9577b18..e95997d55dde0b44569d40f11408aa599cc014c6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- pointLinear
+ Foam::pointLinear
Description
Face-point interpolation scheme class derived from linear and
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index 786e452a46fb4bee90205bced029f9a0e790d954..7fbe8c5ec05d7400c0b99d482968239f1f779d10 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- surfaceDisplacementPointPatchVectorField
+ Foam::surfaceDisplacementPointPatchVectorField
Description
Displacement fixed by projection onto triSurface.
diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
index b7c21230bc979abf738e185a73a2984697e5a44c..2209801ed7d1df7b6eb631f2c0486f85e8992c53 100644
--- a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- coalCloud
+ Foam::coalCloud
Description
Cloud class to introduce coal parcels
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
index 8c4a0c7dc742b49ff51f1ec502fda5042b6a0e6e..981539b9dab66a0792ba14e1875b2bef8f239024 100644
--- a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- coalParcel
+ Foam::coalParcel
Description
Definition of coal parcel
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
index 83a4c19d8aca478ff977201ba30fc45051bf990b..26a741062c17d04edd7bf1d29f0f055c22f2259c 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- COxidationDiffusionLimitedRate
+ Foam::COxidationDiffusionLimitedRate
Description
Diffusion limited rate surface reaction model for coal parcels. Limited to:
@@ -40,12 +40,15 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
// Forward class declarations
template<class CloudType>
class COxidationDiffusionLimitedRate;
-namespace Foam
-{
/*---------------------------------------------------------------------------*\
Class COxidationDiffusionLimitedRate Declaration
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
index cd7800328fe91c6a65d6b1fb6865d445cb3f5b8f..08e20f74c876998908c718c06cec416ea416a26a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- COxidationHurtMitchell
+ Foam::COxidationHurtMitchell
Description
Char oxidation model given by Hurt and Mitchell:
@@ -41,7 +41,7 @@ Description
Model validity:
Gas temperature: Tc > 1500 K
Particle sizes: 75 um -> 200 um
- Pox > 0.3 atm
+ Pox > 0.3 atm
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
index f868654ca3256cb095dd93be15435c379665f87f..ead8d85d26d50f7a07e9a3d4de684598c6e3dbc2 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- COxidationIntrinsicRate
+ Foam::COxidationIntrinsicRate
Description
Intrinsic char surface reaction mndel
@@ -40,12 +40,15 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
// Forward class declarations
template<class CloudType>
class COxidationIntrinsicRate;
-namespace Foam
-{
/*---------------------------------------------------------------------------*\
Class COxidationIntrinsicRate Declaration
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
index 2c9b2868351f2973103bf4f925349bfc61e6b052..a57c847799e0c923c25e51f22223ccfaa8afa5a8 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- COxidationKineticDiffusionLimitedRate
+ Foam::COxidationKineticDiffusionLimitedRate
Description
Kinetic/diffusion limited rate surface reaction model for coal parcels.
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 319178dd47a26039cbfdc90c80c7beb70b30c888..95dd8b2bcef1d87318306a9a77a805bec500f888 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- COxidationMurphyShaddix
+ Foam::COxidationMurphyShaddix
Description
Limited to C(s) + O2 -> CO2
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
index 94a5195426fd77f95667717668ac1dd1cd0cf743..6d2b964c889b60ffc8618367a8a46a70e22621c5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- kinematicParcelInjectionDataIOList
+ Foam::kinematicParcelInjectionDataIOList
Description
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
index 1f88dc8ca1edf95246ff3d7c8969020025cee1e5..a5378cb4bdfcdb1d5ac6c2662a6fa605b9721501 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- reactingMultiphaseParcelInjectionDataIOList
+ Foam::reactingMultiphaseParcelInjectionDataIOList
Description
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
index e84d568919b75747ace8878f86d9120ad2a0bf00..f38e6ef3cafa4692b7a35d02f17b9e2c8b5bdac5 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- thermoParcelInjectionDataIOList
+ Foam::thermoParcelInjectionDataIOList
Description
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.H b/src/meshTools/momentOfInertia/momentOfInertia.H
index e521d41c77476948ad6e87e5c7a8beeeab055efe..0f56e8b00b7b6b8c9398f2ac9effa28ba11050c5 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.H
+++ b/src/meshTools/momentOfInertia/momentOfInertia.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- momentOfInertia
+ Foam::momentOfInertia
Description
Calculates the inertia tensor and principal axes and moments of a
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
index fb7e923309def9d3ecc62b05f8cff5c7ac169200..3bbdeb84917a8c45a45c65e4532e9fe4075fe8dd 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,10 +22,8 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
-
- Foam::
- compressible::
- filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
+ Foam::compressible::
+ filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
Description
Mixed boundary condition for temperature, to be used in the flow and
diff --git a/src/regionModels/regionModel/regionProperties/regionProperties.H b/src/regionModels/regionModel/regionProperties/regionProperties.H
index 09ebbf66d5165aeb946212a11a0a01e6192680b7..937285ace4387890a398024fe28817a987af51d6 100644
--- a/src/regionModels/regionModel/regionProperties/regionProperties.H
+++ b/src/regionModels/regionModel/regionProperties/regionProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- regionProperties
+ Foam::regionProperties
Description
Simple class to hold region information for coupled region simulations.
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H b/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
index f2ac45fc23132e697c67af17d64ed5c424abe6b7..8ef3717246ea142dcec119db8b628cd2e99fd95a 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- radiationCoupledBase
+ Foam::radiationCoupledBase
Description
Common functions to emissivity. It gets supplied from lookup into a