From 7ba41e00959c85b8a2895dcf5ce80a147444ba89 Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Mon, 29 Feb 2016 18:33:54 +0000 Subject: [PATCH] Removed duplicate, inconsistent and spurious comments in .C files --- .../incompressibleThreePhaseMixture.C | 3 +- .../cellShapeControl/cellShapeControl.C | 8 +--- .../manipulation/polyDualMesh/meshDualiser.C | 8 +--- .../ensightOutputFunctions.C | 3 +- .../surface/surfaceClean/collapseEdge.C | 3 +- src/OSspecific/POSIX/POSIX.C | 35 ++++----------- .../dynamicTreeDataPoint.C | 6 +-- src/OpenFOAM/db/regIOobject/regIOobject.C | 5 +-- src/OpenFOAM/dimensionSet/dimensionSets.C | 14 +++--- .../PatchToPatchInterpolate.C | 2 - .../mapPolyMesh/mapDistribute/mapDistribute.C | 3 -- .../mapDistribute/mapDistributePolyMesh.C | 3 +- .../mapDistribute/mapDistributeTemplates.C | 15 +------ src/OpenFOAM/meshes/polyMesh/polyMesh.C | 2 - .../polyMesh/polyMeshCheck/polyMeshCheck.C | 13 +++--- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 1 - .../constraint/oldCyclic/oldCyclicPolyPatch.C | 17 +++---- .../constraint/processor/processorPolyPatch.C | 8 ---- .../constraint/processor/processorPolyPatch.H | 4 ++ .../processorCyclicPolyPatch.C | 4 -- .../polyPatches/polyPatch/polyPatch.C | 1 - .../polyMesh/syncTools/syncToolsTemplates.C | 4 +- .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 11 +---- .../PatchTools/PatchToolsSearch.C | 13 +----- .../meshes/primitiveMesh/primitiveMesh.C | 2 - .../meshes/primitiveMesh/primitiveMesh.H | 4 ++ .../primitiveMeshCheck/primitiveMeshCheck.C | 11 ----- .../meshes/primitiveMesh/primitiveMeshEdges.C | 3 -- .../primitiveMesh/primitivePatch/patchZones.C | 9 +--- .../primitiveMesh/primitivePatch/walkPatch.C | 8 +--- .../meshes/primitiveShapes/plane/plane.C | 17 +------ .../primitiveShapes/tetrahedron/tetrahedron.C | 15 ++++--- .../meshes/treeBoundBox/treeBoundBox.C | 45 +++++++------------ .../primitives/Tensor2D/tensor2D/tensor2D.C | 32 +++++-------- .../primitives/VectorSpace/VectorSpace.C | 4 +- src/OpenFOAM/primitives/bools/Switch/Switch.C | 6 +-- .../primitives/hashes/Hasher/Hasher.C | 2 +- .../primitives/strings/string/string.C | 9 +--- src/dynamicMesh/fvMeshAdder/fvMeshAdder.C | 5 +-- .../meshCutAndRemove/meshCutAndRemove.C | 15 +------ .../motionSmootherAlgoTemplates.C | 3 -- .../polyMeshGeometry/polyMeshGeometry.C | 10 +---- .../attachPolyTopoChanger.C | 3 +- .../polyTopoChange/refinementHistory.C | 9 +--- .../polyTopoChange/removePoints.C | 27 ++--------- .../featureEdgeMesh/featureEdgeMesh.C | 7 +-- src/engine/engineTime/engineTime.C | 3 +- src/fileFormats/coordSet/coordSet.C | 4 +- src/finiteVolume/fvMesh/fvMesh.C | 1 - .../autoHexMeshDriver/autoLayerDriver.C | 1 - .../meshRefinement/meshRefinement.C | 2 - src/meshTools/indexedOctree/treeDataEdge.C | 8 +--- src/meshTools/indexedOctree/treeDataFace.C | 8 ++-- src/meshTools/indexedOctree/treeDataPoint.C | 6 +-- .../indexedOctree/treeDataPrimitivePatch.C | 2 - src/meshTools/meshTools/meshTools.C | 4 +- .../primitiveMeshGeometry.C | 4 +- .../searchableSurface/searchableSurfaces.C | 12 +---- .../searchableSurfacesQueries.C | 3 +- src/meshTools/sets/topoSets/cellZoneSet.C | 3 +- src/meshTools/sets/topoSets/faceZoneSet.C | 3 +- src/meshTools/sets/topoSets/pointZoneSet.C | 3 +- .../surfaceFeatures/surfaceFeatures.C | 10 ++--- .../triSurfaceTools/triSurfaceTools.C | 2 - .../wallBoundedParticleTemplates.C | 15 ++++--- src/sampling/probes/probesTemplates.C | 1 - .../incompressibleTwoPhaseMixture.C | 3 +- 67 files changed, 138 insertions(+), 392 deletions(-) diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C index f6c00e12a48..b5eae6b98c7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,6 @@ License // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // -//- Calculate and return the laminar viscosity void Foam::incompressibleThreePhaseMixture::calcNu() { nuModel1_->correct(); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C index ca65462488b..9e3e9e82ad0 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,13 +36,10 @@ License namespace Foam { -defineTypeNameAndDebug(cellShapeControl, 0); + defineTypeNameAndDebug(cellShapeControl, 0); } -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::cellShapeControl::cellShapeControl @@ -173,7 +170,6 @@ Foam::scalar Foam::cellShapeControl::cellSize(const point& pt) const } -//- Return the cell alignment at the given location Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const { scalarList bary; diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C index ce6e15e9fa7..ff34c2a92de 100644 --- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C +++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ License namespace Foam { -defineTypeNameAndDebug(meshDualiser, 0); + defineTypeNameAndDebug(meshDualiser, 0); } @@ -123,8 +123,6 @@ void Foam::meshDualiser::dumpPolyTopoChange } -//- Given cell and point on mesh finds the corresponding dualCell. Most -// points become only one cell but the feature points might be split. Foam::label Foam::meshDualiser::findDualCell ( const label cellI, @@ -146,8 +144,6 @@ Foam::label Foam::meshDualiser::findDualCell } -// Helper function to generate dualpoints on all boundary edges emanating -// from (boundary & feature) point void Foam::meshDualiser::generateDualBoundaryEdges ( const PackedBoolList& isBoundaryEdge, diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C index ace330060df..a21efa64da1 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -206,7 +206,6 @@ void Foam::ensightLagrangianField } -//- Write generalized field components template<class Type> void Foam::ensightVolField ( diff --git a/applications/utilities/surface/surfaceClean/collapseEdge.C b/applications/utilities/surface/surfaceClean/collapseEdge.C index c2eb4b0d05a..8b752129ef8 100644 --- a/applications/utilities/surface/surfaceClean/collapseEdge.C +++ b/applications/utilities/surface/surfaceClean/collapseEdge.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "collapseEdge.H" -//- Sets point neighbours of face to val static void markPointNbrs ( const triSurface& surf, diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C index 525c84817a1..0b9a541d940 100644 --- a/src/OSspecific/POSIX/POSIX.C +++ b/src/OSspecific/POSIX/POSIX.C @@ -188,7 +188,6 @@ bool Foam::isAdministrator() } -// use $HOME environment variable or passwd info Foam::fileName Foam::home() { char* env = ::getenv("HOME"); @@ -588,14 +587,12 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode) } -// Set the file mode bool Foam::chMod(const fileName& name, const mode_t m) { return ::chmod(name.c_str(), m) == 0; } -// Return the file mode mode_t Foam::mode(const fileName& name) { fileStat fileStatus(name); @@ -610,7 +607,6 @@ mode_t Foam::mode(const fileName& name) } -// Return the file type: FILE or DIRECTORY Foam::fileName::Type Foam::type(const fileName& name) { mode_t m = mode(name); @@ -630,28 +626,24 @@ Foam::fileName::Type Foam::type(const fileName& name) } -// Does the name exist in the filing system? bool Foam::exists(const fileName& name, const bool checkGzip) { return mode(name) || isFile(name, checkGzip); } -// Does the directory exist? bool Foam::isDir(const fileName& name) { return S_ISDIR(mode(name)); } -// Does the file exist? bool Foam::isFile(const fileName& name, const bool checkGzip) { return S_ISREG(mode(name)) || (checkGzip && S_ISREG(mode(name + ".gz"))); } -// Return size of file off_t Foam::fileSize(const fileName& name) { fileStat fileStatus(name); @@ -666,7 +658,6 @@ off_t Foam::fileSize(const fileName& name) } -// Return time of last file modification time_t Foam::lastModified(const fileName& name) { fileStat fileStatus(name); @@ -681,7 +672,6 @@ time_t Foam::lastModified(const fileName& name) } -// Read a directory and return the entries as a string list Foam::fileNameList Foam::readDir ( const fileName& directory, @@ -776,7 +766,6 @@ Foam::fileNameList Foam::readDir } -// Copy, recursively if necessary, the source to the destination bool Foam::cp(const fileName& src, const fileName& dest) { // Make sure source exists. @@ -877,7 +866,6 @@ bool Foam::cp(const fileName& src, const fileName& dest) } -// Create a softlink. dst should not exist. Returns true if successful. bool Foam::ln(const fileName& src, const fileName& dst) { if (POSIX::debug) @@ -915,7 +903,6 @@ bool Foam::ln(const fileName& src, const fileName& dst) } -// Rename srcFile dstFile bool Foam::mv(const fileName& src, const fileName& dst) { if (POSIX::debug) @@ -941,8 +928,6 @@ bool Foam::mv(const fileName& src, const fileName& dst) } -//- Rename to a corresponding backup file -// If the backup file already exists, attempt with "01" .. "99" index bool Foam::mvBak(const fileName& src, const std::string& ext) { if (POSIX::debug) @@ -980,7 +965,6 @@ bool Foam::mvBak(const fileName& src, const std::string& ext) } -// Remove a file, returning true if successful otherwise false bool Foam::rm(const fileName& file) { if (POSIX::debug) @@ -1001,7 +985,6 @@ bool Foam::rm(const fileName& file) } -// Remove a dirctory and its contents bool Foam::rmDir(const fileName& directory) { if (POSIX::debug) @@ -1314,31 +1297,31 @@ Foam::fileNameList Foam::dlLoaded() void Foam::osRandomSeed(const label seed) { -#ifdef USE_RANDOM + #ifdef USE_RANDOM srandom((unsigned int)seed); -#else + #else srand48(seed); -#endif + #endif } Foam::label Foam::osRandomInteger() { -#ifdef USE_RANDOM + #ifdef USE_RANDOM return random(); -#else + #else return lrand48(); -#endif + #endif } Foam::scalar Foam::osRandomDouble() { -#ifdef USE_RANDOM + #ifdef USE_RANDOM return (scalar)random()/INT_MAX; -#else + #else return drand48(); -#endif + #endif } diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C index 821e4ff5007..4eca98a8135 100644 --- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C +++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,8 +55,6 @@ Foam::dynamicTreeDataPoint::shapePoints() const } -//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface. -// Only makes sense for closed surfaces. Foam::volumeType Foam::dynamicTreeDataPoint::getVolumeType ( const dynamicIndexedOctree<dynamicTreeDataPoint>& oc, @@ -129,8 +127,6 @@ void Foam::dynamicTreeDataPoint::findNearest } -//- Calculates nearest (to line) point in shape. -// Returns point and distance (squared) void Foam::dynamicTreeDataPoint::findNearest ( const labelUList& indices, diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C index c3f86da318f..5a239f5642d 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.C +++ b/src/OpenFOAM/db/regIOobject/regIOobject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -405,14 +405,12 @@ bool Foam::regIOobject::upToDate } -//- Flag me as up to date void Foam::regIOobject::setUpToDate() { eventNo_ = db().getEvent(); } -// Rename object and re-register with objectRegistry under new name void Foam::regIOobject::rename(const word& newName) { // Check out of objectRegistry @@ -428,7 +426,6 @@ void Foam::regIOobject::rename(const word& newName) } -// Assign to IOobject void Foam::regIOobject::operator=(const IOobject& io) { if (isPtr_) diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C index a2ad4482dd6..2a76260c57a 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.C +++ b/src/OpenFOAM/dimensionSet/dimensionSets.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,16 +35,16 @@ namespace Foam /* * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * */ -//- Since dimensionSystems() can be reread we actually store a copy of -// the controlDict subDict (v.s. a reference to the subDict for e.g. -// dimensionedConstants) +// Since dimensionSystems() can be reread we actually store a copy of +// the controlDict subDict (v.s. a reference to the subDict for e.g. +// dimensionedConstants) dictionary* dimensionSystemsPtr_(NULL); HashTable<dimensionedScalar>* unitSetPtr_(NULL); dimensionSets* writeUnitSetPtr_(NULL); -//- Helper class to -// - register re-reader -// - deallocate demand-driven data +// Helper class to +// register re-reader +// deallocate demand-driven data class addDimensionSetsToDebug : public ::Foam::simpleRegIOobject diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C index 8993cdbdb86..b44cd52352f 100644 --- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C +++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C @@ -33,7 +33,6 @@ namespace Foam // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -//- Interpolate point field template<class FromPatch, class ToPatch> template<class Type> tmp<Field<Type>> @@ -102,7 +101,6 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate } -//- Interpolate face field template<class FromPatch, class ToPatch> template<class Type> tmp<Field<Type>> diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C index 5d0650ef2ee..2624d9a6968 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C @@ -636,7 +636,6 @@ void Foam::mapDistribute::exchangeAddressing // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -//- Construct null Foam::mapDistribute::mapDistribute() : constructSize_(0), @@ -644,7 +643,6 @@ Foam::mapDistribute::mapDistribute() {} -//- Construct from components Foam::mapDistribute::mapDistribute ( const label constructSize, @@ -659,7 +657,6 @@ Foam::mapDistribute::mapDistribute {} -//- Construct from components Foam::mapDistribute::mapDistribute ( const label constructSize, diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C index 8df3c0a211a..c33f2a62484 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,6 @@ void Foam::mapDistributePolyMesh::calcPatchSizes() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -//- Construct from components Foam::mapDistributePolyMesh::mapDistributePolyMesh ( const polyMesh& mesh, diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C index 849b3ee3666..35b13d6cda9 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C @@ -31,7 +31,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Distribute list. template<class T> void Foam::mapDistribute::distribute ( @@ -381,7 +380,6 @@ void Foam::mapDistribute::distribute } -// Distribute list. template<class T, class CombineOp> void Foam::mapDistribute::distribute ( @@ -783,7 +781,6 @@ void Foam::mapDistribute::receive(PstreamBuffers& pBufs, List<T>& field) const } -// In case of no transform: copy elements template<class T> void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const { @@ -801,7 +798,6 @@ void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const } -// In case of no transform: copy elements template<class T> void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const { @@ -818,7 +814,6 @@ void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const } -// Calculate transformed elements. template<class T, class TransformOp> //, class CombineOp> void Foam::mapDistribute::applyTransforms ( @@ -849,7 +844,6 @@ void Foam::mapDistribute::applyTransforms } -// Calculate transformed elements. template<class T, class TransformOp> //, class CombineOp> void Foam::mapDistribute::applyInverseTransforms ( @@ -880,7 +874,6 @@ void Foam::mapDistribute::applyInverseTransforms } -//- Distribute data using default commsType. template<class T> void Foam::mapDistribute::distribute ( @@ -899,7 +892,6 @@ void Foam::mapDistribute::distribute } -//- Distribute data using default commsType. template<class T> void Foam::mapDistribute::distribute ( @@ -948,7 +940,7 @@ void Foam::mapDistribute::distribute ); } - //- Fill in transformed slots with copies + // Fill in transformed slots with copies if (dummyTransform) { applyDummyTransforms(fld); @@ -956,7 +948,6 @@ void Foam::mapDistribute::distribute } -//- Reverse distribute data using default commsType. template<class T> void Foam::mapDistribute::reverseDistribute ( @@ -1013,9 +1004,6 @@ void Foam::mapDistribute::reverseDistribute } -//- Reverse distribute data using default commsType. -// Since constructSize might be larger than supplied size supply -// a nullValue template<class T> void Foam::mapDistribute::reverseDistribute ( @@ -1079,7 +1067,6 @@ void Foam::mapDistribute::reverseDistribute } -//- Distribute data using default commsType. template<class T, class TransformOp> void Foam::mapDistribute::distribute ( diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C index 0a793a51553..6af1eb9be21 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C @@ -1130,7 +1130,6 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints } -// Reset motion by deleting old points void Foam::polyMesh::resetMotion() const { curMotionTimeIndex_ = 0; @@ -1138,7 +1137,6 @@ void Foam::polyMesh::resetMotion() const } -// Return parallel info const Foam::globalMeshData& Foam::polyMesh::globalData() const { if (globalMeshDataPtr_.empty()) diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C index 302afd7b49b..45494b3ce93 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C @@ -269,12 +269,6 @@ bool Foam::polyMesh::checkFaceSkewness } -// Check 1D/2Dness of edges. Gets passed the non-empty directions and -// checks all edges in the mesh whether they: -// - have no component in a non-empty direction or -// - are only in a singe non-empty direction. -// Empty direction info is passed in as a vector of labels (synchronised) -// which are 1 if the direction is non-empty, 0 if it is. bool Foam::polyMesh::checkEdgeAlignment ( const pointField& p, @@ -283,6 +277,13 @@ bool Foam::polyMesh::checkEdgeAlignment labelHashSet* setPtr ) const { + // Check 1D/2Dness of edges. Gets passed the non-empty directions and + // checks all edges in the mesh whether they: + // - have no component in a non-empty direction or + // - are only in a singe non-empty direction. + // Empty direction info is passed in as a vector of labels (synchronised) + // which are 1 if the direction is non-empty, 0 if it is. + if (debug) { InfoInFunction << "Checking edge alignment" << endl; diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C index ec1495c267a..143dfa79af7 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C @@ -127,7 +127,6 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells } -//- Set faces_, calculate cells and patchStarts. void Foam::polyMesh::setTopology ( const cellShapeList& cellsAsShapes, diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C index efc2c8adafd..96b06851ce4 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,11 +104,6 @@ Foam::label Foam::oldCyclicPolyPatch::findMaxArea } -// Get geometric zones of patch by looking at normals. -// Method 1: any edge with sharpish angle is edge between two halves. -// (this will handle e.g. wedge geometries). -// Also two fully disconnected regions will be handled this way. -// Method 2: sort faces into two halves based on face normal. bool Foam::oldCyclicPolyPatch::getGeometricHalves ( const primitivePatch& pp, @@ -116,6 +111,12 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves labelList& half1ToPatch ) const { + // Get geometric zones of patch by looking at normals. + // Method 1: any edge with sharpish angle is edge between two halves. + // (this will handle e.g. wedge geometries). + // Also two fully disconnected regions will be handled this way. + // Method 2: sort faces into two halves based on face normal. + // Calculate normals const vectorField& faceNormals = pp.faceNormals(); @@ -282,9 +283,6 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves } -// Given a split of faces into left and right half calculate the centres -// and anchor points. Transform the left points so they align with the -// right ones. void Foam::oldCyclicPolyPatch::getCentresAndAnchors ( const primitivePatch& pp, @@ -430,7 +428,6 @@ void Foam::oldCyclicPolyPatch::getCentresAndAnchors } -// Calculates faceMap and rotation. Returns true if all ok. bool Foam::oldCyclicPolyPatch::matchAnchors ( const bool report, diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C index 3664ce976f8..8ab5848a557 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C @@ -611,10 +611,6 @@ void Foam::processorPolyPatch::initOrder } -// Returns rotation. -// + -1 : no match -// + 0 : match -// + >0 : match if rotated clockwise by this amount Foam::label Foam::processorPolyPatch::matchFace ( const face& a, @@ -721,10 +717,6 @@ Foam::label Foam::processorPolyPatch::matchFace } -// Return new ordering. Ordering is -faceMap: for every face index -// the new face -rotation:for every new face the clockwise shift -// of the original face. Return false if nothing changes (faceMap -// is identity, rotation is 0) bool Foam::processorPolyPatch::order ( PstreamBuffers& pBufs, diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H index 0876c72b5ac..99dc029602d 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H @@ -342,6 +342,10 @@ public: // refer to *this (except for name() and type() etc.) virtual void initOrder(PstreamBuffers&, const primitivePatch&) const; + //- Returns rotation. + // -1 : no match + // 0 : match + // >0 : match if rotated clockwise by this amount static label matchFace ( const face& localFace, diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C index ba62b7bb250..02dcc6294ad 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C @@ -321,10 +321,6 @@ void Foam::processorCyclicPolyPatch::initOrder } -// Return new ordering. Ordering is -faceMap: for every face index -// the new face -rotation:for every new face the clockwise shift -// of the original face. Return false if nothing changes (faceMap -// is identity, rotation is 0) bool Foam::processorCyclicPolyPatch::order ( PstreamBuffers& pBufs, diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C index fcfb9d6c643..ad8e33d401f 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C @@ -293,7 +293,6 @@ const Foam::vectorField::subField Foam::polyPatch::faceAreas() const } -// Return the patch face neighbour cell centres Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const { tmp<vectorField> tcc(new vectorField(size())); diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C index a1e2b2dc597..4f2de619e96 100644 --- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C +++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Combine val with existing value at index template<class T, class CombineOp> void Foam::syncTools::combine ( @@ -58,7 +57,6 @@ void Foam::syncTools::combine } -// Combine val with existing value at (implicit index) e. template<class T, class CombineOp> void Foam::syncTools::combine ( diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C index efb2dc3ab72..181ddec3cb7 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C @@ -132,7 +132,6 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::read() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Read constructor given IOobject and a MeshType reference template<class ZoneType, class MeshType> Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh ( @@ -149,7 +148,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh } -// Construct given size. Zones will be set later template<class ZoneType, class MeshType> Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh ( @@ -205,7 +203,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::~ZoneMesh() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Map of zones for quick zone lookup template<class ZoneType, class MeshType> const Foam::Map<Foam::label>& Foam::ZoneMesh<ZoneType, MeshType>::zoneMap() const @@ -219,8 +216,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::zoneMap() const } -// Given a global object index, return the zone it is in. -// If object does not belong to any zones, return -1 template<class ZoneType, class MeshType> Foam::label Foam::ZoneMesh<ZoneType, MeshType>::whichZone ( @@ -241,7 +236,6 @@ Foam::label Foam::ZoneMesh<ZoneType, MeshType>::whichZone } -// Return a list of zone names template<class ZoneType, class MeshType> Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::types() const { @@ -258,7 +252,6 @@ Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::types() const } -// Return a list of zone names template<class ZoneType, class MeshType> Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::names() const { @@ -412,7 +405,6 @@ void Foam::ZoneMesh<ZoneType, MeshType>::clear() } -// Check zone definition template<class ZoneType, class MeshType> bool Foam::ZoneMesh<ZoneType, MeshType>::checkDefinition ( @@ -509,7 +501,6 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::checkParallelSync } -// Correct zone mesh after moving points template<class ZoneType, class MeshType> void Foam::ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p) { @@ -522,7 +513,6 @@ void Foam::ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p) } -// writeData member function required by regIOobject template<class ZoneType, class MeshType> bool Foam::ZoneMesh<ZoneType, MeshType>::writeData(Ostream& os) const { @@ -530,6 +520,7 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::writeData(Ostream& os) const return os.good(); } + // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // template<class ZoneType, class MeshType> diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C index 6533c3ca172..17ea3e17c29 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C +++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,8 +32,6 @@ Description // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Finds area, starting at faceI, delimited by borderEdge. -// Marks all visited faces (from face-edge-face walk) with currentZone. template < class BoolListType, @@ -42,9 +40,7 @@ template class PointField, class PointType > - -void -Foam::PatchTools::markZone +void Foam::PatchTools::markZone ( const PrimitivePatch<Face, FaceList, PointField, PointType>& p, const BoolListType& borderEdge, @@ -112,8 +108,6 @@ Foam::PatchTools::markZone } -// Finds areas delimited by borderEdge (or 'real' edges). -// Fills faceZone accordingly template < class BoolListType, @@ -154,9 +148,6 @@ Foam::PatchTools::markZones } - -// Finds areas delimited by borderEdge (or 'real' edges). -// Fills faceZone accordingly template < class BoolListType, diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C index a55421d5e85..fe85106c2b3 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C @@ -73,8 +73,6 @@ Foam::primitiveMesh::primitiveMesh() {} -// Construct from components -// WARNING: ASSUMES CORRECT ORDERING OF DATA. Foam::primitiveMesh::primitiveMesh ( const label nPoints, diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H index 78702ecaf58..143b38419dc 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H @@ -360,6 +360,10 @@ protected: ) const; //- Check face angles + // Allows a slight non-convexity. E.g. maxDeg = 10 allows for + // angles < 190 (or 10 degrees concavity) (if truly concave and + // points not visible from face centre the face-pyramid check in + // checkMesh will fail) bool checkFaceAngles ( const pointField& points, diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C index 9f26dd28a83..a25bf4da61a 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C @@ -664,10 +664,6 @@ bool Foam::primitiveMesh::checkFaceSkewness } -// Check convexity of angles in a face. Allow a slight non-convexity. -// E.g. maxDeg = 10 allows for angles < 190 (or 10 degrees concavity) -// (if truly concave and points not visible from face centre the face-pyramid -// check in checkMesh will fail) bool Foam::primitiveMesh::checkFaceAngles ( const pointField& points, @@ -966,8 +962,6 @@ bool Foam::primitiveMesh::checkConcaveCells } -// Topological tests - bool Foam::primitiveMesh::checkUpperTriangular ( const bool report, @@ -1229,7 +1223,6 @@ bool Foam::primitiveMesh::checkCellsZipUp } -// Vertices of face within point range and unique. bool Foam::primitiveMesh::checkFaceVertices ( const bool report, @@ -1375,7 +1368,6 @@ bool Foam::primitiveMesh::checkPoints } -// Check if all points on face are shared between faces. bool Foam::primitiveMesh::checkDuplicateFaces ( const label faceI, @@ -1417,7 +1409,6 @@ bool Foam::primitiveMesh::checkDuplicateFaces } -// Check that shared points are in consecutive order. bool Foam::primitiveMesh::checkCommonOrder ( const label faceI, @@ -1579,8 +1570,6 @@ bool Foam::primitiveMesh::checkCommonOrder } -// Checks common vertices between faces. If more than 2 they should be -// consecutive on both faces. bool Foam::primitiveMesh::checkFaceFaces ( const bool report, diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C index cb516793859..4c0a7083173 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C @@ -31,7 +31,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Returns edgeI between two points. Foam::label Foam::primitiveMesh::getEdge ( List<DynamicList<label>>& pe, @@ -670,6 +669,4 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges(const label cellI) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // ************************************************************************* // diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C index fba0466599e..563a77a75eb 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,14 +29,12 @@ License namespace Foam { -defineTypeNameAndDebug(patchZones, 0); + defineTypeNameAndDebug(patchZones, 0); } // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -// Gets labels of changed faces and propagates them to the edges. Returns -// labels of edges changed. Foam::labelList Foam::patchZones::faceToEdge ( const labelList& changedFaces, @@ -71,7 +69,6 @@ Foam::labelList Foam::patchZones::faceToEdge } -// Reverse of faceToEdge: gets edges and returns faces Foam::labelList Foam::patchZones::edgeToFace(const labelList& changedEdges) { labelList changedFaces(pp_.size(), -1); @@ -102,7 +99,6 @@ Foam::labelList Foam::patchZones::edgeToFace(const labelList& changedEdges) } -// Finds area, starting at faceI, delimited by borderEdge void Foam::patchZones::markZone(label faceI) { // List of faces whose faceZone has been set. @@ -148,7 +144,6 @@ void Foam::patchZones::markZone(label faceI) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from components Foam::patchZones::patchZones ( const primitivePatch& pp, diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C index 5b721d73261..b35f016c2d4 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,13 +30,12 @@ License namespace Foam { -defineTypeNameAndDebug(walkPatch, 0); + defineTypeNameAndDebug(walkPatch, 0); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Get other face using v0, v1 (in localFaces numbering). Or -1. Foam::label Foam::walkPatch::getNeighbour ( const label faceI, @@ -124,8 +123,6 @@ Foam::label Foam::walkPatch::getNeighbour } -// Gets labels of changed faces and enterVertices on faces. -// Returns labels of faces changed and enterVertices on them. void Foam::walkPatch::faceToFace ( const labelList& changedFaces, @@ -186,7 +183,6 @@ void Foam::walkPatch::faceToFace // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from components Foam::walkPatch::walkPatch ( const primitivePatch& pp, diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C index 7f222fb8a80..aa101235d5d 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C +++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Calculate base point and unit normal vector from plane equation void Foam::plane::calcPntAndVec(const scalarList& C) { if (mag(C[0]) > VSMALL) @@ -110,7 +109,6 @@ void Foam::plane::calcPntAndVec // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from normal vector through the origin Foam::plane::plane(const vector& normalVector) : unitVector_(normalVector), @@ -131,7 +129,6 @@ Foam::plane::plane(const vector& normalVector) } -// Construct from point and normal vector Foam::plane::plane(const point& basePoint, const vector& normalVector) : unitVector_(normalVector), @@ -152,14 +149,12 @@ Foam::plane::plane(const point& basePoint, const vector& normalVector) } -// Construct from plane equation Foam::plane::plane(const scalarList& C) { calcPntAndVec(C); } -// Construct from three points Foam::plane::plane ( const point& a, @@ -171,7 +166,6 @@ Foam::plane::plane } -// Construct from dictionary Foam::plane::plane(const dictionary& dict) : unitVector_(vector::zero), @@ -221,7 +215,6 @@ Foam::plane::plane(const dictionary& dict) } -// Construct from Istream. Assumes point and normal vector. Foam::plane::plane(Istream& is) : unitVector_(is), @@ -244,21 +237,18 @@ Foam::plane::plane(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Return plane normal vector const Foam::vector& Foam::plane::normal() const { return unitVector_; } -// Return plane base point const Foam::point& Foam::plane::refPoint() const { return basePoint_; } -// Return coefficients for plane equation: ax + by + cz + d = 0 Foam::FixedList<Foam::scalar, 4> Foam::plane::planeCoeffs() const { FixedList<scalar, 4> C(4); @@ -306,21 +296,18 @@ Foam::FixedList<Foam::scalar, 4> Foam::plane::planeCoeffs() const } -// Return nearest point in the plane for the given point Foam::point Foam::plane::nearestPoint(const point& p) const { return p - unitVector_*((p - basePoint_) & unitVector_); } -// Return distance from the given point to the plane Foam::scalar Foam::plane::distance(const point& p) const { return mag((p - basePoint_) & unitVector_); } -// Cutting point for plane and line defined by origin and direction Foam::scalar Foam::plane::normalIntersect ( const point& pnt0, @@ -333,7 +320,6 @@ Foam::scalar Foam::plane::normalIntersect } -// Cutting line of two planes Foam::plane::ray Foam::plane::planeIntersect(const plane& plane2) const { // Mathworld plane-plane intersection. Assume there is a point on the @@ -401,7 +387,6 @@ Foam::plane::ray Foam::plane::planeIntersect(const plane& plane2) const } -// Cutting point of three planes Foam::point Foam::plane::planePlaneIntersect ( const plane& plane2, diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C index 9180eb09860..163476a6b32 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C +++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,18 +119,19 @@ void Foam::tetrahedron<Point, PointRef>::tetOverlap } -// (Probably very inefficient) minimum containment sphere calculation. -// From http://www.imr.sandia.gov/papers/imr11/shewchuk2.pdf: -// Sphere ctr is smallest one of -// - tet circumcentre -// - triangle circumcentre -// - edge mids template<class Point, class PointRef> Foam::pointHit Foam::tetrahedron<Point, PointRef>::containmentSphere ( const scalar tol ) const { + // (Probably very inefficient) minimum containment sphere calculation. + // From http://www.imr.sandia.gov/papers/imr11/shewchuk2.pdf: + // Sphere ctr is smallest one of + // - tet circumcentre + // - triangle circumcentre + // - edge mids + const scalar fac = 1 + tol; // Halve order of tolerance for comparisons of sqr. diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C index 766aa507274..d7bc032e4cb 100644 --- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C +++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C @@ -180,7 +180,6 @@ Foam::treeBoundBox Foam::treeBoundBox::subBbox(const direction octant) const } -// Octant to bounding box using permutation only. Foam::treeBoundBox Foam::treeBoundBox::subBbox ( const point& mid, @@ -230,24 +229,6 @@ Foam::treeBoundBox Foam::treeBoundBox::subBbox } -// line intersection. Returns true if line (start to end) inside -// bb or intersects bb. Sets pt to intersection. -// -// Sutherlands algorithm: -// loop -// - start = intersection of line with one of the planes bounding -// the bounding box -// - stop if start inside bb (return true) -// - stop if start and end in same 'half' (e.g. both above bb) -// (return false) -// -// Uses posBits to efficiently determine 'half' in which start and end -// point are. -// -// Note: -// - sets coordinate to exact position: e.g. pt.x() = min().x() -// since plane intersect routine might have truncation error. -// This makes sure that posBits tests 'inside' bool Foam::treeBoundBox::intersects ( const point& overallStart, @@ -258,6 +239,22 @@ bool Foam::treeBoundBox::intersects direction& ptOnFaces ) const { + // Sutherlands algorithm: + // loop + // - start = intersection of line with one of the planes bounding + // the bounding box + // - stop if start inside bb (return true) + // - stop if start and end in same 'half' (e.g. both above bb) + // (return false) + // + // Uses posBits to efficiently determine 'half' in which start and end + // point are. + // + // Note: + // - sets coordinate to exact position: e.g. pt.x() = min().x() + // since plane intersect routine might have truncation error. + // This makes sure that posBits tests 'inside' + const direction endBits = posBits(end); pt = start; @@ -393,9 +390,8 @@ bool Foam::treeBoundBox::intersects bool Foam::treeBoundBox::contains(const vector& dir, const point& pt) const { - // // Compare all components against min and max of bb - // + for (direction cmpt=0; cmpt<3; cmpt++) { if (pt[cmpt] < min()[cmpt]) @@ -430,7 +426,6 @@ bool Foam::treeBoundBox::contains(const vector& dir, const point& pt) const } -// Code position of pt on bounding box faces Foam::direction Foam::treeBoundBox::faceBits(const point& pt) const { direction faceBits = 0; @@ -464,7 +459,6 @@ Foam::direction Foam::treeBoundBox::faceBits(const point& pt) const } -// Code position of point relative to box Foam::direction Foam::treeBoundBox::posBits(const point& pt) const { direction posBits = 0; @@ -499,8 +493,6 @@ Foam::direction Foam::treeBoundBox::posBits(const point& pt) const } -// nearest and furthest corner coordinate. -// !names of treeBoundBox::min() and treeBoundBox::max() are confusing! void Foam::treeBoundBox::calcExtremities ( const point& pt, @@ -558,9 +550,6 @@ Foam::scalar Foam::treeBoundBox::maxDist(const point& pt) const } -// Distance comparator -// Compare all vertices of bounding box against all of other bounding -// box to see if all vertices of one are nearer Foam::label Foam::treeBoundBox::distanceCmp ( const point& pt, diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C index 4ac7a9dcb50..96ff1a31943 100644 --- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C +++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,53 +25,48 @@ License #include "tensor2D.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // template<> -const char* const tensor2D::typeName = "tensor2D"; +const char* const Foam::tensor2D::typeName = "tensor2D"; template<> -const char* tensor2D::componentNames[] = +const char* Foam::tensor2D::componentNames[] = { "xx", "xy", "yx", "yy" }; template<> -const tensor2D tensor2D::zero +const Foam::tensor2D Foam::tensor2D::zero ( 0, 0, 0, 0 ); template<> -const tensor2D tensor2D::one +const Foam::tensor2D Foam::tensor2D::one ( 1, 1, 1, 1 ); template<> -const tensor2D tensor2D::max +const Foam::tensor2D Foam::tensor2D::max ( VGREAT, VGREAT, VGREAT, VGREAT ); template<> -const tensor2D tensor2D::min +const Foam::tensor2D Foam::tensor2D::min ( -VGREAT, -VGREAT, -VGREAT, -VGREAT ); template<> -const tensor2D tensor2D::I +const Foam::tensor2D Foam::tensor2D::I ( 1, 0, 0, 1 @@ -80,8 +75,7 @@ const tensor2D tensor2D::I // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Return eigenvalues in ascending order of absolute values -vector2D eigenValues(const tensor2D& t) +Foam::vector2D Foam::eigenValues(const tensor2D& t) { scalar i = 0; scalar ii = 0; @@ -132,7 +126,7 @@ vector2D eigenValues(const tensor2D& t) } -vector2D eigenVector(const tensor2D& t, const scalar lambda) +Foam::vector2D Foam::eigenVector(const tensor2D& t, const scalar lambda) { if (lambda < SMALL) { @@ -161,7 +155,7 @@ vector2D eigenVector(const tensor2D& t, const scalar lambda) } -tensor2D eigenVectors(const tensor2D& t) +Foam::tensor2D Foam::eigenVectors(const tensor2D& t) { vector2D evals(eigenValues(t)); @@ -175,8 +169,4 @@ tensor2D eigenVectors(const tensor2D& t) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C index 6eec73b476b..49c855fcde4 100644 --- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C +++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from Istream template<class Form, class Cmpt, int nCmpt> Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace ( @@ -53,7 +52,6 @@ Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace } -// Return a string representation template<class Form, class Cmpt, int nCmpt> Foam::word Foam::name diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C index 1ff04b5316d..f5be21f9417 100644 --- a/src/OpenFOAM/primitives/bools/Switch/Switch.C +++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,8 +29,6 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -// NB: values chosen such that bitwise '&' 0x1 yields the bool value -// INVALID is also evaluates to false, but don't rely on that const char* Foam::Switch::names[Foam::Switch::INVALID+1] = { "false", "true", @@ -38,7 +36,7 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] = "no", "yes", "n", "y", "f", "t", - "none", "true", // is there a reasonable counterpart to "none"? + "none", "true", // Is there a reasonable counterpart to "none"? "invalid" }; diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C index b9f16b6b35d..f0c51aa45a7 100644 --- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C +++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C @@ -187,7 +187,7 @@ Description // acceptable. Do NOT use for cryptographic purposes. // ---------------------------------------------------------------------------- -//- Specialized little-endian code +// Specialized little-endian code #if !defined (__BYTE_ORDER) || (__BYTE_ORDER == __LITTLE_ENDIAN) static unsigned jenkins_hashlittle ( diff --git a/src/OpenFOAM/primitives/strings/string/string.C b/src/OpenFOAM/primitives/strings/string/string.C index 9e17488d1e2..7645a4d6687 100644 --- a/src/OpenFOAM/primitives/strings/string/string.C +++ b/src/OpenFOAM/primitives/strings/string/string.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,6 @@ const Foam::string Foam::string::null; // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Count and return the number of a given character in the string Foam::string::size_type Foam::string::count(const char c) const { size_type cCount = 0; @@ -53,7 +52,6 @@ Foam::string::size_type Foam::string::count(const char c) const } -// Replace first occurence of sub-string oldStr with newStr Foam::string& Foam::string::replace ( const string& oldStr, @@ -72,7 +70,6 @@ Foam::string& Foam::string::replace } -// Replace all occurences of sub-string oldStr with newStr Foam::string& Foam::string::replaceAll ( const string& oldStr, @@ -102,7 +99,6 @@ Foam::string& Foam::string::expand(const bool allowEmpty) } -// Remove repeated characters returning true if string changed bool Foam::string::removeRepeated(const char character) { bool changed = false; @@ -141,7 +137,6 @@ bool Foam::string::removeRepeated(const char character) } -// Return string with repeated characters removed Foam::string Foam::string::removeRepeated(const char character) const { string str(*this); @@ -150,7 +145,6 @@ Foam::string Foam::string::removeRepeated(const char character) const } -// Remove trailing character returning true if string changed bool Foam::string::removeTrailing(const char character) { bool changed = false; @@ -166,7 +160,6 @@ bool Foam::string::removeTrailing(const char character) } -// Return string with trailing character removed Foam::string Foam::string::removeTrailing(const char character) const { string str(*this); diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C index 915173a1426..887b5ac0289 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,8 +30,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -//- Calculate map from new patch faces to old patch faces. -1 where -// could not map. Foam::labelList Foam::fvMeshAdder::calcPatchMap ( const label oldStart, @@ -61,7 +59,6 @@ Foam::labelList Foam::fvMeshAdder::calcPatchMap // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Inplace add mesh1 to mesh0 Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::fvMeshAdder::add ( fvMesh& mesh0, diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C index 449f1f24c45..4aa9b2f99da 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C +++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C @@ -39,7 +39,7 @@ License namespace Foam { -defineTypeNameAndDebug(meshCutAndRemove, 0); + defineTypeNameAndDebug(meshCutAndRemove, 0); } @@ -89,7 +89,6 @@ bool Foam::meshCutAndRemove::isIn // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Returns the cell in cellLabels that is cut. Or -1. Foam::label Foam::meshCutAndRemove::findCutCell ( const cellCuts& cuts, @@ -109,10 +108,6 @@ Foam::label Foam::meshCutAndRemove::findCutCell } -//- Returns first pointI in pointLabels that uses an internal -// face. Used to find point to inflate cell/face from (has to be -// connected to internal face). Returns -1 (so inflate from nothing) if -// none found. Foam::label Foam::meshCutAndRemove::findInternalFacePoint ( const labelList& pointLabels @@ -145,8 +140,6 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint } -// Find point on face that is part of original mesh and that is point connected -// to the patch Foam::label Foam::meshCutAndRemove::findPatchFacePoint ( const face& f, @@ -177,8 +170,6 @@ Foam::label Foam::meshCutAndRemove::findPatchFacePoint } -// Get new owner and neighbour of face. Checks anchor points to see if -// cells have been removed. void Foam::meshCutAndRemove::faceCells ( const cellCuts& cuts, @@ -244,7 +235,6 @@ void Foam::meshCutAndRemove::getZoneInfo } -// Adds a face from point. void Foam::meshCutAndRemove::addFace ( polyTopoChange& meshMod, @@ -407,7 +397,6 @@ void Foam::meshCutAndRemove::modFace } -// Copies face starting from startFp up to and including endFp. void Foam::meshCutAndRemove::copyFace ( const face& f, @@ -474,8 +463,6 @@ void Foam::meshCutAndRemove::splitFace } -// Adds additional vertices (from edge cutting) to face. Used for faces which -// are not split but still might use edge that has been cut. Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label faceI) const { const face& f = mesh().faces()[faceI]; diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C index f7a9174d8e9..46250fb6b04 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C @@ -133,7 +133,6 @@ void Foam::motionSmootherAlgo::checkConstraints } -// Average of connected points. template<class Type> Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>> Foam::motionSmootherAlgo::avg @@ -232,7 +231,6 @@ Foam::motionSmootherAlgo::avg } -// smooth field (point-jacobi) template<class Type> void Foam::motionSmootherAlgo::smooth ( @@ -257,7 +255,6 @@ void Foam::motionSmootherAlgo::smooth } -//- Test synchronisation of generic field (not positions!) on points template<class Type, class CombineOp> void Foam::motionSmootherAlgo::testSyncField ( diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C index 017fc1ec132..2bd277acac1 100644 --- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C +++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,11 +33,7 @@ License namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defineTypeNameAndDebug(polyMeshGeometry, 0); - + defineTypeNameAndDebug(polyMeshGeometry, 0); } @@ -349,7 +345,6 @@ Foam::polyMeshGeometry::polyMeshGeometry(const polyMesh& mesh) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -//- Take over properties from mesh void Foam::polyMeshGeometry::correct() { faceAreas_ = mesh_.faceAreas(); @@ -359,7 +354,6 @@ void Foam::polyMeshGeometry::correct() } -//- Recalculate on selected faces void Foam::polyMeshGeometry::correct ( const pointField& p, diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C index eb4a2eb36d3..6805daf9590 100644 --- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C +++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,6 @@ Foam::attachPolyTopoChanger::attachPolyTopoChanger // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -//- Attach mesh void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches) { if (debug) diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C index ff47fa42247..66288cc0ce6 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C @@ -34,9 +34,7 @@ License namespace Foam { - -defineTypeNameAndDebug(refinementHistory, 0); - + defineTypeNameAndDebug(refinementHistory, 0); } @@ -108,7 +106,6 @@ void Foam::refinementHistory::writeDebug // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -//- Construct null Foam::refinementHistory::splitCell8::splitCell8() : parent_(-1), @@ -116,7 +113,6 @@ Foam::refinementHistory::splitCell8::splitCell8() {} -//- Construct as child element of parent Foam::refinementHistory::splitCell8::splitCell8(const label parent) : parent_(parent), @@ -124,14 +120,12 @@ Foam::refinementHistory::splitCell8::splitCell8(const label parent) {} -//- Construct from Istream Foam::refinementHistory::splitCell8::splitCell8(Istream& is) { is >> *this; } -//- Construct as (deep) copy. Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& sc) : parent_(sc.parent_), @@ -362,7 +356,6 @@ Foam::refinementHistory::refinementHistory(const IOobject& io) } -//- Read or construct Foam::refinementHistory::refinementHistory ( const IOobject& io, diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C index 425a0afffe0..bce0dade15e 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C @@ -42,8 +42,8 @@ namespace Foam defineTypeNameAndDebug(removePoints, 0); -//- Combine-reduce operator to combine data on faces. Takes care -// of reverse orientation on coupled face. +// Combine-reduce operator to combine data on faces. Takes care +// of reverse orientation on coupled face. template<class T, template<class> class CombineOp> class faceEqOp { @@ -71,31 +71,11 @@ public: } }; - -//// Dummy transform for List. Used in synchronisation. -//template<class T> -//class dummyTransformList -//{ -//public: -// void operator()(const coupledPolyPatch&, Field<List<T>>&) const -// {} -//}; -//// Dummy template specialisation. Used in synchronisation. -//template<> -//class pTraits<boolList> -//{ -//public: -// -// //- Component type -// typedef label cmptType; -//}; - - } + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Change the vertices of the face whilst keeping everything else the same. void Foam::removePoints::modifyFace ( const label faceI, @@ -148,7 +128,6 @@ void Foam::removePoints::modifyFace // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from mesh Foam::removePoints::removePoints ( const polyMesh& mesh, diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C index 3a797dbb9a4..f34c29745f3 100644 --- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C +++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ License namespace Foam { - -defineTypeNameAndDebug(featureEdgeMesh, 0); - + defineTypeNameAndDebug(featureEdgeMesh, 0); } @@ -64,7 +62,6 @@ Foam::featureEdgeMesh::featureEdgeMesh(const IOobject& io) } -//- Construct from components Foam::featureEdgeMesh::featureEdgeMesh ( const IOobject& io, diff --git a/src/engine/engineTime/engineTime.C b/src/engine/engineTime/engineTime.C index 0933218bd73..a70f6bba772 100644 --- a/src/engine/engineTime/engineTime.C +++ b/src/engine/engineTime/engineTime.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ void Foam::engineTime::timeAdjustment() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -//- Construct from objectRegistry arguments Foam::engineTime::engineTime ( const word& name, diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C index c65ae246b1d..5d7dd92b79a 100644 --- a/src/fileFormats/coordSet/coordSet.C +++ b/src/fileFormats/coordSet/coordSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,6 @@ const Foam::NamedEnum<Foam::coordSet::coordFormat, 5> // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -//- Construct from components Foam::coordSet::coordSet ( const word& name, @@ -65,7 +64,6 @@ Foam::coordSet::coordSet {} -//- Construct from components Foam::coordSet::coordSet ( const word& name, diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index a6ccd8ab03c..1b26f9a55de 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -864,7 +864,6 @@ bool Foam::fvMesh::writeObjects } -//- Write mesh using IO settings from the time bool Foam::fvMesh::write() const { bool ok = true; diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index 91ce9cce759..f6b5508eb10 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C @@ -2390,7 +2390,6 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark } -//- Count global number of extruded faces Foam::label Foam::autoLayerDriver::countExtrusion ( const indirectPrimitivePatch& pp, diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C index b84da4a752e..1847f050ea2 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C @@ -1743,7 +1743,6 @@ Foam::labelList Foam::meshRefinement::intersectedPoints() const } -//- Create patch from set of patches Foam::autoPtr<Foam::indirectPrimitivePatch> Foam::meshRefinement::makePatch ( const polyMesh& mesh, @@ -2757,7 +2756,6 @@ const } -//- Return either time().constant() or oldInstance Foam::word Foam::meshRefinement::timeName() const { if (overwrite_ && mesh_.time().timeIndex() == 0) diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C index dc84c4d7ea8..7649aef26c4 100644 --- a/src/meshTools/indexedOctree/treeDataEdge.C +++ b/src/meshTools/indexedOctree/treeDataEdge.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License namespace Foam { -defineTypeNameAndDebug(treeDataEdge, 0); + defineTypeNameAndDebug(treeDataEdge, 0); } @@ -128,8 +128,6 @@ Foam::pointField Foam::treeDataEdge::shapePoints() const } -//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface. -// Only makes sense for closed surfaces. Foam::volumeType Foam::treeDataEdge::getVolumeType ( const indexedOctree<treeDataEdge>& oc, @@ -140,7 +138,6 @@ Foam::volumeType Foam::treeDataEdge::getVolumeType } -// Check if any point on shape is inside cubeBb. bool Foam::treeDataEdge::overlaps ( const label index, @@ -158,7 +155,6 @@ bool Foam::treeDataEdge::overlaps } -// Check if any point on shape is inside sphere. bool Foam::treeDataEdge::overlaps ( const label index, diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C index e80b5635863..6a9c1889887 100644 --- a/src/meshTools/indexedOctree/treeDataFace.C +++ b/src/meshTools/indexedOctree/treeDataFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,9 +31,9 @@ License namespace Foam { -defineTypeNameAndDebug(treeDataFace, 0); + defineTypeNameAndDebug(treeDataFace, 0); -scalar treeDataFace::tolSqr = sqr(1e-6); + scalar treeDataFace::tolSqr = sqr(1e-6); } @@ -178,8 +178,6 @@ Foam::pointField Foam::treeDataFace::shapePoints() const } -//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface. -// Only makes sense for closed surfaces. Foam::volumeType Foam::treeDataFace::getVolumeType ( const indexedOctree<treeDataFace>& oc, diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C index 999ad1856d6..e4c6beda2a5 100644 --- a/src/meshTools/indexedOctree/treeDataPoint.C +++ b/src/meshTools/indexedOctree/treeDataPoint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,8 +88,6 @@ Foam::pointField Foam::treeDataPoint::shapePoints() const } -//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface. -// Only makes sense for closed surfaces. Foam::volumeType Foam::treeDataPoint::getVolumeType ( const indexedOctree<treeDataPoint>& oc, @@ -100,7 +98,6 @@ Foam::volumeType Foam::treeDataPoint::getVolumeType } -// Check if any point on shape is inside cubeBb. bool Foam::treeDataPoint::overlaps ( const label index, @@ -112,7 +109,6 @@ bool Foam::treeDataPoint::overlaps } -// Check if any point on shape is inside sphere. bool Foam::treeDataPoint::overlaps ( const label index, diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C index 40d0c4f17eb..2beba5e37ee 100644 --- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C +++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C @@ -146,8 +146,6 @@ Foam::pointField Foam::treeDataPrimitivePatch<PatchType>::shapePoints() const } -//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface. -// Only makes sense for closed surfaces. template<class PatchType> Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType ( diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C index 01b726586e7..24753a108b0 100644 --- a/src/meshTools/meshTools/meshTools.C +++ b/src/meshTools/meshTools/meshTools.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Check if n is in same direction as normals of all faceLabels bool Foam::meshTools::visNormal ( const vector& n, @@ -668,7 +667,6 @@ void Foam::meshTools::constrainToMeshCentre } -//- Set the constrained components of directions/velocity to zero void Foam::meshTools::constrainDirection ( const polyMesh& mesh, diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C index 6f6f23b75cf..24e7d39a17f 100644 --- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C +++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -230,7 +230,6 @@ Foam::primitiveMeshGeometry::primitiveMeshGeometry // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -//- Take over properties from mesh void Foam::primitiveMeshGeometry::correct() { faceAreas_ = mesh_.faceAreas(); @@ -240,7 +239,6 @@ void Foam::primitiveMeshGeometry::correct() } -//- Recalculate on selected faces void Foam::primitiveMeshGeometry::correct ( const pointField& p, diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C index 507b3d38262..0b9672fa038 100644 --- a/src/meshTools/searchableSurface/searchableSurfaces.C +++ b/src/meshTools/searchableSurface/searchableSurfaces.C @@ -27,9 +27,7 @@ License #include "searchableSurfacesQueries.H" #include "ListOps.H" #include "Time.H" -//#include "vtkSetWriter.H" #include "DynamicField.H" -//#include "OBJstream.H" #include "PatchTools.H" #include "triSurfaceMesh.H" @@ -37,13 +35,12 @@ License namespace Foam { -defineTypeNameAndDebug(searchableSurfaces, 0); + defineTypeNameAndDebug(searchableSurfaces, 0); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -//- Is edge connected to triangle bool Foam::searchableSurfaces::connected ( const triSurface& s, @@ -325,8 +322,6 @@ void Foam::searchableSurfaces::findAnyIntersection } -//- Find all intersections in order from start to end. Returns for -// every hit the surface and the hit info. void Foam::searchableSurfaces::findAllIntersections ( const pointField& start, @@ -372,7 +367,6 @@ void Foam::searchableSurfaces::findNearestIntersection } -// Find nearest. Return -1 or nearest point void Foam::searchableSurfaces::findNearest ( const pointField& samples, @@ -393,7 +387,6 @@ void Foam::searchableSurfaces::findNearest } -// Find nearest. Return -1 or nearest point void Foam::searchableSurfaces::findNearest ( const pointField& samples, @@ -415,7 +408,7 @@ void Foam::searchableSurfaces::findNearest ); } -//- Calculate bounding box + Foam::boundBox Foam::searchableSurfaces::bounds() const { return searchableSurfacesQueries::bounds @@ -426,7 +419,6 @@ Foam::boundBox Foam::searchableSurfaces::bounds() const } -//- Calculate point which is on a set of surfaces. Foam::pointIndexHit Foam::searchableSurfaces::facesIntersection ( const scalar initDistSqr, diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C index 4a3a8dcf41e..9220198b5f2 100644 --- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C +++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C @@ -33,7 +33,7 @@ License namespace Foam { -defineTypeNameAndDebug(searchableSurfacesQueries, 0); + defineTypeNameAndDebug(searchableSurfacesQueries, 0); } @@ -849,7 +849,6 @@ Foam::boundBox Foam::searchableSurfacesQueries::bounds } -//- Calculate point which is on a set of surfaces. Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection ( const PtrList<searchableSurface>& allSurfaces, diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C index 80528e3192d..cd52d72ed96 100644 --- a/src/meshTools/sets/topoSets/cellZoneSet.C +++ b/src/meshTools/sets/topoSets/cellZoneSet.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -238,7 +238,6 @@ label cellZoneSet::maxSize(const polyMesh& mesh) const } -//- Write using given format, version and compression bool cellZoneSet::writeObject ( IOstream::streamFormat s, diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C index 0467956ef77..34ce4249afa 100644 --- a/src/meshTools/sets/topoSets/faceZoneSet.C +++ b/src/meshTools/sets/topoSets/faceZoneSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -331,7 +331,6 @@ label faceZoneSet::maxSize(const polyMesh& mesh) const } -//- Write using given format, version and compression bool faceZoneSet::writeObject ( IOstream::streamFormat s, diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C index 8a02f718a24..7bfc299ca47 100644 --- a/src/meshTools/sets/topoSets/pointZoneSet.C +++ b/src/meshTools/sets/topoSets/pointZoneSet.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-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -239,7 +239,6 @@ label pointZoneSet::maxSize(const polyMesh& mesh) const } -//- Write using given format, version and compression bool pointZoneSet::writeObject ( IOstream::streamFormat s, diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C index 8212899215a..2462180a123 100644 --- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C +++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,15 +39,14 @@ License namespace Foam { -defineTypeNameAndDebug(surfaceFeatures, 0); + defineTypeNameAndDebug(surfaceFeatures, 0); -const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0)); + const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0)); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -//- Get nearest point on edge and classify position on edge. Foam::pointIndexHit Foam::surfaceFeatures::edgeNearest ( const point& start, @@ -498,7 +497,6 @@ Foam::surfaceFeatures::surfaceFeatures } -//- Construct from dictionary Foam::surfaceFeatures::surfaceFeatures ( const triSurface& surf, @@ -513,7 +511,6 @@ Foam::surfaceFeatures::surfaceFeatures {} -//- Construct from file Foam::surfaceFeatures::surfaceFeatures ( const triSurface& surf, @@ -618,7 +615,6 @@ Foam::surfaceFeatures::surfaceFeatures } -//- Construct as copy Foam::surfaceFeatures::surfaceFeatures(const surfaceFeatures& sf) : surf_(sf.surface()), diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C index 0c21a1b380b..029b28c5a91 100644 --- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C +++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C @@ -624,8 +624,6 @@ Foam::scalar Foam::triSurfaceTools::edgeCosAngle } -//- Calculate minimum (cos of) edge angle using addressing from collapsing -// edge to v1 at pt. Foam::scalar Foam::triSurfaceTools::collapseMinCosAngle ( const triSurface& surf, diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C index dc4cb717d79..c63a9a1422d 100644 --- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C +++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,12 +126,6 @@ void Foam::wallBoundedParticle::patchInteraction // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -//- Track particle to a given position and returns 1.0 if the -// trajectory is completed without hitting a face otherwise -// stops at the face and returns the fraction of the trajectory -// completed. -// on entry 'stepFraction()' should be set to the fraction of the -// time-step at which the tracking starts. template<class TrackData> Foam::scalar Foam::wallBoundedParticle::trackToEdge ( @@ -139,6 +133,13 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge const vector& endPosition ) { + // Track particle to a given position and returns 1.0 if the + // trajectory is completed without hitting a face otherwise + // stops at the face and returns the fraction of the trajectory + // completed. + // on entry 'stepFraction()' should be set to the fraction of the + // time-step at which the tracking starts. + // Are we on a track face? If not we do a topological walk. // Particle: diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C index 37d0bd98d56..9f133254786 100644 --- a/src/sampling/probes/probesTemplates.C +++ b/src/sampling/probes/probesTemplates.C @@ -34,7 +34,6 @@ License namespace Foam { -//- Comparison operator for probes class template<class T> class isNotEqOp { diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C index 3d59eda215d..ecd9105aa6d 100644 --- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C +++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,6 @@ namespace Foam // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // -//- Calculate and return the laminar viscosity void Foam::incompressibleTwoPhaseMixture::calcNu() { nuModel1_->correct(); -- GitLab