Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H

@@ -29,7 +29,7 @@ Description
 
     \verbatim
         <entryName>   tableFile;
-        tableCoeffs
+        tableFileCoeffs
         {
             fileName        dataFile;   // name of data file
             outOfBounds     clamp;      // optional out-of-bounds handling

src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.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) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,8 +41,6 @@ namespace Foam
 
 void Foam::IDDESDelta::calcDelta()
 {
-    label nD = mesh().nGeometricD();
-
     const volScalarField& hmax = hmax_();
 
     // initialise wallNorm
@@ -50,7 +48,7 @@ void Foam::IDDESDelta::calcDelta()
 
     const volVectorField& n = wallNorm.n();
 
-    tmp<volScalarField> faceToFacenMax
+    tmp<volScalarField> tfaceToFacenMax
     (
         new volScalarField
         (
@@ -67,61 +65,60 @@ void Foam::IDDESDelta::calcDelta()
         )
     );
 
-    const cellList& cells = mesh().cells();
+    scalarField& faceToFacenMax = tfaceToFacenMax().internalField();
 
-    forAll(cells,cellI)
+    const cellList& cells = mesh().cells();
+    const vectorField& faceCentres = mesh().faceCentres();
+
+    forAll(cells, cellI)
     {
         scalar deltaMaxTmp = 0.0;
-        const labelList& cFaces = mesh().cells()[cellI];
-        const point& faceCentre = mesh().faceCentres()[cFaces[0]];
+        const labelList& cFaces = cells[cellI];
+        const point& faceCentre = faceCentres[cFaces[0]];
         const vector nCell = n[cellI];
         forAll(cFaces, cFaceI)
         {
             label faceI = cFaces[cFaceI];
-            const point& faceCentreTwo = mesh().faceCentres()[faceI];
+            const point& faceCentreTwo = faceCentres[faceI];
             scalar tmp = (faceCentre - faceCentreTwo) & nCell;
             if (tmp > deltaMaxTmp)
             {
                 deltaMaxTmp = tmp;
             }
         }
-        faceToFacenMax()[cellI] = deltaMaxTmp;
+        faceToFacenMax[cellI] = deltaMaxTmp;
     }
 
-    if (nD == 3)
+
+    label nD = mesh().nGeometricD();
+
+    if (nD == 2)
     {
-        delta_.internalField() =
-            deltaCoeff_
-           *min
+        WarningIn("IDDESDelta::calcDelta()")
+            << "Case is 2D, LES is not strictly applicable" << nl
+            << endl;
+    }
+    else if (nD != 3)
+    {
+        FatalErrorIn("IDDESDelta::calcDelta()")
+            << "Case must be either 2D or 3D" << exit(FatalError);
+    }
+
+    delta_.internalField() =
+        deltaCoeff_
+       *min
+        (
+            max
             (
                 max
                 (
-                    max(cw_*wallDist(mesh()).y(), cw_*hmax),
-                    faceToFacenMax()
+                    cw_*wallDist(mesh()).y(),
+                    cw_*hmax
                 ),
-                hmax
-            );
-    }
-    else if (nD == 2)
-    {
-        WarningIn("IDDESDelta::calcDelta()")
-            << "Case is 2D, LES is not strictly applicable\n"
-            << endl;
-
-        delta_.internalField() =
-            deltaCoeff_
-           *min
-            (
-                max(max(cw_*wallDist(mesh()).y(), cw_*hmax), faceToFacenMax()),
-                hmax
-            );
-    }
-    else
-    {
-        FatalErrorIn("IDDESDelta::calcDelta()")
-            << "Case is not 3D or 2D, LES is not strictly applicable"
-            << exit(FatalError);
-    }
+                tfaceToFacenMax
+            ),
+            hmax
+        );
 }
 
 
@@ -136,10 +133,7 @@ Foam::IDDESDelta::IDDESDelta
 :
     LESdelta(name, mesh),
     hmax_(LESdelta::New("hmax", mesh, dd.parent())),
-    deltaCoeff_
-    (
-        readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))
-    ),
+    deltaCoeff_(readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))),
     cw_(0.15)
 {
     dd.subDict(type() + "Coeffs").readIfPresent("cw", cw_);

src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C

@@ -118,7 +118,9 @@ void fixedShearStressFvPatchVectorField::updateCoeffs()
 
     const scalarField& ry = patch().deltaCoeffs();
 
-    tmp<scalarField> nuEffw = rasModel.nuEff()().boundaryField()[patchI];
+    tmp<volScalarField> tnuEff = rasModel.nuEff();
+    const volScalarField& nuEff = tnuEff();
+    const scalarField& nuEffw = nuEff.boundaryField()[patchI];
 
     tmp<vectorField> UwUpdated =
         tauHat*(tauHat & (tau0_*(1.0/(ry*nuEffw)) + Ui));