Merge commit 'OpenCFD/master' into olesenm

applications/utilities/parallelProcessing/decomposePar/decomposeParDict

@@ -59,7 +59,7 @@ manualCoeffs
 }
 
 
-//// Is the case distributred
+//// Is the case distributed
 //distributed     yes;
 //// Per slave (so nProcs-1 entries) the directory above the case.
 //roots           

applications/utilities/postProcessing/sampling/sample/sampleDict

@@ -180,7 +180,7 @@ surfaces
 
     triangleCut
     {
-        // Cutingplaneusing iso surface
+        // Cutingplane using iso surface
         type            cuttingPlane;
         planeType       pointAndNormal;
         pointAndNormalDict

src/Allwmake

@@ -17,11 +17,12 @@ wmake libso lagrangian/basic
 wmake libso triSurface
 wmake libso edgeMesh
 wmake libso surfMesh
-wmake libso meshTools
-wmake libso finiteVolume
 
 decompositionAgglomeration/Allwmake
 
+wmake libso meshTools
+wmake libso finiteVolume
+
 wmake libso sampling
 
 wmake libso dynamicMesh

src/Pstream/Allwmake

@@ -5,18 +5,18 @@ set -x
 wmake libso dummy
 
 case "$WM_MPLIB" in
-GAMMA)
-    wmake libso gamma
-    ;;
-
 LAM | *MPI* )
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
     set +x
     echo
     echo "Note: ignore spurious warnings about missing mpicxx.h headers"
     set -x
-    wmake libso mpi
+    (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso mpi)
     ;;
+
+#GAMMA)
+#    wmake libso gamma
+#    ;;
 esac
 
+
 # ----------------------------------------------------------------- end-of-file

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C

@@ -317,25 +317,18 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
 
             Info<< surfaces().names()[surfI] << ':' << nl << nl;
 
-            //const triSurfaceMesh& s = surfaces()[surfI];
-            //const geometricSurfacePatchList& regions = s.patches();
-            //labelList nTrisPerRegion(surfaces().countRegions(s));
-
             forAll(regNames, i)
             {
-                //if (nTrisPerRegion[i] > 0)
+                label patchI = meshRefinement::addPatch
-                //{
+                (
-                    label patchI = meshRefinement::addPatch
+                    mesh,
-                    (
+                    regNames[i],
-                        mesh,
+                    wallPolyPatch::typeName
-                        regNames[i],
+                );
-                        wallPolyPatch::typeName
-                    );
 
-                    Info<< patchI << '\t' << regNames[i] << nl;
+                Info<< patchI << '\t' << regNames[i] << nl;
 
-                    globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
+                globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
-                //}
             }
 
             Info<< nl;

src/decompositionAgglomeration/Allwmake

@@ -6,7 +6,7 @@ wmake libso decompositionMethods
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then
-    wmake libso parMetisDecomp
+    (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso parMetisDecomp)
 fi
 
 wmake libso MGridGenGamgAgglomeration

src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C

@@ -52,18 +52,19 @@ void Foam::setRefCell
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
-                    FatalErrorIn
+                    FatalIOErrorIn
                     (
-                        "void Foam::setRefCell"
+                        "void Foam::setRefCell\n"
-                         "("
+                         "(\n"
-                         "    const volScalarField&,"
+                         "    const volScalarField&,\n"
-                         "    const dictionary&,"
+                         "    const dictionary&,\n"
-                         "    label& scalar&,"
+                         "    label& scalar&,\n"
-                         "    bool"
+                         "    bool\n"
-                         ")"
+                         ")",
+                        dict
                     )   << "Illegal master cellID " << refCelli
                         << ". Should be 0.." << field.mesh().nCells()
-                        << exit(FatalError);
+                        << exit(FatalIOError);
                 }
             }
             else
