Merge branch 'develop' into 'master'

Final content for 1806 release

Closes #31 and #30

See merge request Development/ThirdParty-plus!6

Allwmake

@@ -4,7 +4,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -19,6 +19,9 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
+# Dynamic library endings (default is .so)
+[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+
 # Run from third-party directory only
 cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
@@ -32,13 +35,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 }
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-# Compiler/linker settings for CMake/configure
-[ -n "$WM_CC" ]         &&  export CC="$WM_CC"
-[ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
-[ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
-[ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
-[ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
-
+exportCompiler true     # Compiler info + flags for CMake/configure
+exportLinker            # Linker flags for CMake/configure
 useGccFlag $@           # Scan arguments for a '-gcc' option
 
 warnBuildIssues()
@@ -94,17 +92,26 @@ echo "    $SCOTCH_ARCH_PATH"
 SCOTCH_SOURCE_DIR=$sourceBASE/$SCOTCH_VERSION
 
 # Needs generalizing, but works fairly well
-scotchMakefile=../../etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM
+scotchMakefile=etc/makeFiles/scotch/Makefile.inc.OpenFOAM-"$(uname -s)".shlib
+
+[ -f $scotchMakefile ] || \
+    scotchMakefile=${scotchMakefile%/*}/Makefile.inc.OpenFOAM-Linux.shlib
 
 if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
-  -a -r $FOAM_EXT_LIBBIN/libscotch.so \
-  -a -r $FOAM_EXT_LIBBIN/libscotcherrexit.so ]
+  -a -r $FOAM_EXT_LIBBIN/libscotch.$SO \
+  -a -r $FOAM_EXT_LIBBIN/libscotcherrexit.$SO ]
 then
     echo "    scotch include: $SCOTCH_ARCH_PATH/include"
     echo "    scotch library: $FOAM_EXT_LIBBIN"
 elif [ -d "$SCOTCH_SOURCE_DIR" ]
 then
 (
+    # Older versions ok, but scotch-6.0.5a cannot build in parallel.
+    # Force serial build
+    export WM_NCOMPPROCS=1
+    echo "*** building scotch in serial ***"
+    echo
+
     cd $SCOTCH_SOURCE_DIR/src || exit 1
     export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
     rm -rf $SCOTCH_ARCH_PATH
@@ -119,6 +126,9 @@ then
     mkdir -p $incDIR    2>/dev/null
     mkdir -p $libDIR    2>/dev/null
 
+    # Makefile relative to this directory
+    scotchMakefile=../../$scotchMakefile
+
     if [ -f $scotchMakefile ]
     then
         rm -f Makefile.inc
@@ -153,7 +163,7 @@ fi
 # and normal scotch was built (has include and library)
 if [ "${FOAM_MPI:-dummy}" != dummy ] && \
    [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
-  -a -r $FOAM_EXT_LIBBIN/libscotch.so ] || \
+  -a -r $FOAM_EXT_LIBBIN/libscotch.$SO ] || \
 {
     # Report that the above tests failed and pass-through the failure
     echo
@@ -167,13 +177,18 @@ then
     echo "    $SCOTCH_ARCH_PATH"
 
     if [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h \
-      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch.so \
-      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotcherrexit.so ]
+      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch.$SO \
+      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotcherrexit.$SO ]
     then
         echo "    ptscotch include: $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
         echo "    ptscotch library: $FOAM_EXT_LIBBIN/$FOAM_MPI"
     else
     (
+        # Older versions ok, but scotch-6.0.5a cannot build in parallel.
+        # Force serial build
+        export WM_NCOMPPROCS=1
+        echo "*** building pt-scotch in serial ***"
+
         cd $SCOTCH_SOURCE_DIR/src || exit 1
         export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
         echo

SOURCES.txt

 Short summary of third-party software versions for recent OpenFOAM versions.
 
+OpenFOAM-1806
+---------------
+CGAL-4.9.1
+ParaView-5.5.2      *update*
+boost_1_64_0
+fftw-3.3.7
+openmpi-1.10.4
+scotch_6.0.3
+kahip-2.00d
+
+
 OpenFOAM-1712
 ---------------
 CGAL-4.9.1
@@ -41,7 +52,7 @@ openmpi-1.10.2      *minor*
 scotch_6.0.3
 
 
-OpenFOAM-v3.0+
+OpenFOAM-3.0+
 ---------------
 CGAL-4.7            *update*
 ParaView-4.4.0      *update*
@@ -49,7 +60,7 @@ openmpi-1.10.0      *update*
 scotch_6.0.3
 
 
-OpenFOAM-v2.4
+OpenFOAM-2.4
 ---------------
 CGAL-4.6            *update*
 ParaView-4.1.0
@@ -58,7 +69,7 @@ scotch_6.0.3        *update*
 
 
 ---------------
-OpenFOAM-v2.3
+OpenFOAM-2.3
 ---------------
 CGAL-4.3
 ParaView-4.1.0

etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib

+#-------------------------------*- makefile -*---------------------------------
+# OpenFOAM notes:
+#
+# WM_CFLAGS, WM_LDFLAGS contain "-m32 -fPIC" etc
+# WM_LABEL_SIZE == 64 for 'long' instead of 'int' for OpenFOAM labels
+#
+# - compiled without pthread
+#
+# Normally set CCS, CCP by caller
+
+EXE         =
+LIB         = .dylib
+OBJ         = .o
+
+AR          = $(CC)
+ARFLAGS     = $(WM_CFLAGS) -dynamiclib -undefined dynamic_lookup -o
+CCS        ?= $(CC)
+CCP        ?= mpicc
+CCD         = $(CCP)
+CFLAGS      = $(WM_CFLAGS) -O3 \
+    -DCOMMON_FILE_COMPRESS_GZ \
+    -DCOMMON_RANDOM_FIXED_SEED \
+    -DSCOTCH_DETERMINISTIC \
+    -DSCOTCH_RENAME \
+    -Drestrict=__restrict
+
+# 32-bit vs. 64-bit labels
+ifeq ($(WM_LABEL_SIZE),64)
+CFLAGS     += -DINTSIZE64
+endif
+
+CLIBFLAGS   =
+LDFLAGS     = $(WM_LDFLAGS) -lz -lm
+
+MAKE        = make
+CP          = cp
+CAT         = cat
+LN          = ln
+MKDIR       = mkdir
+MV          = mv
+RANLIB      = echo
+LEX         = flex -Pscotchyy -olex.yy.c
+YACC        = bison -pscotchyy -y -b y
+
+#------------------------------------------------------------------------------

etc/patches/paraview-5.5.1

+paraview-5.5.2
\ No newline at end of file

etc/tools/ParaViewFunctions

@@ -3,7 +3,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -304,7 +304,7 @@ addQtSupport()
     local qmake qtLib
 
     # Check qmake can be found and handle version differences
-    qmake=$(findQtMake)
+    qmake=$(findQMake)
     if QT_VERSION=$($qmake -query QT_VERSION 2>/dev/null)
     then
         addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
@@ -450,7 +450,7 @@ installParaView()
 
     # System or non-system installation of QT?
     local qmake qtLib QT_VERSION
-    if qmake=$(findQtMake 2>/dev/null)
+    if qmake=$(findQMake 2>/dev/null)
     then
         qtLib=$($qmake -query QT_INSTALL_LIBS)
         QT_VERSION=$($qmake -query QT_VERSION 2>/dev/null)

etc/tools/ThirdPartyFunctions

@@ -3,7 +3,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -24,8 +24,43 @@ sourceBASE=$WM_THIRD_PARTY_DIR
 buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER
 installBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
 
+# Dynamic library endings (default is .so)
+[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+
 unset BUILD_SUFFIX
 #------------------------------------------------------------------------------
+# Export WM compiler settings (and flags) for CMake/configure
+# $1 = true: export compiler flags too
+exportCompiler()
+{
+    if test -n "$WM_CC" && command -v "$WM_CC" >/dev/null
+    then
+        export CC="$WM_CC"
+        if [ "$1" = true -a -n "$WM_CFLAGS" ]
+        then
+            export CFLAGS="$WM_CFLAGS"
+        fi
+    fi
+
+    if test -n "$WM_CXX" && command -v "$WM_CXX" >/dev/null
+    then
+        export CXX="$WM_CXX"
+        if [ "$1" = true -a -n "$WM_CXXFLAGS" ]
+        then
+            export CXXFLAGS="$WM_CXXFLAGS"
+        fi
+    fi
+}
+
+# Export WM linker settings for CMake/configure
+exportLinker()
+{
+    if [ -n "$WM_LDFLAGS" ]
+    then
+        export LDFLAGS="$WM_LDFLAGS"
+    fi
+}
+
 # Force use of gcc/g++
 useGcc()
 {
@@ -63,21 +98,50 @@ whichMpicc()
     echo "${mpicc:-mpicc}"
 }
 
+# The presence of wmkdep etc required for building with wmake
+requireWMakeToolchain()
+{
+    local dir="${WM_DIR:-$WM_PROJECT_DIR/wmake}"
+    local src="$dir/src"
+    local bin="$dir/platforms/$WM_ARCH$WM_COMPILER/wmkdep"
+
+    test -x $bin || {
+        echo "Warning: the 'wmkdep' binary is missing - attempting to build it"
+        ( cd $src && make -s )
+    }
+
+    test -x $bin || {
+        exec 1>&2
+        echo
+        echo "Error: cannot use wmake build for '${0##*/}"
+        echo "    The 'wmkdep' binary is missing"
+        echo "    Please run the top-level OpenFOAM Allwmake first"
+        echo
+        exit 1
+    }
+}
+
 #------------------------------------------------------------------------------
 # Some functions as per OpenFOAM etc/config.sh/functions
 
-unset -f _foamAddLib _foamAddMan _foamAddPath   # Get settings only
-unset -f _foamEtc
+unset -f _foamAddLib _foamAddLibAuto _foamAddMan _foamAddPath # Get settings only
+unset -f _foamClean _foamConfig
 
-# Source an etc file
-_foamEtc()
-{
-    local file
-    if [ $# -gt 0 ] && file=$($WM_PROJECT_DIR/bin/foamEtcFile "$@")
-    then
-        . $file
-    fi
-}
+if [ -x "$WM_PROJECT_DIR/bin/foamCleanPath" ]
+then
+    # Cleaning environment variables
+    _foamClean()
+    {
+         local var=$1
+         shift
+         eval $($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=$var "$@")
+    }
+else
+    _foamClean() { echo "No foamCleanPath" 1>&2; }
+fi
+
+# Source an etc/config.sh file
+_foamConfig() { eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh -config $@)"; }
 
 #------------------------------------------------------------------------------
 
@@ -103,19 +167,18 @@ setBuildSuffix()
 # - use max number of cores for building
 #
 unset WM_HOSTS WM_SCHEDULER
-if [ -r /proc/cpuinfo ]
-then
-    WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-else
-    WM_NCOMPPROCS=1
-fi
+
+WM_NCOMPPROCS=$(egrep -c "^processor" /proc/cpuinfo 2>/dev/null) || \
+WM_NCOMPPROCS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) || \
+WM_NCOMPPROCS=1
+: ${WM_NCOMPPROCS:=1}
 export WM_NCOMPPROCS
 
 
 #
 # If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
 #
-if [ -z "${WM_CONTINUE_ON_ERROR}" ]
+if [ -z "$WM_CONTINUE_ON_ERROR" ]
 then
     set -e
 fi
@@ -210,21 +273,26 @@ NOT_FOUND
         fi
     fi
 
-    # Default to use the path. Resolve so we know what we are using.
-    foundExe=$(command -v cmake 2> /dev/null) || foundExe=false
+    # Default to use the path, try resolving (so we know what we are using).
+    for candidate in cmake
+    do
+        foundExe=$(command -v $candidate 2>/dev/null) && break
+    done
+    : ${foundExe:=false}
+
     echo "Using cmake=$foundExe" 1>&2
     echo $foundExe
 }
 
 
 #
-# try to locate qmake according to the QMAKE_PATH
+# Try to locate qmake or qmake-qt5 according to the QMAKE_PATH
 #
 # On success: return the resolved value as output.
 # On failure: just report what is found in the path.
 #
 unset QMAKE_PATH # clear when first loaded
-findQtMake()
+findQMake()
 {
     local candidate foundExe
 
@@ -282,8 +350,14 @@ NOT_FOUND
         fi
     fi
 
-    # Default to use the path, try resolving (so we know what we are using)
-    foundExe=$(command -v qmake 2> /dev/null) || foundExe=false
+    # Default to use the path, try resolving (so we know what we are using).
+    # Some systems have qmake-qt5 as well as qmake
+    for candidate in qmake-qt5 qmake
+    do
+        foundExe=$(command -v $candidate 2>/dev/null) && break
+    done
+    : ${foundExe:=false}
+
     echo "Using qmake=$foundExe" 1>&2
     echo $foundExe
 }
@@ -325,7 +399,7 @@ pkgconfigNewPrefix()
             if [ -f "$i" -a ! -L "$i" ]
             then
                 nfiles="x$nfiles"
-                sed -i -e 's@^\(prefix=\).*$@\1'"$dir@" $i
+                sed -i~ -e 's@^\(prefix=\).*$@\1'"$dir@" $i
             fi
         done
         echo "    $libdir/*.pc  (edited ${#nfiles})"
@@ -373,7 +447,7 @@ pkgconfigAdjust()
             if [ -f "$i" -a ! -L "$i" ]
             then
                 nfiles="x$nfiles"
-                sed -i \
+                sed -i~ \
                     -e 's@^\(includedir=\)'"$dir/"'@\1${prefix}/@' \
                     -e 's@^\(libdir=\)'"$dir/"'@\1${prefix}/@'     \
                     -e 's@\(_location=\)'"$dir/"'@\1${prefix}/@'   \
@@ -486,4 +560,5 @@ applyPatch()
     fi
 }
 
