From 5b42b30b5d31b9cf95c7e4268bd50fd30f3c970d Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 3 Apr 2009 23:02:46 +0100 Subject: [PATCH] Use scoped class names to avoid name clashes when both the compressible and incompressible libraries are linked into the same executable. --- .../turbulentHeatFluxTemperatureFvPatchScalarField.H | 2 +- ...urbulentMixingLengthDissipationRateInletFvPatchScalarField.H | 2 +- .../turbulentMixingLengthFrequencyInletFvPatchScalarField.H | 2 +- .../alphatWallFunction/alphatWallFunctionFvPatchScalarField.H | 2 +- .../epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H | 2 +- .../kQRWallFunction/kQRWallFunctionFvPatchField.H | 2 +- .../omegaWallFunction/omegaWallFunctionFvPatchScalarField.H | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H index 4640acc7db..f7581102df 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H @@ -66,7 +66,7 @@ class turbulentHeatFluxTemperatureFvPatchScalarField public: //- Runtime type information - TypeName("turbulentHeatFluxTemperature"); + TypeName("compressible::turbulentHeatFluxTemperature"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H index dcadbdd8b9..1eb669f06b 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H @@ -72,7 +72,7 @@ class turbulentMixingLengthDissipationRateInletFvPatchScalarField public: //- Runtime type information - TypeName("turbulentMixingLengthDissipationRateInlet"); + TypeName("compressible::turbulentMixingLengthDissipationRateInlet"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H index 90d374a336..45d8d2663c 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H @@ -76,7 +76,7 @@ class turbulentMixingLengthFrequencyInletFvPatchScalarField public: //- Runtime type information - TypeName("turbulentMixingLengthFrequencyInlet"); + TypeName("compressible::turbulentMixingLengthFrequencyInlet"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index da71e80a2f..c49a0bc482 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -66,7 +66,7 @@ class alphatWallFunctionFvPatchScalarField public: //- Runtime type information - TypeName("alphatWallFunction"); + TypeName("compressible::alphatWallFunction"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H index 42bdeea681..506e9f8c2d 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H @@ -87,7 +87,7 @@ class epsilonWallFunctionFvPatchScalarField public: //- Runtime type information - TypeName("epsilonWallFunction"); + TypeName("compressible::epsilonWallFunction"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H index 05ed2fbcb8..a4a9ddbc30 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.H @@ -67,7 +67,7 @@ class kQRWallFunctionFvPatchField public: //- Runtime type information - TypeName("kQRWallFunction"); + TypeName("compressible::kQRWallFunction"); // Constructors diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H index 6dfe7a772b..675d3a16fb 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H @@ -85,7 +85,7 @@ class omegaWallFunctionFvPatchScalarField public: //- Runtime type information - TypeName("omegaWallFunction"); + TypeName("compressible::omegaWallFunction"); // Constructors