diff --git a/applications/utilities/postProcessing/turbulence/R/Make/files b/applications/utilities/postProcessing/turbulence/R/Make/files
index 2828aa9a4c824b7772f9031286b47abcd4dbcca9..2190c62f4644cbd5022a93d67c71ffffad408821 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/files
+++ b/applications/utilities/postProcessing/turbulence/R/Make/files
@@ -1,3 +1,4 @@
R.C
+compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.C
EXE = $(FOAM_APPBIN)/R
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 0bab1a4e41c512f80f2832bb2e79c978ad5058d9..a136b166617e80d33402b218f9c0bf990eee2bae 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
+ -I$(LIB_SRC)/postProcessing/postCalc \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
+ $(FOAM_LIBBIN)/postCalc.o \
-lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume \
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 0a0de92633cac40fd4fd1150c44628f4e727b131..b96bb03947c804da8786d235a3fdc94b113c6c3d 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,22 +29,17 @@ Description
\*---------------------------------------------------------------------------*/
+#include "calc.H"
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-int main(int argc, char *argv[])
+void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
- #include "setRootCase.H"
-
- #include "createTime.H"
- #include "createMesh.H"
#include "createFields.H"
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
Info<< "\nCalculating the Reynolds Stress R\n" << endl;
volSymmTensorField R
@@ -63,8 +58,6 @@ int main(int argc, char *argv[])
R.write();
Info<< "End" << endl;
-
- return 0;
}
diff --git a/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.C b/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.C
new file mode 100644
index 0000000000000000000000000000000000000000..37dce5e28946235a3c38099b9d7c00c48dae4413
--- /dev/null
+++ b/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.C
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::
+turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+(
+ const fvPatch& p,
+ const DimensionedField<symmTensor, volMesh>& iF
+)
+:
+ fixedValueFvPatchSymmTensorField(p, iF)
+{}
+
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::
+turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+(
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField& ptf,
+ const fvPatch& p,
+ const DimensionedField<symmTensor, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchSymmTensorField(ptf, p, iF, mapper)
+{}
+
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::
+turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+(
+ const fvPatch& p,
+ const DimensionedField<symmTensor, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchSymmTensorField(p, iF)
+{
+
+ fvPatchSymmTensorField::operator=(symmTensorField("value", dict, p.size()));
+}
+
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::
+turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+(
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField& ptf
+)
+:
+ fixedValueFvPatchSymmTensorField(ptf)
+{}
+
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::
+turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+(
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField& ptf,
+ const DimensionedField<symmTensor, volMesh>& iF
+)
+:
+ fixedValueFvPatchSymmTensorField(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField::write
+(
+ Ostream& os
+) const
+{
+ fvPatchSymmTensorField::write(os);
+ writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ makePatchTypeField
+ (
+ fvPatchSymmTensorField,
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ );
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.H b/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.H
new file mode 100644
index 0000000000000000000000000000000000000000..4f3fc8046fb4b0d663e599f02d880f615c9ef3db
--- /dev/null
+++ b/applications/utilities/postProcessing/turbulence/R/compatibilityFvPatchFields/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.H
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+
+Description
+ Dummy version of turbulentIntensityKineticEnergyInlet patch type for
+ symmetric tensors provided for compatibility with R utility.
+
+ Value is given by a fixed-value condition.
+
+
+SourceFiles
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentIntensityKineticEnergyInletFvPatchSymmTensorField_H
+#define turbulentIntensityKineticEnergyInletFvPatchSymmTensorField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class turbulentIntensityKineticEnergyInletFvPatchSymmTensorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+:
+ public fixedValueFvPatchSymmTensorField
+{
+public:
+
+ //- Runtime type information
+ TypeName("turbulentIntensityKineticEnergyInlet");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ const fvPatch&,
+ const DimensionedField<symmTensor, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ const fvPatch&,
+ const DimensionedField<symmTensor, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given
+ // turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ // onto a new patch
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField&,
+ const fvPatch&,
+ const DimensionedField<symmTensor, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchSymmTensorField> clone() const
+ {
+ return tmp<fvPatchSymmTensorField>
+ (
+ new turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ *this
+ )
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ const turbulentIntensityKineticEnergyInletFvPatchSymmTensorField&,
+ const DimensionedField<symmTensor, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchSymmTensorField> clone
+ (
+ const DimensionedField<symmTensor, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchSymmTensorField>
+ (
+ new turbulentIntensityKineticEnergyInletFvPatchSymmTensorField
+ (
+ *this,
+ iF
+ )
+ );
+ }
+
+
+ // Member functions
+
+ //- Write
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/turbulence/R/createFields.H b/applications/utilities/postProcessing/turbulence/R/createFields.H
index d069c4545db5789774099457c72b280146f082f5..7c07f44f8bf81d07f44b35ca95c6377f5915475c 100644
--- a/applications/utilities/postProcessing/turbulence/R/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/R/createFields.H
@@ -12,7 +12,7 @@
mesh
);
-# include "createPhi.H"
+ #include "createPhi.H"
singlePhaseTransportModel laminarTransport(U, phi);