+
 #------------------------------------------------------------------------------

makeADIOS

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # ADIOS version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/ADIOS
+_foamConfig ADIOS
 
 adiosPACKAGE=${adios_version:-adios-none}
 
@@ -52,11 +52,7 @@ USAGE
     exit 1
 }
 #------------------------------------------------------------------------------
-# Compiler settings for CMake/configure
-[ -n "$WM_CC" ]         &&  export CC="$WM_CC"
-[ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
-[ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
-[ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
+exportCompiler true     # Compiler info + flags for CMake/configure
 
 # Parse options
 while [ "$#" -gt 0 ]

makeTecio → makeADIOS2

@@ -3,18 +3,17 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+# This file is part of OpenFOAM, licensed under the GNU General Public License
+# <http://www.gnu.org/licenses/>.
 #
 # Script
-#     makeTecio
+#     makeADIOS2
 #
 # Description
-#     Build Tecplot library
+#     Build script for ADIOS2
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
@@ -25,45 +24,33 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
+# ADIOS2 version from OpenFOAM etc/config.sh file:
+_foamConfig ADIOS2
 
-# Boost version (headers only) from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/CGAL
-
-boostPACKAGE=${boost_version:-boost-system}
-tecioPACKAGE=tecio
-targetType=lib
+adios2PACKAGE=${adios2_version:-adios-none}
 
 #------------------------------------------------------------------------------
-usage()
-{
+usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    /bin/cat<<USAGE
+    cat<<USAGE
 
-Usage: ${0##*/} [OPTION] [boost-VERSION] [tecio-VERSION]
+usage: ${0##*/} [OPTION] [adios-VERSION]
 options:
   -cmake PATH       With cmake from the path given
   -gcc              Force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -help
 
-* Compile the proprietary libtecio library
-      $tecioPACKAGE
-  with $boostPACKAGE
+* Build ADIOS2
+      $adios2PACKAGE
 
 USAGE
     exit 1
 }
 #------------------------------------------------------------------------------
-# Compiler settings for CMake/configure
-[ -n "$WM_CC" ]  && export CC="$WM_CC"
-[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
+exportCompiler true     # Compiler info + flags for CMake/configure
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -78,11 +65,8 @@ do
         CMAKE_PATH="${2%%/}"
         shift
         ;;
-    boost-[0-9]* | boost_[0-9]* | boost-system )
-        boostPACKAGE="${1%%/}"
-        ;;
-    tecio*)
-        tecioPACKAGE="${1%%/}"
+    ADIOS2-[1-9]* | adios2-[1-9]* | ADIOS2-git* | adios2-git*)
+        adios2PACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -91,96 +75,89 @@ do
     shift
 done
 
+[ -n "$adios2PACKAGE" ] || die "The adios2-VERSION was not specified"
+
+# nothing to build
+if _foamIsNone "$adios2PACKAGE"
+then
+    echo "Using adios-none (skip ThirdParty build of ADIOS)"
+    exit 0
+elif _foamIsSystem "$adios2PACKAGE"
+then
+    echo "Using adios-system"
+    exit 0
+fi
+
 #------------------------------------------------------------------------------
-# Build TECIO library
 #
-#   TECIO_SOURCE_DIR : location of the original sources
-#   TECIO_BUILD_DIR  : location of the build
-#   TECIO_ARCH_PATH  : location of the installed program
+# Build ADIOS
+#   ADIOS2_SOURCE_DIR : location of the original sources
+#   ADIOS2_ARCH_PATH  : installation directory
 
-TECIO_SOURCE_DIR=$sourceBASE/$tecioPACKAGE/teciosrc
-TECIO_BUILD_DIR=$buildBASE/$tecioPACKAGE
-TECIO_ARCH_PATH=$installBASE/$tecioPACKAGE
+ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE
+ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE
 
-# Sources must be available
-[ -d "$TECIO_SOURCE_DIR" ] || die "Missing sources '$tecioPACKAGE'"
+: ${FOAM_MPI:=dummy}
 
+echo
+echo ========================================
+echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
+echo
 
-# Get Boost information
-# - only headers are required
-: ${BOOST_ARCH_PATH:=$installBASE/$boostPACKAGE}    # Fallback
 
-boostInc="$BOOST_ARCH_PATH/include"
-
-if _foamIsSystem $boostPACKAGE
+# Needs future adjustment
+# - for shared library
+# - for mpi-specific library locations
+if [ -f $ADIOS2_ARCH_PATH/include/adios.h \
+  -a -r $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
 then
-    echo "Using boost-system"
-
-    # Tagged as 'system' but could actually point to a central location
-    [ -d "$BOOST_ARCH_PATH/include" ] || {
-        boostInc="/usr/include"
+    echo "    ADIOS2 header in $ADIOS2_ARCH_PATH/include"
+    ### echo "    ADIOS2 libs   in $FOAM_EXT_LIBBIN"           # dynamic
+    echo "    ADIOS2 libs   in $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
+else
+    # CMake options often lag the configure ones
+    echo "Starting build: $adios2PACKAGE (using cmake)"
+    echo
+    (
+        buildDIR=$buildBASE/$adios2PACKAGE
+        cd $ADIOS2_SOURCE_DIR || exit 1
+        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+
+        applyPatch $adios2PACKAGE $ADIOS2_SOURCE_DIR
+
+        # Remove any existing build folder and recreate
+        rm -rf $ADIOS2_ARCH_DIR
+        rm -rf $buildDIR 2>/dev/null
+        mkdir -p $buildDIR
+
+        # May not work properly with FOAM_MPI = dummy
+        if [ "$FOAM_MPI" = dummy ]
+        then
+            configOpt="$configOpt --without-mpi"
+        else
+            CC=mpicc
+            CXX=mpicxx
+        fi
+
+# HACK
+export ADIOS1_ROOT=/local/home/mark/openfoam/ThirdParty-plus/platforms/linux64Gcc/ADIOS-1.12.0
+
+        cmake=$(findCMake)
+
+        # Install into lib64/
+        cd $buildDIR && $cmake \
+            -DCMAKE_INSTALL_PREFIX=$ADIOS2_ARCH_PATH \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_FORTRAN=FALSE \
+            -DADIOS1_USE_STATIC_LIBS=TRUE \
+            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
+            $ADIOS2_SOURCE_DIR \
+        && make -j $WM_NCOMPPROCS all \
+        && make install \
+        && echo "Built: $adios2PACKAGE"
+    ) || {
+        echo "Error building: $adios2PACKAGE"
     }
-elif [ -f "$boostInc/boost/version.hpp" ]
-then
-    echo "Using $boostPACKAGE"
 fi
 
-
-if [ -d "$TECIO_SOURCE_DIR" ]
-then
-(
-    # Remove any existing build folder and recreate
-    if [ -d $TECIO_BUILD_DIR ]
-    then
-        echo "removing old build directory"
-        echo "    $TECIO_BUILD_DIR"
-        rm -rf $TECIO_BUILD_DIR
-    fi
-    mkdir -p $TECIO_BUILD_DIR
-
-    rm -rf $TECIO_ARCH_PATH
-
-    unset configBoost
-    echo "----"
-    echo "Configuring $tecioPACKAGE with boost $BOOST_VERSION"
-    echo "    Source         : $TECIO_SOURCE_DIR"
-    echo "    Build          : $TECIO_BUILD_DIR"
-    echo "    Target         : $TECIO_ARCH_PATH"
-
-    if [ -d "$BOOST_ARCH_PATH" ]
-    then
-        echo "    Boost          : ThirdParty (${BOOST_ARCH_PATH##*/})"
-    else
-        echo "    Boost          : system"
-    fi
-
-    cmake=$(findCMake)
-
-    echo "----"
-    set -x
-    cd $TECIO_BUILD_DIR && $cmake \
-        -DCMAKE_INSTALL_PREFIX=$TECIO_ARCH_PATH \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBoost_INCLUDE_DIR=$boostInc \
-        $TECIO_SOURCE_DIR \
-    && make -j $WM_NCOMPPROCS \
-    && { \