From 4052d2fec0c7e790074adcb7d80342e668bfc312 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 4 Aug 2014 15:50:14 +0100
Subject: [PATCH 1/2] ENH: Radiation P-1 model - added protection for divide by
 zero

---
 .../radiationModels/radiationModel/P1/P1.C                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
index 6a8bafa9..546a0da8 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
@@ -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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,6 +217,8 @@ void Foam::radiation::P1::calculate()
     E_ = absorptionEmission_->E();
     const volScalarField sigmaEff(scatter_->sigmaEff());
 
+    const dimensionedScalar a0 ("a0", a_.dimensions(), ROOTVSMALL);
+
     // Construct diffusion
     const volScalarField gamma
     (
@@ -228,7 +230,7 @@ void Foam::radiation::P1::calculate()
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        1.0/(3.0*a_ + sigmaEff)
+        1.0/(3.0*a_ + sigmaEff + a0)
     );
 
     // Solve G transport equation

From e859f35a6d88397840f060eb3ca30f1cb28eab86 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 6 Aug 2014 10:47:59 +0100
Subject: [PATCH 2/2] BUG: turbulenceFields function object - removed execute
 from read ENH: turbulenceFields function object - Updated usage documentation

---
 .../utilities/turbulenceFields/postProcessingDict           | 2 +-
 .../utilities/turbulenceFields/turbulenceFields.C           | 4 +---
 .../utilities/turbulenceFields/turbulenceFields.H           | 6 +++---
 .../utilities/turbulenceFields/turbulenceFieldsTemplates.C  | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
index 4b817216..931c6ccf 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
@@ -19,7 +19,7 @@ functions
     turbulenceFields1
     {
         type            turbulenceFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        functionObjectLibs ("libutilityFunctionObjects.so");
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
index 9f25e517..3d89600c 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
@@ -143,7 +143,7 @@ void Foam::turbulenceFields::read(const dictionary& dict)
             Info<< "storing fields:" << nl;
             forAllConstIter(wordHashSet, fieldSet_, iter)
             {
-                Info<< "    " << modelName << '.' << iter.key() << nl;
+                Info<< "    " << modelName << ':' << iter.key() << nl;
             }
             Info<< endl;
         }
@@ -151,8 +151,6 @@ void Foam::turbulenceFields::read(const dictionary& dict)
         {
             Info<< "no fields requested to be stored" << nl << endl;
         }
-
-        execute();
     }
 }
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index 2ff4476d..45e581ce 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -32,16 +32,16 @@ Description
     further manipulation.
 
     Fields are stored as copies of the original, with the prefix
-    "tubulenceModel::", e.g.
+    "tubulenceModel:", e.g.
 
-        turbulenceModel::R
+        turbulenceModel:R
 
     Example of function object specification:
     \verbatim
     turbulenceFields1
     {
         type        turbulenceFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        functionObjectLibs ("libutilityFunctionObjects.so");
         ...
         fields
         (
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
index a3bcd713..0d067cc1 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
@@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField
 {
     typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
 
-    const word scopedName = modelName + '.' + fieldName;
+    const word scopedName = modelName + ':' + fieldName;
 
     if (obr_.foundObject<FieldType>(scopedName))
     {