@@ -79,36 +80,38 @@ void Foam::setRefCell
             label sumHasRef = returnReduce<label>(hasRef, sumOp<label>());
             if (sumHasRef != 1)
             {
-                FatalErrorIn
+                FatalIOErrorIn
                 (
-                    "void Foam::setRefCell"
+                    "void Foam::setRefCell\n"
-                     "("
+                     "(\n"
-                     "    const volScalarField&,"
+                     "    const volScalarField&,\n"
-                     "    const dictionary&,"
+                     "    const dictionary&,\n"
-                     "    label& scalar&,"
+                     "    label& scalar&,\n"
-                     "    bool"
+                     "    bool\n"
-                     ")"
+                     ")",
+                    dict
                 )
                   << "Unable to set reference cell for field " << field.name()
                   << nl << "    Reference point " << refPointName
-                  << " found on multiple domains" << nl << exit(FatalError);
+                  << " found on multiple domains" << nl << exit(FatalIOError);
             }
         }
         else
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
-                "void Foam::setRefCell"
+                "void Foam::setRefCell\n"
-                 "("
+                 "(\n"
-                 "    const volScalarField&,"
+                 "    const volScalarField&,\n"
-                 "    const dictionary&,"
+                 "    const dictionary&,\n"
-                 "    label& scalar&,"
+                 "    label& scalar&,\n"
-                 "    bool"
+                 "    bool\n"
-                 ")"
+                 ")",
+                dict
             )
               << "Unable to set reference cell for field" << field.name() << nl
               << "    Please supply either " << refCellName
-              << " or " << refPointName << nl << exit(FatalError);
+              << " or " << refPointName << nl << exit(FatalIOError);
         }
 
         refValue = readScalar(dict.lookup(refValueName));

src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C

@@ -369,7 +369,7 @@ void Foam::isoSurface::generateTriPoints
     {
         const polyPatch& pp = patches[patchI];
 
-        if (pp.coupled())
+        if (isA<processorPolyPatch>(pp))
         {
             if (refCast<const processorPolyPatch>(pp).owner())
             {

src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C

@@ -466,12 +466,13 @@ Foam::sampledIsoSurface::sampledIsoSurface
 {
     if (!sampledSurface::interpolate())
     {
-        FatalErrorIn
+        FatalIOErrorIn
         (
             "sampledIsoSurface::sampledIsoSurface"
-            "(const word&, const polyMesh&, const dictionary&)"
+            "(const word&, const polyMesh&, const dictionary&)",
+            dict
         )   << "Non-interpolated iso surface not supported since triangles"
-            << " span across cells." << exit(FatalError);
+            << " span across cells." << exit(FatalIOError);
     }
 
     if (zoneID_.index() != -1)
@@ -480,14 +481,15 @@ Foam::sampledIsoSurface::sampledIsoSurface
 
         if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
                 "sampledIsoSurface::sampledIsoSurface"
-                "(const word&, const polyMesh&, const dictionary&)"
+                "(const word&, const polyMesh&, const dictionary&)",
+                dict
             )   << "Cannot find patch " << exposedPatchName_
                 << " in which to put exposed faces." << endl
                 << "Valid patches are " << mesh.boundaryMesh().names()
-                << exit(FatalError);
+                << exit(FatalIOError);
         }
 
         if (debug && zoneID_.index() != -1)

tutorials/Xoodles/pitzDaily/system/controlDict

@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/Xoodles/pitzDaily3D/system/controlDict

@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/channelFoam/channel395/constant/LESProperties

@@ -16,6 +16,8 @@ FoamFile
 
 LESModel            oneEqEddy;
 
+turbulence          on;
+
 printCoeffs         on;
 
 delta               vanDriest;

tutorials/channelFoam/channel395/constant/turbulenceProperties

@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//simulationType       laminar;
+//simulationType       RASModel;
+simulationType       LESModel;
+
+
+// ************************************************************************* //

tutorials/channelFoam/channel395/system/controlDict

@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/coodles/pitzDaily/system/controlDict

@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/lesCavitatingFoam/throttle/system/controlDict

@@ -54,7 +54,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled false;
 

tutorials/lesCavitatingFoam/throttle3D/system/controlDict

@@ -54,7 +54,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled false;
 

tutorials/oodles/pitzDaily/system/controlDict

@@ -84,7 +84,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/oodles/pitzDailyDirectMapped/system/controlDict

@@ -84,7 +84,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 

tutorials/twoPhaseEulerFoam/bed/system/controlDict

@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Fields to be  averaged - runTime modifiable
         fields

tutorials/twoPhaseEulerFoam/bed2/system/controlDict

@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         outputControl outputTime;
 

tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict

@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Fields to be  averaged - runTime modifiable
         fields