From f281f77e4ace5e89f49fba23e97968e5b0f8b431 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 28 Nov 2016 21:23:00 +0000 Subject: [PATCH] Updated member type comments Resolves bug-report http://bugs.openfoam.org/view.php?id=2356 --- src/ODE/ODESolvers/ODESolver/ODESolver.C | 2 +- .../DictionaryBase/DictionaryBase.C | 2 +- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 1 + src/OpenFOAM/db/Time/Time.C | 2 +- src/OpenFOAM/db/Time/Time.H | 2 + .../db/dynamicLibrary/codedBase/codedBase.C | 5 +- .../GAMGAgglomeration/GAMGAgglomeration.C | 2 +- .../mapDistribute/mapDistributeBase.C | 4 +- .../basic/coupled/coupledPolyPatch.C | 2 +- .../constraint/wedge/wedgePolyPatch.C | 3 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 3 +- .../functions/Function1/Table/TableBase.C | 2 +- .../functions/Function1/Table/TableBase.H | 3 + .../RAS/kkLOmega/kkLOmega.H | 4 +- .../RAS/qZeta/qZeta.C | 2 +- .../Base/kOmegaSST/kOmegaSSTBase.C | 2 +- .../SpalartAllmarasIDDES.C | 6 +- .../LES/dynamicKEqn/dynamicKEqn.C | 2 +- .../LES/dynamicLagrangian/dynamicLagrangian.C | 4 +- .../RAS/realizableKE/realizableKE.C | 2 +- .../turbulenceModels/RAS/v2f/v2f.C | 2 +- .../kLowReWallFunctionFvPatchScalarField.C | 4 +- src/conversion/meshReader/meshReader.H | 5 +- .../meshReader/starcd/STARCDMeshReader.C | 4 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 18 +-- .../dynamicRefineFvMesh/dynamicRefineFvMesh.H | 4 +- src/dynamicMesh/boundaryMesh/boundaryMesh.H | 1 + .../meshCut/cellLooper/cellLooper.C | 7 +- .../meshCut/cellLooper/cellLooper.H | 3 +- .../componentDisplacementMotionSolver.H | 4 +- .../componentVelocityMotionSolver.H | 4 +- src/edgeMesh/edgeMesh.H | 3 +- .../edgeMeshFormats/starcd/STARCDedgeFormat.C | 2 +- .../edgeMeshFormats/starcd/STARCDedgeFormat.H | 1 + .../edgeMeshFormats/vtk/VTKedgeFormat.C | 4 +- src/edgeMesh/edgeMeshI.H | 26 +++-- .../extendedEdgeMesh/extendedEdgeMesh.C | 2 +- .../extendedEdgeMesh/extendedEdgeMesh.H | 4 +- src/fileFormats/sampledSetWriters/writer.C | 2 +- .../fvMatrices/fvMatrix/fvMatrix.C | 2 +- .../globalIndexStencils/cellToCellStencil.C | 2 +- .../cellToFace/extendedCellToFaceStencil.C | 4 +- .../cellToFace/extendedCellToFaceStencil.H | 3 +- .../globalIndexStencils/cellToFaceStencil.C | 2 +- .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C | 2 + .../cellPointWeight/cellPointWeight.C | 2 +- .../interpolationPointMVC/pointMVCWeight.C | 2 +- .../effectivenessHeatExchangerSource.H | 1 - .../meanVelocityForce/meanVelocityForce.C | 2 +- .../sources/general/codedSource/CodedSource.C | 2 +- .../ReactingMultiphaseParcel.C | 2 + .../FacePostProcessing/FacePostProcessing.C | 2 + .../ParticleCollector/ParticleCollector.C | 2 + .../Drag/NonSphereDrag/NonSphereDragForce.C | 2 +- .../AveragingMethod/AveragingMethod.C | 16 ++- .../LiquidEvaporation/LiquidEvaporation.C | 2 +- .../LiquidEvaporationBoil.C | 2 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 2 + .../pairPotential/basic/pairPotential.C | 3 +- .../pairPotential/basic/pairPotential.H | 6 +- .../blockEdges/polyLineEdge/polyLine.C | 2 +- .../refinementFeatures/refinementFeatures.C | 108 +++++++++--------- .../refinementFeatures/refinementFeatures.H | 2 - .../regionModel/regionModel1D/regionModel1D.H | 5 +- .../singleLayerRegion/singleLayerRegion.H | 5 +- .../thermoSingleLayer/thermoSingleLayer.H | 2 - .../structuredRenumber/OppositeFaceCellWave.C | 2 +- .../structuredRenumber/OppositeFaceCellWave.H | 4 +- src/sampling/cuttingPlane/cuttingPlane.C | 51 ++++----- .../meshToMeshMethod/meshToMeshMethod.C | 2 +- src/sampling/probes/probes.C | 2 +- src/sampling/probes/probes.H | 4 +- .../sampledSet/sampledSet/sampledSet.C | 2 +- .../sampledSurface/sampledSurface.C | 20 ++-- src/surfMesh/surfMesh/surfMesh.C | 50 ++++---- .../ac3d/AC3DsurfaceFormatCore.C | 4 +- .../surfaceFormats/ofs/OFSsurfaceFormatCore.C | 4 +- .../starcd/STARCDsurfaceFormatCore.C | 4 +- .../surfaceFormats/vtk/VTKsurfaceFormatCore.C | 2 +- .../surfaceFormats/wrl/WRLsurfaceFormatCore.C | 4 +- .../surfaceFormats/x3d/X3DsurfaceFormatCore.C | 4 +- .../psiuReactionThermo/psiuReactionThermo.C | 2 +- src/triSurface/triSurface/triSurface.C | 4 +- 83 files changed, 255 insertions(+), 252 deletions(-) diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.C b/src/ODE/ODESolvers/ODESolver/ODESolver.C index 3dce5378e3..69d8b5879c 100644 --- a/src/ODE/ODESolvers/ODESolver/ODESolver.C +++ b/src/ODE/ODESolvers/ODESolver/ODESolver.C @@ -34,7 +34,7 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // Foam::scalar Foam::ODESolver::normalizeError ( diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C index d54b7fb390..60b390223c 100644 --- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C +++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C @@ -25,7 +25,7 @@ License #include "DictionaryBase.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template void Foam::DictionaryBase::addEntries() diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H index 6ecb7cd963..e63f32ae91 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H @@ -241,6 +241,7 @@ private: const label index ); + protected: // Protected data diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index cc2ba3a523..9a306d7eac 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -78,7 +78,7 @@ const int Foam::Time::maxPrecision_(3 - log10(SMALL)); Foam::word Foam::Time::controlDictName("controlDict"); -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::Time::adjustDeltaT() { diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index cbb186b631..7cf79dec3b 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -59,6 +59,7 @@ SourceFiles namespace Foam { + // Forward declaration of classes class argList; @@ -86,6 +87,7 @@ class Time //- The controlDict IOdictionary controlDict_; + public: //- Write control options diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C index 81ccc9a008..f6537c5a4c 100644 --- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C +++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C @@ -278,6 +278,8 @@ void Foam::codedBase::createLibrary } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + void Foam::codedBase::updateLibrary ( const word& name @@ -350,7 +352,4 @@ Foam::codedBase::~codedBase() {} -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - - // ************************************************************************* // diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index 65898e9c13..21520669da 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -43,7 +43,7 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels) { diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C index e5a7879e24..69d8455a1f 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C @@ -33,11 +33,11 @@ License namespace Foam { -defineTypeNameAndDebug(mapDistributeBase, 0); + defineTypeNameAndDebug(mapDistributeBase, 0); } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // Foam::List Foam::mapDistributeBase::schedule ( diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C index 3c8819d642..343461da42 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C @@ -51,7 +51,7 @@ namespace Foam } -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::coupledPolyPatch::writeOBJ(Ostream& os, const point& pt) { diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C index e59c5220be..5e5821b4a7 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C @@ -38,7 +38,8 @@ namespace Foam addToRunTimeSelectionTable(polyPatch, wedgePolyPatch, dictionary); } -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::wedgePolyPatch::calcGeometry(PstreamBuffers&) { diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C index 7e557268a6..9a6238c733 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C @@ -43,7 +43,8 @@ namespace Foam const char* const Foam::faceZone::labelsName = "faceLabels"; -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::faceZone::calcFaceZonePatch() const { diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C index a4f83a039c..95a5fce3e4 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C @@ -27,7 +27,7 @@ License #include "Time.H" #include "interpolationWeights.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template const Foam::interpolationWeights& diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H index 1c2eef7f3a..95c6109026 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H @@ -104,6 +104,9 @@ protected: //- Return (demand driven) interpolator const interpolationWeights& interpolator() const; + +private: + //- Disallow default bitwise assignment void operator=(const TableBase&); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H index 53bd64e7f8..dc9a6cfdcc 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H @@ -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 @@ -112,7 +112,7 @@ class kkLOmega : public eddyViscosity { - // Private memmber functions + // Private member functions tmp fv(const volScalarField& Ret) const; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C index f5b587385a..a55f8d78e5 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C @@ -41,7 +41,7 @@ namespace RASModels defineTypeNameAndDebug(qZeta, 0); addToRunTimeSelectionTable(RASModel, qZeta, dictionary); -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // tmp qZeta::fMu() const { diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index c4e32aebe1..c6c65b51bc 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -33,7 +33,7 @@ License namespace Foam { -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // template tmp diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index f96cdc6a16..2dbfd2b974 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.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 @@ -87,8 +87,6 @@ tmp SpalartAllmarasIDDES::rd } -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - template tmp SpalartAllmarasIDDES::fd ( @@ -99,6 +97,8 @@ tmp SpalartAllmarasIDDES::fd } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + template tmp SpalartAllmarasIDDES::dTilda ( diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index c9c08b5672..944327de5f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C @@ -33,7 +33,7 @@ namespace Foam namespace LESModels { -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template volScalarField dynamicKEqn::Ck diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C index c0267708f5..2a7e75130a 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.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,7 +33,7 @@ namespace Foam namespace LESModels { -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template void dynamicLagrangian::correctNut diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C index dccfea315a..a7ecf00625 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C @@ -34,7 +34,7 @@ namespace Foam namespace RASModels { -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // template tmp realizableKE::rCmu diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index 98f1fe8a1d..dc4e613ca2 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C @@ -34,7 +34,7 @@ namespace Foam namespace RASModels { -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template tmp v2f::Ts() const diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index 03db4555a9..11873820e0 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -35,7 +35,7 @@ License namespace Foam { -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void kLowReWallFunctionFvPatchScalarField::checkType() { @@ -51,8 +51,6 @@ void kLowReWallFunctionFvPatchScalarField::checkType() } -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - scalar kLowReWallFunctionFvPatchScalarField::yPlusLam ( const scalar kappa, diff --git a/src/conversion/meshReader/meshReader.H b/src/conversion/meshReader/meshReader.H index c07bf3cd9c..ee2ee2dd97 100644 --- a/src/conversion/meshReader/meshReader.H +++ b/src/conversion/meshReader/meshReader.H @@ -238,7 +238,7 @@ private: protected: - // Protected data + // Protected member data //- Pointers to cell shape models static const cellModel* unknownModel; @@ -285,11 +285,12 @@ protected: cellTable cellTable_; - // Member Functions + // Protected member functions //- Subclasses are required to supply this information virtual bool readGeometry(const scalar scaleFactor = 1.0) = 0; + public: // Static Members diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C index 3ddd01c37b..824720f12d 100644 --- a/src/conversion/meshReader/starcd/STARCDMeshReader.C +++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C @@ -52,7 +52,7 @@ const int Foam::meshReaders::STARCD::starToFoamFaceAddr[4][6] = }; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::meshReaders::STARCD::readToNewline(IFstream& is) { @@ -93,8 +93,6 @@ bool Foam::meshReaders::STARCD::readHeader(IFstream& is, word fileSignature) } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - void Foam::meshReaders::STARCD::readAux(const objectRegistry& registry) { boundaryRegion_.readDict(registry); diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C index 86d0b2c4b5..1ef7aadb3e 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C @@ -42,10 +42,8 @@ namespace Foam addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject); } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -// the PackedBoolList::count method would probably be faster -// since we are only checking for 'true' anyhow Foam::label Foam::dynamicRefineFvMesh::count ( const PackedBoolList& l, @@ -250,10 +248,10 @@ Foam::dynamicRefineFvMesh::refine } } -// // Remove the stored tet base points -// tetBasePtIsPtr_.clear(); -// // Remove the cell tree -// cellTreePtr_.clear(); + // // Remove the stored tet base points + // tetBasePtIsPtr_.clear(); + // // Remove the cell tree + // cellTreePtr_.clear(); // Update fields updateMesh(map); @@ -463,8 +461,6 @@ Foam::dynamicRefineFvMesh::refine } -// Combines previously split cells, maps fields and recalculates -// (an approximate) flux Foam::autoPtr Foam::dynamicRefineFvMesh::unrefine ( @@ -646,7 +642,6 @@ Foam::dynamicRefineFvMesh::unrefine } -// Get max of connected point Foam::scalarField Foam::dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const { @@ -665,7 +660,6 @@ Foam::dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const } -// Get max of connected cell Foam::scalarField Foam::dynamicRefineFvMesh::maxCellField(const volScalarField& vFld) const { @@ -684,7 +678,6 @@ Foam::dynamicRefineFvMesh::maxCellField(const volScalarField& vFld) const } -// Simple (non-parallel) interpolation by averaging. Foam::scalarField Foam::dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const { @@ -705,7 +698,6 @@ Foam::dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const } -// Calculate error. Is < 0 or distance to minLevel, maxLevel Foam::scalarField Foam::dynamicRefineFvMesh::error ( const scalarField& fld, diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H index fc4db3bf70..1700732d53 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ protected: PackedBoolList protectedCell_; - // Private Member Functions + // Protected Member Functions //- Count set/unset elements in packedlist. static label count(const PackedBoolList&, const unsigned int); diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H index d63de47cb1..4e07939dd2 100644 --- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H +++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H @@ -70,6 +70,7 @@ class boundaryMesh // the largest distance from face centre to one of its vertices. static const scalar distanceTol_; + // Private data //- All boundary mesh data. Reconstructed every time faces are repatched diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C index 26353dafb2..cf34d6eb70 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C @@ -62,9 +62,8 @@ Foam::autoPtr Foam::cellLooper::New } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -// Get faces (on cell) connected to vertI which are not using edgeI Foam::labelList Foam::cellLooper::getVertFacesNonEdge ( const label celli, @@ -101,7 +100,6 @@ Foam::labelList Foam::cellLooper::getVertFacesNonEdge } -// Get first edge connected to vertI and on facei Foam::label Foam::cellLooper::getFirstVertEdge ( const label facei, @@ -131,7 +129,6 @@ Foam::label Foam::cellLooper::getFirstVertEdge } -// Get edges (on cell) connected to vertI which are not on facei Foam::labelList Foam::cellLooper::getVertEdgesNonFace ( const label celli, @@ -166,8 +163,6 @@ Foam::labelList Foam::cellLooper::getVertEdgesNonFace } -// Return edge from cellEdges that is most perpendicular -// to refinement direction. Foam::label Foam::cellLooper::getMisAlignedEdge ( const vector& refDir, diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H index 2642fd641f..065edef71f 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H @@ -71,8 +71,6 @@ class cellLooper : public edgeVertex { - // Private data - protected: @@ -105,6 +103,7 @@ protected: // to refinement direction. label getMisAlignedEdge(const vector& refDir, const label celli) const; + private: // Private Member Functions diff --git a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.H b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.H index 9a773a755b..8f960cbb8e 100644 --- a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.H +++ b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,6 +72,7 @@ protected: //- Point motion field mutable pointScalarField pointDisplacement_; + private: // Private Member Functions @@ -88,6 +89,7 @@ private: //- Disallow default bitwise assignment void operator=(const componentDisplacementMotionSolver&); + public: //- Runtime type information diff --git a/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.H b/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.H index 1044940777..cbc7ab3a9e 100644 --- a/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.H +++ b/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,6 +69,7 @@ protected: //- Point motion field mutable pointScalarField pointMotionU_; + private: // Private Member Functions @@ -85,6 +86,7 @@ private: //- Disallow default bitwise assignment void operator=(const componentVelocityMotionSolver&); + public: //- Runtime type information diff --git a/src/edgeMesh/edgeMesh.H b/src/edgeMesh/edgeMesh.H index d3397a290b..0af0332ebc 100644 --- a/src/edgeMesh/edgeMesh.H +++ b/src/edgeMesh/edgeMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,6 +82,7 @@ class edgeMesh //- From point to edges mutable autoPtr pointEdgesPtr_; + // Private Member Functions //- Calculate point-edge addressing (inverse of edges) diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C index d58a67c562..0c270cd006 100644 --- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C +++ b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C @@ -56,7 +56,7 @@ inline void Foam::fileFormats::STARCDedgeFormat::writeLines } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::STARCDedgeFormat::writeCase ( diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H index bc5a0ec1bb..dd88579e95 100644 --- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H +++ b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H @@ -99,6 +99,7 @@ protected: const label nEdges ); + public: // Constructors diff --git a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C b/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C index 01e792e2ce..fe18c897f4 100644 --- a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C +++ b/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.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 #include "vtkUnstructuredReader.H" #include "Time.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::VTKedgeFormat::writeHeader ( diff --git a/src/edgeMesh/edgeMeshI.H b/src/edgeMesh/edgeMeshI.H index 4c808c239d..5ccff22321 100644 --- a/src/edgeMesh/edgeMeshI.H +++ b/src/edgeMesh/edgeMeshI.H @@ -23,6 +23,20 @@ License \*---------------------------------------------------------------------------*/ +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +inline Foam::pointField& Foam::edgeMesh::storedPoints() +{ + return points_; +} + + +inline Foam::edgeList& Foam::edgeMesh::storedEdges() +{ + return edges_; +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // inline Foam::edgeMesh::edgeMesh(const edgeMesh& em) @@ -58,18 +72,6 @@ inline const Foam::labelListList& Foam::edgeMesh::pointEdges() const } -inline Foam::pointField& Foam::edgeMesh::storedPoints() -{ - return points_; -} - - -inline Foam::edgeList& Foam::edgeMesh::storedEdges() -{ - return edges_; -} - - // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // void Foam::edgeMesh::operator=(const edgeMesh& rhs) diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index d28b966698..19d9e903f6 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -168,7 +168,7 @@ bool Foam::extendedEdgeMesh::canRead } -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // Foam::extendedEdgeMesh::pointStatus Foam::extendedEdgeMesh::classifyFeaturePoint diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H index 2c407e082a..414c312928 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H +++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H @@ -141,7 +141,7 @@ protected: static label externalStart_; - // Private data + // Protected data //- Index of the start of the concave feature points label concaveStart_; @@ -203,7 +203,7 @@ protected: mutable PtrList> edgeTreesByType_; - // Private Member Functions + // Protected Member Functions //- Classify the type of feature point. Requires valid stored member // data for edges and normals. diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C index 036de180ba..afc3603dab 100644 --- a/src/fileFormats/sampledSetWriters/writer.C +++ b/src/fileFormats/sampledSetWriters/writer.C @@ -53,7 +53,7 @@ Foam::autoPtr> Foam::writer::New } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template Foam::fileName Foam::writer::getBaseName diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 16270c07d5..4c2ffb5a1f 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -30,7 +30,7 @@ License #include "coupledFvPatchFields.H" #include "UIndirectList.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template template diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C index ce21c3a6d2..b6820ee887 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C @@ -28,7 +28,7 @@ License #include "SortableList.H" #include "emptyPolyPatch.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::cellToCellStencil::merge ( diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C index d0534ea014..26713fdcfb 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C @@ -32,11 +32,11 @@ License namespace Foam { -defineTypeNameAndDebug(extendedCellToFaceStencil, 0); + defineTypeNameAndDebug(extendedCellToFaceStencil, 0); } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::extendedCellToFaceStencil::writeStencilStats ( diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H index c3c57bc7fd..13852515ff 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H @@ -72,7 +72,7 @@ protected: const polyMesh& mesh_; -protected: + // Protected member functions //- Write some statistics about stencil static void writeStencilStats @@ -82,6 +82,7 @@ protected: const mapDistribute& map ); + public: // Declare name of the class and its debug switch diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C index 2016ada062..4b0aa39c00 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C @@ -29,7 +29,7 @@ License #include "syncTools.H" #include "dummyTransform.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::cellToFaceStencil::merge ( diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C index 27d76e2df0..dd33d2368b 100644 --- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C +++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C @@ -131,6 +131,8 @@ Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + void Foam::fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry) { clear(); diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C index 58c3662301..218644c361 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C @@ -33,7 +33,7 @@ int Foam::cellPointWeight::debug(debug::debugSwitch("cellPointWeight", 0)); Foam::scalar Foam::cellPointWeight::tol(SMALL); -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::cellPointWeight::findTetrahedron ( diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C index 5177dcaa82..bb24b5e420 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C @@ -36,7 +36,7 @@ namespace Foam Foam::scalar Foam::pointMVCWeight::tol(SMALL); -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::pointMVCWeight::calcWeights ( diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index b46506ff71..42e3584393 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -202,7 +202,6 @@ private: // Private Member Functions - //- Disallow default bitwise copy construct effectivenessHeatExchangerSource ( diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C index 96cd17ce60..8581f53bb9 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C +++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C @@ -47,7 +47,7 @@ namespace fv } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fv::meanVelocityForce::writeProps ( diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C index 267354e313..2f4f24a381 100644 --- a/src/fvOptions/sources/general/codedSource/CodedSource.C +++ b/src/fvOptions/sources/general/codedSource/CodedSource.C @@ -29,7 +29,7 @@ License #include "dynamicCode.H" #include "dynamicCodeContext.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template void Foam::fv::CodedSource::prepare diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 3d46dc56dd..f97f0630c3 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -487,6 +487,8 @@ void Foam::ReactingMultiphaseParcel::calc } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + template template void Foam::ReactingMultiphaseParcel::calcDevolatilisation diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C index adc6a30ca1..cabb3d7dc6 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C @@ -74,6 +74,8 @@ void Foam::FacePostProcessing::makeLogFile } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + template void Foam::FacePostProcessing::write() { diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 066528fe3d..3eb5075c93 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -385,6 +385,8 @@ void Foam::ParticleCollector::collectParcelConcentricCircles } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + template void Foam::ParticleCollector::write() { diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C index 3cbccc4787..674d4b1824 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C @@ -25,7 +25,7 @@ License #include "NonSphereDragForce.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template Foam::scalar Foam::NonSphereDragForce::CdRe(const scalar Re) const diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C index c9c473a839..f683306585 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C @@ -27,6 +27,13 @@ License #include "runTimeSelectionTables.H" #include "pointMesh.H" +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +template +void Foam::AveragingMethod::updateGrad() +{} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template @@ -106,15 +113,6 @@ Foam::AveragingMethod::~AveragingMethod() {} -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::AveragingMethod::updateGrad() -{ - // do nothing -} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index eef6b78f39..18136186b7 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -29,7 +29,7 @@ License using namespace Foam::constant::mathematical; -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template Foam::tmp Foam::LiquidEvaporation::calcXc diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C index da98006d45..4836532061 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C @@ -29,7 +29,7 @@ License using namespace Foam::constant::mathematical; -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template Foam::tmp Foam::LiquidEvaporationBoil::calcXc diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C index 5654799dac..094e471611 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C @@ -81,6 +81,8 @@ Foam::word Foam::ThermoSurfaceFilm::interactionTypeStr } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + template Foam::vector Foam::ThermoSurfaceFilm::tangentVector ( diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C index 8c3f8fa448..18724c9787 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C @@ -35,8 +35,7 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::pairPotential::scaleEnergy(scalar& e, const scalar r) const { diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H index e75eaf624e..cafa9a49a3 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H @@ -60,7 +60,7 @@ class pairPotential protected: - // Protected data + // Protected member data word name_; dictionary pairPotentialProperties_; @@ -79,7 +79,7 @@ protected: bool writeTables_; - // Private Member Functions + // Protected member functions void scaleEnergy(scalar& e, const scalar r) const; @@ -93,7 +93,7 @@ protected: public: //- Runtime type information - TypeName("pairPotential"); + TypeName("pairPotential"); // Declare run-time constructor selection table diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.C b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.C index ac7572f595..a54b2f790e 100644 --- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.C +++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.C @@ -25,7 +25,7 @@ License #include "polyLine.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::polyLine::calcParam() { diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C index 13a617d9b8..6d0295b832 100644 --- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C +++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C @@ -298,59 +298,6 @@ void Foam::refinementFeatures::buildTrees(const label featI) } -const Foam::PtrList>& -Foam::refinementFeatures::regionEdgeTrees() const -{ - if (!regionEdgeTreesPtr_.valid()) - { - regionEdgeTreesPtr_.reset - ( - new PtrList>(size()) - ); - PtrList>& trees = regionEdgeTreesPtr_(); - - forAll(*this, featI) - { - const extendedEdgeMesh& eMesh = operator[](featI); - const pointField& points = eMesh.points(); - const edgeList& edges = eMesh.edges(); - - // Calculate bb of all points - treeBoundBox bb(points); - - // Random number generator. Bit dodgy since not exactly random ;-) - Random rndGen(65431); - - // Slightly extended bb. Slightly off-centred just so on symmetric - // geometry there are less face/edge aligned items. - bb = bb.extend(rndGen, 1e-4); - bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); - bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); - - trees.set - ( - featI, - new indexedOctree - ( - treeDataEdge - ( - false, // do not cache bb - edges, - points, - eMesh.regionEdges() - ), - bb, // overall search domain - 8, // maxLevel - 10, // leafsize - 3.0 // duplicity - ) - ); - } - } - return regionEdgeTreesPtr_(); -} - - // Find maximum level of a shell. void Foam::refinementFeatures::findHigherLevel ( @@ -424,6 +371,61 @@ void Foam::refinementFeatures::findHigherLevel } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +const Foam::PtrList>& +Foam::refinementFeatures::regionEdgeTrees() const +{ + if (!regionEdgeTreesPtr_.valid()) + { + regionEdgeTreesPtr_.reset + ( + new PtrList>(size()) + ); + PtrList>& trees = regionEdgeTreesPtr_(); + + forAll(*this, featI) + { + const extendedEdgeMesh& eMesh = operator[](featI); + const pointField& points = eMesh.points(); + const edgeList& edges = eMesh.edges(); + + // Calculate bb of all points + treeBoundBox bb(points); + + // Random number generator. Bit dodgy since not exactly random ;-) + Random rndGen(65431); + + // Slightly extended bb. Slightly off-centred just so on symmetric + // geometry there are less face/edge aligned items. + bb = bb.extend(rndGen, 1e-4); + bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); + bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); + + trees.set + ( + featI, + new indexedOctree + ( + treeDataEdge + ( + false, // do not cache bb + edges, + points, + eMesh.regionEdges() + ), + bb, // overall search domain + 8, // maxLevel + 10, // leafsize + 3.0 // duplicity + ) + ); + } + } + return regionEdgeTreesPtr_(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::refinementFeatures::refinementFeatures diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H index a55351c162..269b7199d9 100644 --- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H +++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H @@ -53,8 +53,6 @@ class refinementFeatures : public PtrList { -private: - // Private data //- Per shell the list of ranges diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.H b/src/regionModels/regionModel/regionModel1D/regionModel1D.H index 592e0af317..3663a94648 100644 --- a/src/regionModels/regionModel/regionModel1D/regionModel1D.H +++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,9 +54,6 @@ class regionModel1D : public regionModel { - -private: - // Private Member Functions //- Disallow default bitwise copy construct diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H index ac0892c49f..ccababa272 100644 --- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H +++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,9 +52,6 @@ class singleLayerRegion : public regionModel { - -private: - // Private Member Functions //- Disallow default bitwise copy construct diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H index cbf5717f11..941aa73145 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H @@ -65,8 +65,6 @@ class thermoSingleLayer : public kinematicSingleLayer { -private: - // Private member functions //- Disallow default bitwise copy construct diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C index 4e865bd0b1..33d7810da8 100644 --- a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C +++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C @@ -26,7 +26,7 @@ License #include "OppositeFaceCellWave.H" #include "polyMesh.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template void Foam::OppositeFaceCellWave::opposingFaceLabels diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H index bcfe3cb0dd..1270107082 100644 --- a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H +++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H @@ -52,14 +52,14 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class OppositeFaceCellWaveName Declaration + Class OppositeFaceCellWaveName Declaration \*---------------------------------------------------------------------------*/ TemplateName(OppositeFaceCellWave); /*---------------------------------------------------------------------------*\ - Class OppositeFaceCellWave Declaration + Class OppositeFaceCellWave Declaration \*---------------------------------------------------------------------------*/ template diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C index 5cf7a37dd7..8a9a94815f 100644 --- a/src/sampling/cuttingPlane/cuttingPlane.C +++ b/src/sampling/cuttingPlane/cuttingPlane.C @@ -334,32 +334,7 @@ void Foam::cuttingPlane::walkCellCuts } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct without cutting -Foam::cuttingPlane::cuttingPlane(const plane& pln) -: - plane(pln) -{} - - -// Construct from plane and mesh reference, restricted to a list of cells -Foam::cuttingPlane::cuttingPlane -( - const plane& pln, - const primitiveMesh& mesh, - const bool triangulate, - const labelUList& cellIdLabels -) -: - plane(pln) -{ - reCut(mesh, triangulate, cellIdLabels); -} - - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::cuttingPlane::reCut ( @@ -406,6 +381,30 @@ void Foam::cuttingPlane::remapFaces } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +// Construct without cutting +Foam::cuttingPlane::cuttingPlane(const plane& pln) +: + plane(pln) +{} + + +// Construct from plane and mesh reference, restricted to a list of cells +Foam::cuttingPlane::cuttingPlane +( + const plane& pln, + const primitiveMesh& mesh, + const bool triangulate, + const labelUList& cellIdLabels +) +: + plane(pln) +{ + reCut(mesh, triangulate, cellIdLabels); +} + + // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // void Foam::cuttingPlane::operator=(const cuttingPlane& rhs) diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C index 960ee5c23a..371b753ffb 100644 --- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C +++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C @@ -39,7 +39,7 @@ namespace Foam Foam::scalar Foam::meshToMeshMethod::tolerance_ = 1e-6; -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // Foam::labelList Foam::meshToMeshMethod::maskCells() const { diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C index 2e464a233b..6134995333 100644 --- a/src/sampling/probes/probes.C +++ b/src/sampling/probes/probes.C @@ -46,7 +46,7 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::probes::findElements(const fvMesh& mesh) { diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H index b0208601e7..371e57aba4 100644 --- a/src/sampling/probes/probes.H +++ b/src/sampling/probes/probes.H @@ -90,7 +90,7 @@ protected: }; - // Private data + // Protected member data //- Const reference to fvMesh const fvMesh& mesh_; @@ -140,7 +140,7 @@ protected: HashPtrTable probeFilePtrs_; - // Private Member Functions + // Protected Member Functions //- Clear old field groups void clearFieldGroups(); diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C index 50979b68be..f583aaea86 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.C +++ b/src/sampling/sampledSet/sampledSet/sampledSet.C @@ -39,7 +39,7 @@ namespace Foam } -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // Foam::label Foam::sampledSet::getBoundaryCell(const label facei) const { diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index d1281cfb45..0b6da77881 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -39,15 +39,6 @@ namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::sampledSurface::clearGeom() const -{ - deleteDemandDrivenData(SfPtr_); - deleteDemandDrivenData(magSfPtr_); - deleteDemandDrivenData(CfPtr_); - area_ = -1; -} - - void Foam::sampledSurface::makeSf() const { // It is an error to recalculate if the pointer is already set @@ -111,6 +102,17 @@ void Foam::sampledSurface::makeCf() const } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void Foam::sampledSurface::clearGeom() const +{ + deleteDemandDrivenData(SfPtr_); + deleteDemandDrivenData(magSfPtr_); + deleteDemandDrivenData(CfPtr_); + area_ = -1; +} + + // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // Foam::autoPtr Foam::sampledSurface::New diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C index 1cc3ddcba4..70fb00c212 100644 --- a/src/surfMesh/surfMesh/surfMesh.C +++ b/src/surfMesh/surfMesh/surfMesh.C @@ -69,6 +69,32 @@ Foam::word Foam::surfMesh::meshSubDir = "surfMesh"; // } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void Foam::surfMesh::updatePointsRef() +{ + // Assign the reference to the points (this is truly ugly) + reinterpret_cast&> + ( + const_cast&>(MeshReference::points()) + ) = reinterpret_cast&>(this->storedPoints()); +} + + +void Foam::surfMesh::updateFacesRef() +{ + // Assign the reference to the faces + shallowCopy(this->storedFaces()); +} + + +void Foam::surfMesh::updateRefs() +{ + this->updatePointsRef(); + this->updateFacesRef(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName) @@ -227,30 +253,6 @@ Foam::surfMesh::~surfMesh() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::surfMesh::updatePointsRef() -{ - // Assign the reference to the points (this is truly ugly) - reinterpret_cast&> - ( - const_cast&>(MeshReference::points()) - ) = reinterpret_cast&>(this->storedPoints()); -} - - -void Foam::surfMesh::updateFacesRef() -{ - // Assign the reference to the faces - shallowCopy(this->storedFaces()); -} - - -void Foam::surfMesh::updateRefs() -{ - this->updatePointsRef(); - this->updateFacesRef(); -} - - void Foam::surfMesh::resetPrimitives ( const Xfer& points, diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C index 6d1a8d3fc1..3f309be57e 100644 --- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.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,7 @@ License #include "IFstream.H" #include "IStringStream.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // bool Foam::fileFormats::AC3DsurfaceFormatCore::readCmd ( diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C index 89ab429095..9a62bbf612 100644 --- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.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 @@ -26,7 +26,7 @@ License #include "OFSsurfaceFormatCore.H" #include "clock.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader ( diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C index c73db97ddb..44d55d2a07 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.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 @@ -28,7 +28,7 @@ License #include "regExp.H" #include "IStringStream.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // parse things like this: // CTNAME 1 someName diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C index 501806c417..9a28648d0c 100644 --- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C @@ -26,7 +26,7 @@ License #include "VTKsurfaceFormatCore.H" #include "clock.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader ( diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C index b7c33c9e9a..3b229a85a1 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.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 @@ -26,7 +26,7 @@ License #include "WRLsurfaceFormatCore.H" #include "clock.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader ( diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C index 2ba0dbf5f3..0dd477304a 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.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 @@ -26,7 +26,7 @@ License #include "X3DsurfaceFormatCore.H" #include "clock.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::fileFormats::X3DsurfaceFormatCore::writeHeader ( diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C index c58ff93140..f7161a5b09 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C @@ -40,7 +40,7 @@ namespace Foam defineTypeNameAndDebug(psiuReactionThermo, 0); defineRunTimeSelectionTable(psiuReactionThermo, fvMesh); -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // wordList psiuReactionThermo::heuBoundaryTypes() { diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C index 032423dd98..51ee83a03d 100644 --- a/src/triSurface/triSurface/triSurface.C +++ b/src/triSurface/triSurface/triSurface.C @@ -36,10 +36,12 @@ License namespace Foam { -defineTypeNameAndDebug(triSurface, 0); + defineTypeNameAndDebug(triSurface, 0); } +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + Foam::fileName Foam::triSurface::triSurfInstance(const Time& d) { fileName foamName(d.caseName() + ".ftr");