diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 483c7257dc6968cb87c8d37e91ea438b9a5fe76b..a15563ae160f218dbbb09bb3716cf5dbee2066d4 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -79,7 +79,10 @@ class PDRkEpsilon : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H index e1241528d6d1ac7d01525e7c3a4045172ec05652..d9fa1c60d121c0d5fdb6da13b2c1c5489c687cb7 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H +++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H @@ -73,7 +73,10 @@ class LRR : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H index e9343bec59868cd9bb43d61f9d3d013be639de01..a4e51d0b8b34cb5dd1b731ad5f88102f31a562ae 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -76,7 +76,10 @@ class LaunderGibsonRSTM : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H index ce85709cfea4a8cd4c33cd4dc7470a79555ff79a..22849cdd31e5cacbf14f0b4870b13b81ed9359ed 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -69,7 +69,10 @@ class LaunderSharmaKE : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H index 43b39a7ac12fe1b3526c29fbe72695fca5bda1ca..29a7fdd433859fd2b166e8d08b605877b0a41581 100644 --- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -70,7 +70,10 @@ class RNGkEpsilon : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 8164624bddc7caa7d8396af5f0e7f2d81fbef89e..f08e0d255fdf43f622393c96552df964f3402d1a 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -87,7 +87,10 @@ class SpalartAllmaras : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -115,7 +118,7 @@ class SpalartAllmaras wallDist d_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> chi() const; tmp<volScalarField> fv1(const volScalarField& chi) const; diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H index ca00c5d267b1fb9a6a98596fdde8080a57d92cc2..34c567f4f627d948173d5e1ec677e3d1267f3408 100644 --- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H @@ -68,7 +68,10 @@ class kEpsilon : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H index 0ee1502aa9e7b8451c0d8f6254bb6220bc2e5587..38266217eb216cf4bc1f45dd2473f9912ec7ab2a 100644 --- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H @@ -98,7 +98,10 @@ class kOmegaSST : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H index ab86cd0015becd6723ab9043e55a0f394c22ea4f..4a30d503620f8dd3abf31074ef4f3d1f053657c3 100644 --- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H +++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H @@ -78,7 +78,10 @@ class realizableKE : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -98,7 +101,7 @@ class realizableKE volScalarField alphat_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> rCmu ( diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H index 2b916f182a07a119274c8ec23d89e8e739c08051..a9d5fc0ce32d38ca1a6013ccb204f7da73ad9c9c 100644 --- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H +++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H @@ -71,7 +71,10 @@ class LRR : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H index c246518cab91e1da34ab256d07c89939a3bfcd9a..86dfc81bacb9aea43c715393ad604e1503648e7f 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -56,7 +56,10 @@ class LamBremhorstKE : public RASModel { - // Private data + +protected: + + // Protected data dimensionedScalar Cmu_; dimensionedScalar C1_; diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H index 7df7624f820350db734d521919d6c5018edc4a0e..0f8fa2ed0af813e19c498700cade4a59d4c4a446 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -75,7 +75,10 @@ class LaunderGibsonRSTM : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 05cfafa5c80d2636fc7ee5397d560dcf17df2fab..278c5e8b1dd2ce477787411489ab06c781d76ad1 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -67,7 +67,10 @@ class LaunderSharmaKE : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -84,7 +87,7 @@ class LaunderSharmaKE volScalarField nut_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> fMu() const; tmp<volScalarField> f2() const; diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H index d7c616d50b14006c3c8ef0711d4491bab0d55b01..3192002d01037c8a657ad6eb42d17a120044cdf4 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H @@ -54,7 +54,10 @@ class LienCubicKE : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H index 39420789162a1c7fb8ff705f97c4ebaf7659ab3e..57eed462a8c65dc8d90e2748f4ac2415bf7abe72 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H @@ -70,7 +70,10 @@ class LienCubicKELowRe : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H index 0cd19ca629f01e58cd966f1e238c8cb886d63dbc..21f8e1bb8c6b2b502a42d65c37f6ddc22ec43bad 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H +++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H @@ -56,7 +56,10 @@ class LienLeschzinerLowRe : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H index 1ca72f44f433c8d7e0e5b4b3b76ad053c0fc95a4..6bd8b41b5d39be140c459d210f2bbd32017d1ebd 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H @@ -55,7 +55,10 @@ class NonlinearKEShih : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H index be56746b162198ce5f10155e243ca2cae613b3af..3f78bdf0070294198935d9dc0ed8376d1d4e2d42 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -68,7 +68,10 @@ class RNGkEpsilon : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 6763149306bfd331020df44c4156742a93dea4bf..b87121c201766d342ed49a2732ed5a89e7233943 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -86,7 +86,10 @@ class SpalartAllmaras : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -110,7 +113,7 @@ class SpalartAllmaras wallDist d_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> chi() const; diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H index b13666dacfa345b59957320769515c03732517de..85cccdd23dae17c5887efaeaf8e79fca68fb3d4f 100644 --- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H @@ -65,7 +65,10 @@ class kEpsilon : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H index 1027e5eec58f748aa920b66ebf7ac8f55f5baae5..c4593b9b3ec1f1638e92dbd196afb5f53ce48e94 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H +++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H @@ -78,7 +78,10 @@ class kOmega : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H index c233a52e6c6f1fab937fe310f28c1e8271ee975b..5d608f2792dbff3c7b3eb9e36dfa575476664864 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H @@ -98,7 +98,10 @@ class kOmegaSST : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients dimensionedScalar alphaK1_; @@ -129,7 +132,7 @@ class kOmegaSST volScalarField nut_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> F1(const volScalarField& CDkOmega) const; tmp<volScalarField> F2() const; diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H index c8961d52288dffde028ed53afd5d2473f50ca9ae..299f084c61dc309b15ff8cd388f5f67af87ba36f 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H @@ -55,7 +55,10 @@ class qZeta : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -82,7 +85,7 @@ class qZeta volScalarField nut_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> fMu() const; tmp<volScalarField> f2() const; diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H index b1495aa6e871b20598c857659acdc67b587b8cbc..0b2a6608ea38c99cea000352ba721825a71b3518 100644 --- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H +++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H @@ -77,7 +77,10 @@ class realizableKE : public RASModel { - // Private data + +protected: + + // Protected data // Model coefficients @@ -95,7 +98,7 @@ class realizableKE volScalarField nut_; - // Private Member Functions + // Protected Member Functions tmp<volScalarField> rCmu (