diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.C b/src/ODE/ODESolvers/ODESolver/ODESolver.C
index 3dce5378e3982b514f9ff2cd7586656afff8288a..69d8b5879c568e633c3e89f24ead68118f9eb16e 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 d54b7fb3900499d2b47a6a6d48cce1038ec1a8cb..60b390223c2651a0d3e4d126582939ea16d382a5 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<class IDLListType, class T>
void Foam::DictionaryBase<IDLListType, T>::addEntries()
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 6ecb7cd96368ba0faf7b9b801b22bbd9b53df02e..e63f32ae91e0e73d169be68e6fd97836297674ed 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 cc2ba3a523a88022e2e8c8ce43b2e5322692cf5f..9a306d7eac48deb720b201bdd2e9961e84cc2f60 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 cbb186b6313e168a7fe150ea95fa00bef71c7d5f..7cf79dec3b4979698293c7288706641e3d5045ab 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 81ccc9a0087ba5fb5fba307290d2ba5ab936137b..f6537c5a4c0ff6dad01fb51f8b4b9988e69179bc 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 65898e9c1344f2a3d953123f3b173b2469e4b5de..21520669da5467b972f404b4e547b2233bcf0825 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 e5a7879e24c9686ffbea92ae37498b09b656fbae..69d8455a1fccbd34ee16be4ee9e6253ff058ef6a 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::labelPair> 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 3c8819d6429ab96d7d7971aa5d4c6fb45faa53af..343461da4230dd7193b5024db39e522162eed0d5 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 e59c5220be8e7580a7899a2c9cc251de09fb2a05..5e5821b4a7fe2040064797c41082c9c856e158e9 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 7e557268a6e240441f334fef53e415567807dbaa..9a6238c73354bc891e2683adcd61a8625bfb6f5a 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 a4f83a039c782b6ac1f6242a9e96c9c6ba848d8b..95a5fce3e449af529ffb6c00b85f4128c6f04702 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<class Type>
const Foam::interpolationWeights&
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 1c2eef7f3a1ae182df27bd6dc75167a566ff90bb..95c610902671d4ced217694f7233c8ddb00c5a18 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<Type>&);
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
index 53bd64e7f8afabfbdd19f82ac3df9d07da7b989d..dc9a6cfdccaabeb1a8ebe0605e9f20e9ae35d4ed 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<incompressible::RASModel>
{
- // Private memmber functions
+ // Private member functions
tmp<volScalarField> 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 f5b587385af6dea8538da3d51b5ba044d7bc7895..a55f8d78e5559e6af3f77ae9563d5f8a57efe6ac 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<volScalarField> qZeta::fMu() const
{
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
index c4e32aebe155869adf949592e3b2cb188351b194..c6c65b51bcd12cc4f56bbfb2ba44ee835e7693e3 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<class TurbulenceModel, class BasicTurbulenceModel>
tmp<volScalarField>
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index f96cdc6a161717a012501eaf5b04df38f478592d..2dbfd2b97449b7ed63c23463115b9277360985aa 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<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::rd
}
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
template<class BasicTurbulenceModel>
tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fd
(
@@ -99,6 +97,8 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fd
}
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
template<class BasicTurbulenceModel>
tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
(
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index c9c08b5672b16fcdd33ea497f588e63246b72ec3..944327de5f66fe6ead035c0251197c7168aba599 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<class BasicTurbulenceModel>
volScalarField dynamicKEqn<BasicTurbulenceModel>::Ck
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
index c0267708f56f48d2017aaa0eb1432e0a2a59520d..2a7e75130a68dacccaabc75c2018a5e9222a0818 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<class BasicTurbulenceModel>
void dynamicLagrangian<BasicTurbulenceModel>::correctNut
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index dccfea315a047afa470bc0a775f77419aab08e4e..a7ecf00625a52ea87a9d9710dd3250de089f94fe 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<class BasicTurbulenceModel>
tmp<volScalarField> realizableKE<BasicTurbulenceModel>::rCmu
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 98f1fe8a1d49c562d53cfa7faf563219b33affb8..dc4e613ca210c51d234d952c0b80d90522ccf7b2 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<class BasicTurbulenceModel>
tmp<volScalarField> v2f<BasicTurbulenceModel>::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 03db4555a91a87f603d64978bfed2b62469d7fea..11873820e05d08bd3e884fec76cfc4ac5710c2d8 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 c07bf3cd9ced06d86e743de58efd268ce4ebb34d..ee2ee2dd971cb84b59b0cebc9ad49a95c2a06b10 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 3ddd01c37b9d65ac28a0eb6c2acae8a8510c44b9..824720f12dd660a46cee9d1097b8232569dc8075 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 86d0b2c4b543b05c9815ed4a352744911c89d24a..1ef7aadb3e108622595130805e5c721ff9ebb48e 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::mapPolyMesh>
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 fc4db3bf70272b79bd6fd7ad50044aad87ff45e0..1700732d530456f8ab47f63af1f64418019146a3 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 d63de47cb14ad7e7463286eee42cb5d9f1b507a5..4e07939dd20bc05c6f1189e6e12d5a464d43de5f 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 26353dafb2e0dbb2708f4ca1c4653a4c518c7c47..cf34d6eb70c76a9fbd49b57d71bb8b2f9b12f0a1 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -62,9 +62,8 @@ Foam::autoPtr<Foam::cellLooper> 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 2642fd641f62f4165dbeb20e2540b69c684e1b11..065edef71f921a52ceb2ee3516e8a160b8096e01 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 9a773a755b18e3d9bb84ef4cf886b55efeca5161..8f960cbb8e6ebb4ba74ef0a43c170b7953867c17 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 10449407774ff6c906b615e20d042dea8c4149b9..cbc7ab3a9ee36a9befc9ff3f35cbb933291f721e 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 d3397a290b0816f233172ec779caef371f01b30c..0af0332ebceac6c46700ecfca75c60ff393b1199 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<labelListList> 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 d58a67c562b0dfb2275384579f8ccc65055e6f26..0c270cd0067dbce3fa76b3c7e1d430adc405d12b 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 bc5a0ec1bbc96f4aefc533901580a4755443e698..dd88579e9591c1ba27a0197466de118ccc22e292 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 01e792e2cee195153f80c10389d73aa7993c9724..fe18c897f497378d3d3efac1895ca2087295f3dd 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 4c808c239d56fd837048ba218bc81fca4e2febc6..5ccff22321492bc97d18f82c77e527954bbebadd 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 d28b966698d171a49a34411b8a425aa58540694c..19d9e903f629f4c74b8a57feff99448d778f0f55 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 2c407e082a470cd4e74e3ec68bb4e17b2fb77d7f..414c312928d85ef7acd424bdfa6fcd175a17966a 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<indexedOctree<treeDataEdge>> 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 036de180bae294eddaa35f64397348772ea5570c..afc3603dabd3372b49e2629d47fa2a1a9a6712c2 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -53,7 +53,7 @@ Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New
}
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class Type>
Foam::fileName Foam::writer<Type>::getBaseName
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 16270c07d5e5bf154bbda4427cbb25a86f76fcef..4c2ffb5a1f18bc3f11a3f0be6a21833d98738ec2 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<class Type>
template<class Type2>
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index ce21c3a6d27eb53b1d0153c0ad5d2e6be365a192..b6820ee887cb58c3a2a7a7f4d75958698b3dd1c2 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 d0534ea014665cea0b6e2e65d04d19d6a98cb8af..26713fdcfbe296618df9c070559832fc7c154d98 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 c3c57bc7fd4a50963c359d9f52879b6b5b686e09..13852515ff5b171ce88dd557adf8fff150cffaf2 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 2016ada0620a3e7ad3e8799df23ee06c3baac4c9..4b0aa39c00acbfec7fd7a2fd5182a5ce91ad5601 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 27d76e2df029b997338368932cdb12afb862df26..dd33d2368b8b36cc079d679785b7a4bac5880007 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 58c36623015c51c184e24f6757795475dbb84931..218644c3617e4cda730f4bacc6180e70a6c3bd66 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 5177dcaa827186b0c564f1eaceadd352ece68eab..bb24b5e420bf2a5ae16a9657322de0519eb3b0b8 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 b46506ff711008afb1649bc8fd96e7a6e5a274b2..42e35843931084cc342d054829564b2abe401ddf 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 96cd17ce60d55a6ab779935a0a32eb6c5d103ad1..8581f53bb9b5a796fd8f71019d803665bd6ba2be 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 267354e313f4ece5f2f598bb77e0bf7061e1185f..2f4f24a381c64783c22bd3e5cc91409c7b8ff6ba 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<class Type>
void Foam::fv::CodedSource<Type>::prepare
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 3d46dc56dd4d2081248085fb1b7692507cb5862d..f97f0630c311f5a3ad365803cad62a8fa894b475 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<ParcelType>::calc
}
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
template<class ParcelType>
template<class TrackData>
void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index adc6a30ca10d9677b8a96c69f28919cfd74a02a0..cabb3d7dc602ad664ec6976a3288cf78a8d9f32a 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<CloudType>::makeLogFile
}
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
template<class CloudType>
void Foam::FacePostProcessing<CloudType>::write()
{
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 066528fe3d43080ccfc3b1f73c457df235125c9e..3eb5075c931b0fe9befed694a26fabfaa048de43 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<CloudType>::collectParcelConcentricCircles
}
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
template<class CloudType>
void Foam::ParticleCollector<CloudType>::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 3cbccc478734c44f27e0227f2cb909cc1a881af1..674d4b182414d87a3591d78565caf2d37afbbb06 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<class CloudType>
Foam::scalar Foam::NonSphereDragForce<CloudType>::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 c9c473a8395758a42381676d823b6bf57a00d00d..f6833065856ab21240a8724ee6f63a64841f14b7 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<class Type>
+void Foam::AveragingMethod<Type>::updateGrad()
+{}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
@@ -106,15 +113,6 @@ Foam::AveragingMethod<Type>::~AveragingMethod()
{}
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-template<class Type>
-void Foam::AveragingMethod<Type>::updateGrad()
-{
- // do nothing
-}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index eef6b78f394541c8707b3d91210687cb050d31a8..18136186b7b1059af1963782b2bf3b3376ce9cdb 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<class CloudType>
Foam::tmp<Foam::scalarField> Foam::LiquidEvaporation<CloudType>::calcXc
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
index da98006d456f21b12b7d3aec7f86bde5f8d4f1d3..4836532061367b83f98ac6addaf7f75942f3dcd4 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<class CloudType>
Foam::tmp<Foam::scalarField> Foam::LiquidEvaporationBoil<CloudType>::calcXc
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 5654799dac2af5aadca14173a7f4cc0a1c4a4663..094e47161126f20cd435e9d28541b44d69f771ea 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<CloudType>::interactionTypeStr
}
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
template<class CloudType>
Foam::vector Foam::ThermoSurfaceFilm<CloudType>::tangentVector
(
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 8c3f8fa448ff300e0e61008dff0530416faed1fb..18724c978781b7e6e9cc07fa4657f6e0a3347492 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 e75eaf624e24f1b203be2209687d752e804ca255..cafa9a49a3cc2d5f1732746da22ae60549593680 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 ac7572f59534b2454387b461e6a08cecc33ad5e3..a54b2f790e3c70fc7b7493b2d0d3dd8b31f69d16 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 13a617d9b8a61a288dcbdb8d88e4510c493df5b9..6d0295b832687d7d6ab0f6f915ab84b29f77869f 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::indexedOctree<Foam::treeDataEdge>>&
-Foam::refinementFeatures::regionEdgeTrees() const
-{
- if (!regionEdgeTreesPtr_.valid())
- {
- regionEdgeTreesPtr_.reset
- (
- new PtrList<indexedOctree<treeDataEdge>>(size())
- );
- PtrList<indexedOctree<treeDataEdge>>& 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>
- (
- 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::indexedOctree<Foam::treeDataEdge>>&
+Foam::refinementFeatures::regionEdgeTrees() const
+{
+ if (!regionEdgeTreesPtr_.valid())
+ {
+ regionEdgeTreesPtr_.reset
+ (
+ new PtrList<indexedOctree<treeDataEdge>>(size())
+ );
+ PtrList<indexedOctree<treeDataEdge>>& 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>
+ (
+ 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 a55351c1629d6b69933f96371dcdb1722ac2d787..269b7199d948a70c43481c52a8c0bbbe0c43af93 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
@@ -53,8 +53,6 @@ class refinementFeatures
:
public PtrList<extendedFeatureEdgeMesh>
{
-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 592e0af3176606edab18a16c69a006d90f10face..3663a946488ab172711bf4d6ca63a1a2bc50a298 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 ac0892c49f0398460b9cfac894ecd4b922777613..ccababa2724e5519daa8ba72c01e952e951f01cd 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 cbf5717f115c5e0158f5cd2435853d3174dd5464..941aa73145333c49c1623235bf3e312591afb09c 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 4e865bd0b11c13e6ede0254b59a75233202a2721..33d7810da8cc501ed1c3e697ce8b3242c1108dfc 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<class Type, class TrackingData>
void Foam::OppositeFaceCellWave<Type, TrackingData>::opposingFaceLabels
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
index bcfe3cb0ddafc991691bd72fdf48bd852303cf0d..12701070822163bc433417eab95fe6584fb16cce 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<class Type, class TrackingData = int>
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index 5cf7a37dd7cd39524ffb2da2afcaeaed6e436b61..8a9a94815f593cfead1383a1167ceed2e95cdc45 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 960ee5c23a2c152c83a740853219d6a7804b6fa0..371b753ffb664e2b9f49412cd06499c2a6930cc7 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 2e464a233bb45a83952fd4ce86ec9e8bbff5c028..613499533311de72d9b3f0d2b7ed73b7e47c595c 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 b0208601e708555db3d621223eba69020c9557b1..371e57aba48766323d2086a4f6b0832343ef6fcb 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<OFstream> 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 50979b68bec7014a8c8de493ea4f0adb6e244933..f583aaea86d7685eb423b16a50bedecbf0e64601 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 d1281cfb457cd542804eb1213faebdcc7771e3f9..0b6da778812d164b8ea9fe15175fd3b7ab197c8f 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> Foam::sampledSurface::New
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 1cc3ddcba46736391813c080c62cd8b78f5338ab..70fb00c212be0e07411e2da82511f64c2f8b76a5 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<SubField<point>&>
+ (
+ const_cast<Field<point>&>(MeshReference::points())
+ ) = reinterpret_cast<SubField<point>&>(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<SubField<point>&>
- (
- const_cast<Field<point>&>(MeshReference::points())
- ) = reinterpret_cast<SubField<point>&>(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<pointField>& points,
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
index 6d1a8d3fc19db4f088aefa68adcf89ff803f1122..3f309be57e415ef794d1022291bfb46dee7747f5 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 89ab4290956bf6d958a0a6d0814a3fdb5699691e..9a62bbf6126898430a21d0e81161fb47e00c6451 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 c73db97ddb5c625a6a02b6843dd9d72f93ab823d..44d55d2a076d1743584ce458c2efb573cffe09cc 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 501806c4174e074859a043eb83e10cdb56e54453..9a28648d0c22c0310f6834c99fecfa893ed4552d 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 b7c33c9e9a76f50889c4d574b1a77de456de76d6..3b229a85a120eebaa313650b2f97f090330ea337 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 2ba0dbf5f39b7ec2f710bc3407afb28f54bdc32b..0dd477304a4c237e3438166ca4057342c2340e90 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 c58ff931407a105f1a7dbcf9a0455878fa2d794e..f7161a5b097bd78aa5b33d0c50e080bf6c92fc7b 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 032423dd98b21b415b5f82588bd744e5fff5fcd8..51ee83a03d0f6109a6d95703032da3d99c017ba4 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");