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

applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C

@@ -37,15 +37,24 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+
+#   include "addOverwriteOption.H"
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+    const bool overwrite = args.optionFound("overwrite");
+
+    if (!overwrite)
+    {
+        runTime++;
+    }
+
     mirrorFvMesh mesh
     (
         IOobject
         (
             mirrorFvMesh::defaultRegion,
-            runTime.timeName(),
+            runTime.constant(),
             runTime
         )
     );

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -1036,6 +1036,22 @@ int main(int argc, char *argv[])
         (
             UIndirectList<label>(faceProcAddressing, map().faceMap())
         );
+
+        // Detect any flips.
+        const labelHashSet& fff = map().flipFaceFlux();
+        forAllConstIter(labelHashSet, fff, iter)
+        {
+            label faceI = iter.key();
+            label masterFaceI = faceProcAddressing[faceI];
+
+            faceProcAddressing[faceI] = -masterFaceI;
+
+            if (masterFaceI == 0)
+            {
+                FatalErrorIn(args.executable()) << "problem faceI:" << faceI
+                    << " masterFaceI:" << masterFaceI << exit(FatalError);
+            }
+        }
     }
     if (pointProcAddressing.headerOk())
     {
@@ -1083,9 +1099,13 @@ int main(int argc, char *argv[])
         );
         Info<< "After renumbering :" << nl
             << "    band           : " << band << nl
-            << "    profile        : " << profile << nl
-            << "    rms frontwidth : " << rmsFrontwidth << nl
-            << endl;
+            << "    profile        : " << profile << nl;
+        if (doFrontWidth)
+        {
+
+            Info<< "    rms frontwidth : " << rmsFrontwidth << nl;
+        }
+        Info<< endl;
     }
 
     if (orderPoints)

src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.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
@@ -377,18 +377,24 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         // take care of the face direction offset trick.
         //
         {
-            labelList curAddr(faceProcAddressing_[procI]);
+            const labelList& faceMap = faceProcAddressing_[procI];
 
-            forAll(curAddr, addrI)
+            // Addressing into original field
+            labelList curAddr(faceMap.size());
+            // Correctly oriented copy of internal field
+            Field<Type> procInternalField(procField.internalField());
+
+            forAll(faceMap, addrI)
             {
-                curAddr[addrI] -= 1;
+                curAddr[addrI] = mag(faceMap[addrI])-1;
+                if (faceMap[addrI] < 0)
+                {
+                    procInternalField[addrI] = -procInternalField[addrI];
+                }
             }
 
-            internalField.rmap
-            (
-                procField.internalField(),
-                curAddr
-            );
+            // Map
+            internalField.rmap(procInternalField, curAddr);
         }
 
         // Set the boundary patch values in the reconstructed field

src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C

@@ -102,8 +102,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField
         const scalarField& Tp =
             patch().lookupPatchField<volScalarField, scalar>(TName_);
 
+        //NOTE: Assumes emissivity = 1 as the solidThermo might
+        // not be constructed yet
         refValue() =
-            4.0*physicoChemical::sigma.value()*pow4(Tp)*emissivity()/pi;
+            4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
         refGrad() = 0.0;
         valueFraction() = 1.0;
 

src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C

@@ -174,7 +174,7 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
 void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    zGround_.writeEntry("z0", os) ;
+    z0_.writeEntry("z0", os) ;
     os.writeKeyword("n")
         << n_ << token::END_STATEMENT << nl;
     os.writeKeyword("z")

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict

@@ -174,7 +174,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  lookup;
-                Qro             uniform 0;
                 emissivity      uniform 1.0;
                 value           uniform 0;
             }
@@ -184,7 +183,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  solidThermo;
-                Qro             uniform 0;
                 value           uniform 0;
             }
         }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict

@@ -221,7 +221,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  lookup;
-                Qro             uniform 0;
                 emissivity      uniform 1.0;
                 value           uniform 0;
             }
@@ -231,7 +230,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  solidThermo;
-                Qro             uniform 0;
                 value           uniform 0;
             }
         }

tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean

@@ -5,6 +5,5 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0/polyMesh
 
 # ----------------------------------------------------------------- end-of-file

tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun

@@ -10,17 +10,14 @@ application=`getApplication`
 runApplication blockMesh
 transformPoints -scale '(1.6666 1 1)'
 
-#cp system/changeDictionaryDict.X system/changeDictionaryDict
 runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
-runApplication mirrorMesh
+runApplication mirrorMesh -overwrite
 rm log.mirrorMesh
 
 rm log.changeDictionary
-#cp system/changeDictionaryDict.Y system/changeDictionaryDict
 runApplication changeDictionary -instance system -dict  system/changeDictionaryDict.Y
 
-runApplication mirrorMesh
-cp -rf 0/polyMesh constant/
+runApplication mirrorMesh -overwrite
 
 runApplication topoSet
 runApplication createPatch -overwrite

tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary

-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "0/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    outlet
-    {
-        type            patch;
-        nFaces          320;
-        startFace       99370;
-    }
-    up
-    {
-        type            symmetryPlane;
-        nFaces          380;
-        startFace       99690;
-    }
-    hole
-    {
-        type            wall;
-        nFaces          560;
-        startFace       100070;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          100000;
-        startFace       100630;
-    }
-)
-
-// ************************************************************************* //