diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C index 8233d24ea5..0015c5618e 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 0133dee52b..be2900f50b 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 2046bd1a3a..07bff4786e 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 83b0e2de23..fe1dc68b05 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 f63f2dea83..0bc573de88 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 -void meshToMesh::mapField +void Foam::meshToMesh::mapField ( Field& toF, const Field& fromVf, @@ -60,7 +55,7 @@ void meshToMesh::mapField template -void meshToMesh::interpolateField +void Foam::meshToMesh::interpolateField ( Field& toF, const GeometricField& 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 -void meshToMesh::interpolateField +void Foam::meshToMesh::interpolateField ( Field& toF, const GeometricField& fromVf, @@ -118,7 +113,7 @@ void meshToMesh::interpolateField template -void meshToMesh::interpolateInternalField +void Foam::meshToMesh::interpolateInternalField ( Field& toF, const GeometricField& 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 -void meshToMesh::interpolateInternalField +void Foam::meshToMesh::interpolateInternalField ( Field& toF, const tmp >& tfromVf, @@ -203,7 +198,7 @@ void meshToMesh::interpolateInternalField template -void meshToMesh::interpolate +void Foam::meshToMesh::interpolate ( GeometricField& toVf, const GeometricField& 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 -void meshToMesh::interpolate +void Foam::meshToMesh::interpolate ( GeometricField& toVf, const tmp >& tfromVf, @@ -313,7 +308,8 @@ void meshToMesh::interpolate template -tmp > meshToMesh::interpolate +Foam::tmp< Foam::GeometricField > +Foam::meshToMesh::interpolate ( const GeometricField& fromVf, meshToMesh::order ord @@ -387,7 +383,8 @@ tmp > meshToMesh::interpolate template -tmp > meshToMesh::interpolate +Foam::tmp< Foam::GeometricField > +Foam::meshToMesh::interpolate ( const tmp >& tfromVf, meshToMesh::order ord @@ -401,8 +398,4 @@ tmp > meshToMesh::interpolate } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C index f8172ea5b3..54d7e96a40 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C +++ b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C @@ -153,7 +153,7 @@ void Foam::vtkSetWriter::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::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 b9e3eaf7b5..3193ca6414 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 a8428cdd08..dd7ea408d5 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