From 14b4c3849c02e71d0f3bec581a1125787f058748 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 18 Jun 2010 09:45:39 +0200
Subject: [PATCH] ENH: allow protected access to RAS model coeffs/methods
---
.../PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H | 5 ++++-
src/turbulenceModels/compressible/RAS/LRR/LRR.H | 5 ++++-
.../compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 5 ++++-
.../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H | 5 ++++-
.../compressible/RAS/RNGkEpsilon/RNGkEpsilon.H | 5 ++++-
.../compressible/RAS/SpalartAllmaras/SpalartAllmaras.H | 7 +++++--
src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H | 5 ++++-
.../compressible/RAS/kOmegaSST/kOmegaSST.H | 5 ++++-
.../compressible/RAS/realizableKE/realizableKE.H | 7 +++++--
src/turbulenceModels/incompressible/RAS/LRR/LRR.H | 5 ++++-
.../incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H | 5 ++++-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 5 ++++-
.../incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H | 7 +++++--
.../incompressible/RAS/LienCubicKE/LienCubicKE.H | 5 ++++-
.../incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H | 5 ++++-
.../RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H | 5 ++++-
.../incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H | 5 ++++-
.../incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H | 5 ++++-
.../incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H | 7 +++++--
.../incompressible/RAS/kEpsilon/kEpsilon.H | 5 ++++-
src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H | 5 ++++-
.../incompressible/RAS/kOmegaSST/kOmegaSST.H | 7 +++++--
src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H | 7 +++++--
.../incompressible/RAS/realizableKE/realizableKE.H | 7 +++++--
24 files changed, 103 insertions(+), 31 deletions(-)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 483c7257dc6..a15563ae160 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 e1241528d6d..d9fa1c60d12 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 e9343bec598..a4e51d0b8b3 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 ce85709cfea..22849cdd31e 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 43b39a7ac12..29a7fdd4338 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 8164624bddc..f08e0d255fd 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 ca00c5d267b..34c567f4f62 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 0ee1502aa9e..38266217eb2 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 ab86cd0015b..4a30d503620 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 2b916f182a0..a9d5fc0ce32 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 c246518cab9..86dfc81bacb 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 7df7624f820..0f8fa2ed0af 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 05cfafa5c80..278c5e8b1dd 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 d7c616d50b1..3192002d010 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 39420789162..57eed462a8c 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 0cd19ca629f..21f8e1bb8c6 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 1ca72f44f43..6bd8b41b5d3 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 be56746b162..3f78bdf0070 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 6763149306b..b87121c2017 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 b13666dacfa..85cccdd23da 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 1027e5eec58..c4593b9b3ec 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 c233a52e6c6..5d608f2792d 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 c8961d52288..299f084c61d 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 b1495aa6e87..0b2a6608ea3 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
(
--
GitLab