diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 8233d24ea58b74af1e8161628959f68d0c83488d..0015c5618ecb0537e80fbc8fa175310c042cd9a3 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -36,14 +36,9 @@ Description
#include "octreeDataCell.H"
#include "octreeDataFace.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void meshToMesh::calcAddressing()
+void Foam::meshToMesh::calcAddressing()
{
if (debug)
{
@@ -225,7 +220,7 @@ void meshToMesh::calcAddressing()
}
-void meshToMesh::cellAddresses
+void Foam::meshToMesh::cellAddresses
(
labelList& cellAddressing_,
const pointField& points,
@@ -356,8 +351,4 @@ void meshToMesh::cellAddresses
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index 0133dee52b0cb2e07450a9a96e83c7169c10e03f..be2900f50b543ff53870afc18c54f5f364c05376 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -26,14 +26,9 @@ License
#include "meshToMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void meshToMesh::calculateInverseDistanceWeights() const
+void Foam::meshToMesh::calculateInverseDistanceWeights() const
{
if (debug)
{
@@ -93,7 +88,7 @@ void meshToMesh::calculateInverseDistanceWeights() const
invDistCoeffs[celli][ni + 1] = invDist;
sumInvDist += invDist;
}
-
+
// divide by the total inverse-distance
forAll (invDistCoeffs[celli], i)
{
@@ -107,19 +102,15 @@ void meshToMesh::calculateInverseDistanceWeights() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-const scalarListList& meshToMesh::inverseDistanceWeights() const
+const Foam::scalarListList& Foam::meshToMesh::inverseDistanceWeights() const
{
if (!inverseDistanceWeightsPtr_)
{
calculateInverseDistanceWeights();
}
-
+
return *inverseDistanceWeightsPtr_;
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index 2046bd1a3ad95e63ecf86a9d16efbb6134067563..07bff4786eeef4e18d15e00452e27c7b7c0342c9 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -28,20 +28,15 @@ License
#include "processorFvPatch.H"
#include "demandDrivenData.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTypeNameAndDebug(meshToMesh, 0);
-
-const scalar meshToMesh::directHitTol = 1e-5;
+defineTypeNameAndDebug(Foam::meshToMesh, 0);
+const Foam::scalar Foam::meshToMesh::directHitTol = 1e-5;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-meshToMesh::meshToMesh
+Foam::meshToMesh::meshToMesh
(
const fvMesh& meshFrom,
const fvMesh& meshTo,
@@ -114,7 +109,7 @@ meshToMesh::meshToMesh
}
-meshToMesh::meshToMesh
+Foam::meshToMesh::meshToMesh
(
const fvMesh& meshFrom,
const fvMesh& meshTo
@@ -159,7 +154,7 @@ meshToMesh::meshToMesh
<< exit(FatalError);
}
- if
+ if
(
fromMesh_.boundaryMesh()[patchi].type()
!= toMesh_.boundaryMesh()[patchi].type()
@@ -201,14 +196,10 @@ meshToMesh::meshToMesh
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-meshToMesh::~meshToMesh()
+Foam::meshToMesh::~meshToMesh()
{
deleteDemandDrivenData(inverseDistanceWeightsPtr_);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
index 83b0e2de234576ee7664d45cf506d71d4931a88d..fe1dc68b05111684e5eaeef6ce9789ba3348474a 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
@@ -56,7 +56,7 @@ class octree;
class octreeDataCell;
/*---------------------------------------------------------------------------*\
- Class meshToMesh Declaration
+ Class meshToMesh Declaration
\*---------------------------------------------------------------------------*/
class meshToMesh
@@ -207,7 +207,7 @@ public:
{
return fromMesh_;
}
-
+
const fvMesh& toMesh() const
{
return toMesh_;
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
index f63f2dea835d2fe8fd245f5464f36cb1c5cc18a0..0bc573de88bfbdcf9e269f4a409adfb678f80f97 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
@@ -30,15 +30,10 @@ License
#include "SubField.H"
#include "mixedFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void meshToMesh::mapField
+void Foam::meshToMesh::mapField
(
Field<Type>& toF,
const Field<Type>& fromVf,
@@ -60,7 +55,7 @@ void meshToMesh::mapField
template<class Type>
-void meshToMesh::interpolateField
+void Foam::meshToMesh::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -79,7 +74,7 @@ void meshToMesh::interpolateField
{
const labelList& neighbours = cc[adr[celli]];
const scalarList& w = weights[celli];
-
+
toF[celli] = fromVf[adr[celli]]*w[0];
for (label ni = 1; ni < w.size(); ni++)
@@ -92,7 +87,7 @@ void meshToMesh::interpolateField
template<class Type>
-void meshToMesh::interpolateField
+void Foam::meshToMesh::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -118,7 +113,7 @@ void meshToMesh::interpolateField
template<class Type>
-void meshToMesh::interpolateInternalField
+void Foam::meshToMesh::interpolateInternalField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -160,7 +155,7 @@ void meshToMesh::interpolateInternalField
case INTERPOLATE:
interpolateField
(
- toF,
+ toF,
fromVf,
cellAddressing_,
inverseDistanceWeights()
@@ -170,7 +165,7 @@ void meshToMesh::interpolateInternalField
case CELL_POINT_INTERPOLATE:
interpolateField
(
- toF,
+ toF,
fromVf,
cellAddressing_,
toMesh_.cellCentres()
@@ -190,7 +185,7 @@ void meshToMesh::interpolateInternalField
template<class Type>
-void meshToMesh::interpolateInternalField
+void Foam::meshToMesh::interpolateInternalField
(
Field<Type>& toF,
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
@@ -203,7 +198,7 @@ void meshToMesh::interpolateInternalField
template<class Type>
-void meshToMesh::interpolate
+void Foam::meshToMesh::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -268,7 +263,7 @@ void meshToMesh::interpolate
).refValue() = toVf.boundaryField()[patchi];
}
}
- else if
+ else if
(
patchMap_.found(toPatch.name())
&& fromMeshPatches_.found(patchMap_.find(toPatch.name())())
@@ -300,7 +295,7 @@ void meshToMesh::interpolate
template<class Type>
-void meshToMesh::interpolate
+void Foam::meshToMesh::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
@@ -313,7 +308,8 @@ void meshToMesh::interpolate
template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > meshToMesh::interpolate
+Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::meshToMesh::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
meshToMesh::order ord
@@ -387,7 +383,8 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > meshToMesh::interpolate
template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > meshToMesh::interpolate
+Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::meshToMesh::interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
meshToMesh::order ord
@@ -401,8 +398,4 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > meshToMesh::interpolate
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
index f8172ea5b3bc3446bb376f3102dcee3aa6715fd2..54d7e96a40f5287efbb9dd20e39481228e882927 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
+++ b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
@@ -153,7 +153,7 @@ void Foam::vtkSetWriter<Type>::write
label globalPtI = 0;
forAll(tracks, trackI)
{
- const coordSet& points = tracks[trackI];
+ const coordSet& points = tracks[trackI];
os << points.size();
forAll(points, i)
@@ -164,7 +164,7 @@ void Foam::vtkSetWriter<Type>::write
os << nl;
}
}
-
+
os << "POINT_DATA " << nPoints << nl
<< " FIELD attributes " << valueSetNames.size() << nl;
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index b9e3eaf7b5a54e146a42e2a0590f784453b582a9..3193ca6414b2b333289d0b60facb7a700ef70b0c 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -243,7 +243,7 @@ bool Foam::sampledIsoSurfaceCell::expire()
{
return false;
}
-
+
// force update
prevTimeIndex_ = -1;
return true;
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H
index a8428cdd089982f21bacbb4f45c1263b60e2bb94..dd7ea408d599b1582c1bea94efe0df76c1b5f607 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.H
@@ -67,7 +67,7 @@ class thresholdCellFaces
void calculate
(
- const scalarField&,
+ const scalarField&,
const scalar lowerThreshold,
const scalar upperThreshold,
const bool triangulate