Merge remote branch 'OpenCFD/master' into olesenm

src/dummyThirdParty/metisDecomp/metis.h

@@ -0,0 +1,46 @@
+#ifndef METIS_H
+#define METIS_H 1
+
+/* *** DUMMY VERSION of metis.h - this file should not be included if you have metis
+ *     installed in the correct position in $WM_THIRD_PARTY_DIR - see
+ *     decompositionMethods/metisDecomp/Make/options
+ */
+
+#warning "Dummy metis.h - gets included since it cannot find metis installation."
+
+#define IDXTYPEWIDTH 32
+
+/*------------------------------------------------------------------------
+* Undefine the following #define in order to use short idxtype as the idxtype 
+*-------------------------------------------------------------------------*/
+#if IDXTYPEWIDTH == 32
+  #define SCNIDX  SCNd32
+  #define PRIIDX  PRId32
+
+  typedef int32_t idxtype;
+#elif IDXTYPEWIDTH == 64
+  #define SCNIDX  SCNd64
+  #define PRIIDX  PRId64
+
+  typedef int64_t idxtype;
+#else
+  #error "Incorrect user-supplied value fo IDXTYPEWIDTH"
+#endif
+
+
+void METIS_WPartGraphRecursive(idxtype *nvtxs, idxtype *xadj, idxtype *adjncy, idxtype *vwgt,
+                   idxtype *adjwgt, idxtype *wgtflag, idxtype *numflag, idxtype *nparts, float *tpwgts, 
+                   idxtype *options, idxtype *edgecut, idxtype *part);
+void METIS_PartGraphRecursive(idxtype *nvtxs, idxtype *xadj, idxtype *adjncy, idxtype *vwgt,
+                   idxtype *adjwgt, idxtype *wgtflag, idxtype *numflag, idxtype *nparts, idxtype *options, 
+                   idxtype *edgecut, idxtype *part);
+void METIS_WPartGraphKway(idxtype *nvtxs, idxtype *xadj, idxtype *adjncy, idxtype *vwgt, 
+                   idxtype *adjwgt, idxtype *wgtflag, idxtype *numflag, idxtype *nparts, float *tpwgts, 
+                   idxtype *options, idxtype *edgecut, idxtype *part); 
+void METIS_PartGraphKway(idxtype *nvtxs, idxtype *xadj, idxtype *adjncy, idxtype *vwgt, 
+                   idxtype *adjwgt, idxtype *wgtflag, idxtype *numflag, idxtype *nparts, idxtype *options, 
+                   idxtype *edgecut, idxtype *part); 
+
+
+
+#endif

src/meshTools/PointEdgeWave/PointEdgeWave.H

@@ -125,7 +125,7 @@ class PointEdgeWave
         label nChangedEdges_;
 
         //- Number of cyclic patches
-        bool nCyclicPatches_;
+        label nCyclicPatches_;
 
         //- For every cyclic patch two primitivePatches
         PtrList<primitivePatch> cycHalves_;

src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C

@@ -362,7 +362,7 @@ void Foam::directMappedPatchBase::findSamples
                 "(const pointField&, labelList&"
                 ", labelList&, pointField&)"
             )   << "Did not find sample " << samples[sampleI]
-                << " on any processor of region" << sampleRegion_
+                << " on any processor of region " << sampleRegion_
                 << exit(FatalError);
         }
     }

src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ void Foam::cylinderToCell::applyToSet
     }
     else if (action == topoSetSource::DELETE)
     {
-        Info<< "    Removing cells with centre within sphere, with p1 = "
+        Info<< "    Removing cells with centre within cylinder, with p1 = "
             << p1_ << ", p2 = " << p2_ << " and radius = " << radius_ << endl;
 
         combine(set, false);

src/parallel/decompose/metisDecomp/Make/options

@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include \
+    -I../../dummyThirdParty/metisDecomp  /* location of dummy metis.h */ \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \

src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C

@@ -73,6 +73,17 @@ void Foam::foamFileSurfaceWriter<Type>::write
 
     // Faces
     OFstream(surfaceDir/"faces")() << faces;
+
+    // Face centers. Not really necessary but very handy when reusing as inputs
+    // for e.g. timeVaryingMapped bc.
+    pointField faceCentres(faces.size(),point::zero);
+
+    forAll (faces, faceI)
+    {
+        faceCentres[faceI] = faces[faceI].centre(points);
+    }
+
+    OFstream(surfaceDir/"faceCentres")() << faceCentres;
 }
 
 

src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C

@@ -123,8 +123,8 @@ bool Foam::fileFormats::STLsurfaceFormatCore::readBINARY
     (
         !is
      || nTris < 0
-     || nTris < (dataFileSize - headerSize)/50
-     || nTris > (dataFileSize - headerSize)/25
+     || nTris < int(dataFileSize - headerSize)/50
+     || nTris > int(dataFileSize - headerSize)/25
     )
     {
         FatalErrorIn

src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C

@@ -204,8 +204,6 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
     const tmp<volScalarField> tk = rasModel.k();
     const volScalarField& k = tk();
 
-    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
-
     const scalarField& muw = rasModel.mu().boundaryField()[patchI];
 
     const tmp<volScalarField> tmut = rasModel.mut();