Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -6,13 +6,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for compilation (at least for error catching)
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+# Get version info and arch-path
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/libccmio)
+
 set -x
 
-# build libccmio and create lnInclude directory
-$WM_THIRD_PARTY_DIR/AllwmakeLibccmio
+# Build libccmio (.so)
+$WM_THIRD_PARTY_DIR/makeCCMIO
 
-# if the library built properly, the headers should exist too
-if [ -e $FOAM_EXT_LIBBIN/libccmio.so ]
+if [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
+  -a -e $FOAM_EXT_LIBBIN/libccmio.so ]
 then
     wmake ccm26ToFoam
 fi

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options

@@ -1,10 +1,7 @@
-LIBCCMIO_DIR = $(WM_THIRD_PARTY_DIR)/libccmio-2.6.1
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIBCCMIO_DIR) \
-    -I$(LIBCCMIO_DIR)/lnInclude
+    -I$(CCMIO_ARCH_PATH)/include
 
 EXE_LIBS = \
     -lfiniteVolume \

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C

@@ -49,7 +49,7 @@ Description
 #include "SortableList.H"
 #include "cellSet.H"
 
-#include <ccmio.h>
+#include "libccmio/ccmio.h"
 #include <vector>
 
 using namespace Foam;

applications/utilities/mesh/generation/Allwmake

@@ -3,12 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for compilation (at least for error catching)
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-# Get CGAL and boost versions
-. $WM_PROJECT_DIR/etc/config.sh/functions
-_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
-          $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
-
 set -x
 
 wmake -all blockMesh
@@ -16,10 +10,6 @@ wmake -all extrude
 wmake -all extrude2DMesh
 wmake -all snappyHexMesh
 
-if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
-then
-    foamyMesh/Allwmake $*
-fi
-
+foamyMesh/Allwmake $*
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/Allwmake

@@ -4,15 +4,21 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
 
-wmake $targetType conformalVoronoiMesh
-wmake $targetType conformalVoronoi2DMesh
-wmake foamyQuadMesh
-wmake foamyHexMesh
-#wmake foamyHexMeshBackgroundMesh
-#(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
-#wmake cellSizeAndAlignmentGrid
+if [ -d "$CGAL_ARCH_PATH/include/CGAL" ] || \
+   [ "${CGAL_ARCH_PATH##*-}" = system -a -d /usr/include/CGAL ]
+then
+    set -x
 
+    wmake $targetType conformalVoronoiMesh
+    wmake $targetType conformalVoronoi2DMesh
+    wmake foamyQuadMesh
+    wmake foamyHexMesh
+    # wmake foamyHexMeshBackgroundMesh
+    # (cd foamyHexMeshSurfaceSimplify && ./Allwmake)
+    # wmake cellSizeAndAlignmentGrid
+else
+    echo "WARNING: cannot build ${PWD##*/} without CGAL"
+fi
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/manipulation/insideCells/insideCells.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,7 @@ Description
 #include "triSurface.H"
 #include "triSurfaceSearch.H"
 #include "cellSet.H"
+#include "globalMeshData.H"
 
 using namespace Foam;
 
@@ -54,7 +55,6 @@ int main(int argc, char *argv[])
         "Surface must be closed and singly connected."
     );
 
-    argList::noParallel();
     argList::validArgs.append("surfaceFile");
     argList::validArgs.append("cellSet");
 
@@ -87,7 +87,8 @@ int main(int argc, char *argv[])
     }
 
 
-    Info<< "Selected " << insideCells.size() << " of " << mesh.nCells()
+    Info<< "Selected " << returnReduce(insideCells.size(), sumOp<label>())
+        << " of " << mesh.globalData().nTotalCells()
         << " cells" << nl << nl
         << "Writing selected cells to cellSet " << insideCells.name()
         << nl << nl