DOC: update list of software versions

ENH: improve toolset naming
- if passed things like "clang-9", strip down to the base name "clang"
2019-12-17 07:53:39 +01:00 · 2019-12-15 13:54:12 +01:00 · 2019-12-09 13:15:26 +01:00 · 2019-11-20 12:32:05 +01:00 · 2019-11-19 16:17:01 +01:00 · 2019-11-12 16:51:02 +01:00
49 changed files with 2016 additions and 773 deletions
--- a/29
+++ b/29
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -20,7 +23,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -59,39 +63,48 @@ for i in \
    gmp-* mpfr-* mpc-* gcc-* llvm-* \
 ;
 do
-    [ -d "$i" ] && (
+    if [ -d "$i" ]
+    then
+    (
        echo
        echo "${i%/*}"
        echo "    make distclean"
        echo
        cd $i && make distclean
    )
+    fi
 done


 # Clean various packages via 'realclean'
 for i in scotch*/src
 do
-    [ -d "$i" ] && (
+    if [ -d "$i" ]
+    then
+    (
        echo
        echo "${i%/*}"
        echo "    make realclean"
        echo
        cd $i && make realclean
    )
+    fi
 done


 # Clean various packages via 'wclean'
 for i in libccmio*/Make kahip*/lib/Make
 do
-    [ -d "$i" ] && (
+    if [ -d "$i" ]
+    then
+    (
        echo
        echo "${i%/Make}"
        echo "    wclean"
        echo
        cd ${i%/Make} && wclean
    )
+    fi
 done


@ -115,7 +128,7 @@ removePlatform()
    then
        echo
        echo "Cleaning platform '$platform'"
-        \rm -rf "platforms/$platform"
+        rm -rf "platforms/$platform"
    else
        echo
        echo "Platform '$platform' not built"
@ -136,7 +149,7 @@ do
        echo
        echo "Removing all platforms/sub-directories"
        echo
-        \rm -rf platforms/*
+        rm -rf platforms/*
        break
        ;;

--- a/232
+++ b/232
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -19,11 +22,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 || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -39,27 +40,14 @@ exportCompiler true     # Compiler info + flags for CMake/configure
 exportLinker            # Linker flags for CMake/configure
 useGccFlag $@           # Scan arguments for a '-gcc' option

-warnBuildIssues()
-{
-    echo
-    echo "    ---------------------------------------------------"
-    echo "    Optional component ($1) had build issues"
-    echo "    OpenFOAM will nonetheless remain largely functional"
-    echo "    ---------------------------------------------------"
-    echo
-}
-
-warnNotFound()
-{
-    echo "Optional component ($1) was not found"
-}
-
 #------------------------------------------------------------------------------

 echo
 echo ========================================
 echo Start ThirdParty Allwmake
 echo ========================================
+echo "using:  $CC $CFLAGS"
+echo "using:  $CXX $CXXFLAGS"
 echo
 echo ========================================
 echo Build MPI libraries if required
@ -72,175 +60,11 @@ esac


 #------------------------------------------------------------------------------
-# Building scotch on different platforms is still a bit of a pain
-
-# Get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch)
-then
-    . $settings
-else
-    echo
-    echo "Error: no config.sh/scotch settings"
-    echo
-fi
-
-echo
-echo ========================================
-echo "Scotch decomposition ($SCOTCH_VERSION)"
-echo "    $SCOTCH_ARCH_PATH"
-
-SCOTCH_SOURCE_DIR=$sourceBASE/$SCOTCH_VERSION
-
-# Needs generalizing, but works fairly well
-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 ]
-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
-
-    applyPatch $SCOTCH_VERSION ..       # patch at parent-level
-
-    prefixDIR=$SCOTCH_ARCH_PATH
-    incDIR=$SCOTCH_ARCH_PATH/include
-    libDIR=$FOAM_EXT_LIBBIN
-
-    mkdir -p $prefixDIR 2>/dev/null
-    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
-        ln -s $scotchMakefile Makefile.inc
-    fi
-    [ -f Makefile.inc ] || {
-        echo " Error: scotch needs an appropriate Makefile.inc"
-        exit 1
-    }
-
-    export CCS="${CC:-$WM_CC}"  # CCS (serial compiler)   default=$(CC)
-    export CCP=$(whichMpicc)    # CCP (parallel compiler) default=mpicc
-
-    # Consistency for Intel-MPI and non-icc compilers
-    [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
-
-    make realclean 2>/dev/null  # Extra safety
-    make -j $WM_NCOMPPROCS scotch \
-     && make \
-        prefix=$prefixDIR \
-        includedir=$incDIR \
-        libdir=$libDIR \
-        install
-
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
-) || warnBuildIssues SCOTCH
-else
-    warnNotFound SCOTCH
-fi
-
-# Build ptscotch if MPI (ThirdParty or system) is available
-# 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 ] || \
-{
-    # Report that the above tests failed and pass-through the failure
-    echo
-    echo "    WARNING: skipping pt-scotch - no mpi or <scotch.h> not found"
-    false
-}
-then
-    echo
-    echo ========================================
-    echo "pt-scotch decomposition ($SCOTCH_VERSION with $FOAM_MPI)"
-    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 ]
-    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
-
-        prefixDIR=$SCOTCH_ARCH_PATH
-        incDIR=$SCOTCH_ARCH_PATH/include/$FOAM_MPI
-        libDIR=$FOAM_EXT_LIBBIN/$FOAM_MPI
-
-        mkdir -p $prefixDIR 2>/dev/null
-        mkdir -p $incDIR    2>/dev/null
-        mkdir -p $libDIR    2>/dev/null
-
-        if [ -f $scotchMakefile ]
-        then
-            rm -f Makefile.inc
-            ln -s $scotchMakefile Makefile.inc
-        fi
-        [ -f Makefile.inc ] || {
-            echo " Error: ptscotch needs an appropriate Makefile.inc"
-            exit 1
-        }
-
-        export CCS="${CC:-$WM_CC}"  # CCS (serial compiler)   default=$(CC)
-        export CCP=$(whichMpicc)    # CCP (parallel compiler) default=mpicc
-
-        # Consistency for Intel-MPI and non-icc compilers
-        [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
-
-        make realclean 2>/dev/null  # Extra safety
-        make -j $WM_NCOMPPROCS ptscotch \
-         && make \
-            prefix=$prefixDIR \
-            includedir=$incDIR \
-            libdir=$libDIR \
-            install
-
-        make realclean 2>/dev/null || true  # Failed cleanup is uncritical
-    ) || warnBuildIssues PTSCOTCH
-    fi
-
-    # Verify existence of ptscotch include
-    [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h ] || {
-        echo
-        echo "    WARNING: required include file 'ptscotch.h' not found!"
-    }
-fi
-
-# Could now remove $SCOTCH_SOURCE_DIR/src/Makefile.inc

+# Treat as optional, but really isn't if anyone wants parallel calculations
+./makeSCOTCH || warnBuildIssues SCOTCH

 #------------------------------------------------------------------------------
-
 echo
 echo ========================================
 # Get KAHIP_ARCH_PATH
@ -250,17 +74,16 @@ then
 fi
 if [ -n "$KAHIP_ARCH_PATH" ]
 then
-    echo KaHIP decomposition
+    echo KAHIP decomposition
    ./makeKAHIP -test "$KAHIP_ARCH_PATH" || \
    ./makeKAHIP || warnBuildIssues KAHIP
 else
-    warnNotFound KAHIP   # METIS is optional
+    warnNotFound KAHIP   # is optional
 fi

 #------------------------------------------------------------------------------
 echo
 echo ========================================
-
 # Get METIS_ARCH_PATH
 if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis)
 then
@ -268,11 +91,11 @@ then
 fi
 if [ -n "$METIS_ARCH_PATH" ]
 then
-    echo Metis decomposition
+    echo METIS decomposition
    ./makeMETIS -test "$METIS_ARCH_PATH" || \
    ./makeMETIS || warnBuildIssues METIS
 else
-    warnNotFound METIS   # METIS is optional
+    warnNotFound METIS   # is optional
 fi

 #------------------------------------------------------------------------------
@ -284,9 +107,10 @@ then
    ./makeCGAL -test "$CGAL_ARCH_PATH" "$BOOST_ARCH_PATH" || \
    ./makeCGAL || warnBuildIssues CGAL
 else
-    warnNotFound CGAL   # CGAL is optional
+    warnNotFound CGAL   # is optional
 fi

+#------------------------------------------------------------------------------
 echo
 echo ========================================
 if [ -n "$FFTW_ARCH_PATH" ]
@ -295,9 +119,29 @@ then
    ./makeFFTW -test "$FFTW_ARCH_PATH" || \
    ./makeFFTW || warnBuildIssues FFTW
 else
-    warnNotFound FFTW   # FFTW is optional
+    warnNotFound FFTW   # is optional
 fi

+#------------------------------------------------------------------------------
+echo
+echo ========================================
+# Get ADIOS2_ARCH_PATH
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/adios2)
+then
+    . $settings
+fi
+if [ -n "$ADIOS2_ARCH_PATH" ]
+then
+    echo ADIOS2
+    ./makeAdios2 -test "$ADIOS2_ARCH_PATH" || \
+    ./makeAdios2 || warnBuildIssues ADIOS2
+else
+    warnNotFound ADIOS2   # is optional
+fi
+
+
+#------------------------------------------------------------------------------
+
 echo
 echo ========================================
 echo Done ThirdParty Allwmake
--- a/BUILD.md
+++ b/BUILD.md
@ -1,24 +1,12 @@
-<!--
-   |--------------------------------------------------------------------------|
-   | =========                 |                                              |
-   | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox        |
-   |  \\    /   O peration     |                                              |
-   |   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.         |
-   |    \\/     M anipulation  |                                              |
-   |--------------------------------------------------------------------------|
-  -->
-
---
-
 # OpenFOAM&reg; ThirdParty Build

 OpenFOAM depends to a certain extent on third-party libraries
 (*opensource only*). It also provides some interfaces to *opensource* or
-*proprietary* libraries. This third-party package contains configurations and
-scripts for building third-party packages. It should normally only be used in
+*proprietary* libraries. This third-party collection contains configurations and
+scripts for building third-party packages. It will normally only be used in
 conjunction with the corresponding OpenFOAM version.

-## Organization
+## Directory Organization

 The ThirdParty directory contains a number of build scripts as well as
 some directories:
@ -38,18 +26,19 @@ This approach avoids duplicate entries for the default versions and
 ensures the best overall consistency between the OpenFOAM installation
 and its corresponding third-party installation.

-Nonethess, the distributed make scripts can generally be used for a
+Nonetheless, the distributed make scripts can generally be used for a
 variety of versions of the third-party libraries, with the software
 version specified on the command-line. For example,
-
-    $ ./makeFFTW -help
-    usage: makeFFTW [OPTION] [fftw-VERSION]
+```
+$ ./makeFFTW -help
+usage: makeFFTW [OPTION] [fftw-VERSION]
+```

 ---

 ## Before Starting

-0. Review the [system requirements](http://www.openfoam.com/documentation/system-requirements.php)
+0. Review the [system requirements][link openfoam-require]
   and decide on the following:
   * compiler type/version - if the system compiler is not relatively recent,
     you will need a [third-party compiler](#makeGcc) installation.
@ -61,17 +50,21 @@ version specified on the command-line. For example,
   Often (but not always) a `mpi-selector` command is available for this purpose.
   You may need to open a new shell afterwards for the change to take effect.
   Using the following command may help diagnosing things:
-
-       which mpicc
-
+```
+which mpicc
+```
 2. Adjust the OpenFOAM `etc/bashrc`, `etc/config.sh/...` or equivalent
-   `prefs.sh` files to reflect your preferred configuration.
+   the `etc/prefs.{csh,sh}` files to reflect your preferred configuration.
   For many config files, there are several configuration possibilities:
   - Define a particular third-party version.
   - Use a system installation.
   - Disable use of an optional component.
   - Define an alternative site-wide central location.
-   - After making the desired changes, use `wmRefresh` or equivalent to use the configurations.
+
+See the [OpenFOAM configuration information][link openfoam-config]
+for more details.
+After making the desired changes, use the `wmRefresh` alias
+or equivalent to enable the configuration.


 ---
@ -117,18 +110,18 @@ Additionally, if you are using clang but with ThirdParty locations for
 gmp/mpfr you will need some extra work. Here is an example:

 * Compile a new ThirdParty clang version:
-
-      ./makeLLVM llvm-4.0.1
-
+```
+./makeLLVM llvm-4.0.1
+```
 * Now adjust the OpenFOAM `prefs.sh` to use the new compiler settings,
  and update the OpenFOAM environment (eg, `wmRefresh`)

 * Next use (abuse) the `makeGcc` script to compile gmp/mpfr libraries.
  It is best to pass the desired versions explicitly, and necessary
  to set the CC/CXX variables so that the correct compiler is used:
-
-      CC=clang CXX=clang++  ./makeGcc gmp-6.1.2 mpfr-4.0.0 gcc-system
-
+```
+CC=clang CXX=clang++  ./makeGcc gmp-6.1.2 mpfr-4.0.0 gcc-system
+```
  specifying `gcc-system` effectively disables building of gcc,
  but will build the gmp/mpfr components.

@ -138,13 +131,12 @@ gmp/mpfr you will need some extra work. Here is an example:
  The location to make these changes is in the `etc/config.sh/CGAL`,
  since this is the component that uses the mpfr library.
  For example,
-
-      gmp_version=gmp-6.1.2
-      mpfr_version=mpfr-4.0.0
-
-      export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
-      export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
-
+```
+gmp_version=gmp-6.1.2
+mpfr_version=mpfr-4.0.0
+export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
+export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
+```
 * Update update the OpenFOAM environment (eg, `wmRefresh`) again.


@ -155,7 +147,7 @@ gmp/mpfr you will need some extra work. Here is an example:
     can also be invoked directly to find possible build errors.
   - Builds an mpi library (openmpi or mpich), scotch decomposition, boost, CGAL, FFTW.
   - If the optional kahip or metis  directories are found, they will also be compiled.
-2. `makeParaView`  *(optional but highly recommended)*
+2. `makeParaView`  *(optional)*
   - This is optional, but extremely useful for visualization and for
     run-time post-processing function objects.
     You can build this at a later point in time, but then you should
@ -166,9 +158,8 @@ gmp/mpfr you will need some extra work. Here is an example:

 #### Optional Components

-`makeADIOS`
- Only required for [ADIOS](#parallel) support,
-  which is currently staged in the [add-ons repository][link AddOns].
+`makeAdios2`
+- Only required for [ADIOS](#parallel) support.

 `makeCGAL`
 - Builds [boost](#general-packages) and [CGAL](#general-packages).
@ -190,6 +181,12 @@ gmp/mpfr you will need some extra work. Here is an example:
  Automatically invoked from the ThirdParty `Allwmake`,
  but can be invoked directly to resolve possible build errors.

+`makeSCOTCH`
+- Builds [scotch, ptscotch](#parallel) decomposition libraries.
+  Automatically invoked from the ThirdParty `Allwmake`,
+  but can be invoked directly for special configurations
+  or to resolve possible build errors.
+
 `makeMGridGen`
 - Optional agglomeration routines.

@ -216,17 +213,17 @@ gmp/mpfr you will need some extra work. Here is an example:
  Report in sorted order.

 `Allclean`
- After building, this script may be used to remove intermediate build information
-and save some disk space.
+- After building, this script may be used to remove intermediate build
+  information and save some disk space.


 ## Build Notes

 ### CGAL
- The zlib library and zlib development headers are required.
+- The [zlib][page zlib] library and development headers are required.

 ### Scotch
- The zlib library and zlib development headers are required.
+- The [zlib][page zlib] library and development headers are required.


 ### Mesa
@ -242,19 +239,22 @@ and save some disk space.
 - Rather than downloading VTK separately, it is easy to reuse the VTK
  sources that are bundled with ParaView.
  For example, by using a symbolic link:
-
-      ln -s ParaView-v5.6.0/VTK VTK-8.2.0
-
+```
+ln -s ParaView-v5.6.0/VTK VTK-8.2.0
+```
  The appropriate VTK version number can be found from the contents of
  the `vtkVersion.cmake` file.
  For example,
-
-      $ cat ParaView-v5.6.0/VTK/CMake/vtkVersion.cmake
-
-      # VTK version number components.
-      set(VTK_MAJOR_VERSION 8)
-      set(VTK_MINOR_VERSION 2)
-      set(VTK_BUILD_VERSION 0)
+```
+$ cat ParaView-v5.6.0/VTK/CMake/vtkVersion.cmake
+```
+  contains this type of information
+```
+# VTK version number components.
+set(VTK_MAJOR_VERSION 8)
+set(VTK_MINOR_VERSION 2)
+set(VTK_BUILD_VERSION 0)
+```

 ### ParaView
 - Building ParaView requires CMake, qmake and a `qt` development files.
@ -272,11 +272,34 @@ use the ParaView-5.4 sources that were included in the ThirdParty-v1712
 source pack. This, however, has never been tested in combination with
 the OpenFOAM Catalyst insitu visualization.

+If you encounter problems starting paraview (eg, segmentation fault)
+it could be related to the graphics libraries not being properly found.
+The `LIBGL_DEBUG` environment variable can be used to obtain more
+detailed information:
+```
+$ export LIBGL_DEBUG=verbose
+```
+
+The call to paraview now emits this information:
+```
+libGL: screen 0 does not appear to be DRI2 capable
+libGL: OpenDriver: trying /usr/lib64/dri/tls/swrast_dri.so
+libGL: OpenDriver: trying /usr/lib64/dri/swrast_dri.so
+...
+libGL error: No matching fbConfigs or visuals found
+libGL error: failed to load driver: swrast
+```
+Indicating that the drivers are probably not correctly installed.
+The `/var/log/Xorg.0.log` file or the `dmesg` command may yield more
+information to the cause.
+In this particular case, the Nvidia drivers had a client/server
+version mismatch.
+

 #### 5.6.x, 5.5.x binary packages

 For general functionality, the paraview version distributed with
-the operating system or a [binary package][download ParaView]])
+the operating system or a [binary package][download ParaView]
 may be sufficient for your needs.
 - No known issues with the native OpenFOAM reader.

@ -301,15 +324,6 @@ may not be important for you):
 #### 5.3.0 and older are neither recommended nor supported
 - Various compilation issues and known bugs.

-### ADIOS
- The github release currently requires GNU autoconf tools (eg,
-  autoconf, autoheader, automake) for its configuration.
- Some inconsistency in directory names (ADIOS vs. adios) between releases.
- Optionally uses bzip2, zlib development headers (eg, libbz2-devel, zlib-devel)
-  for the corresponding compression tranforms.
- The [zfp floating point compression][page zfp] library is now included as
-  part of ADIOS.
-
 ### Making Qt <a name="makeQt"></a>
 - Building a third-party Qt installation (prior to building ParaView) requires
  some additional effort, but should nonetheless work smoothly.
@ -317,13 +331,13 @@ may not be important for you):
 1. Download a [*qt-everywhere-opensource-src*][link Qt5] package and
   unpack in the third-party directory.
 2. Use the `makeQt` script with the QT version number. For example,
-
-       ./makeQt 5.9.3
-
+```
+./makeQt 5.9.3
+```
 3. Build ParaView using this third-party QT. For example,
-
-       ./makeParaView -qt-5.9.3  5.6.0
-
+```
+./makeParaView -qt-5.9.3  5.6.0
+```
 - ParaView versions prior to 5.3.0 do not properly support QT5.

 - If you relocate the third-party directory to another location
@ -342,7 +356,7 @@ slightly older QT (eg, [qt-5.6.3][link Qt56]) instead.

 ### Gcc Compiler <a name="gcc-compiler"></a>

-The minimum version of gcc required is 4.8.0.
+The minimum version of gcc required is **4.8.5**

 | Name              | Location
 |-------------------|--------------------------------------------
@ -376,7 +390,7 @@ install the 32-bit development libraries by default.

 ### Clang Compiler <a name="clang-compiler"></a>

-The minimum version of clang required is 3.5.
+The minimum version of clang required is **3.7**

 *Attention*: If you are building a newer version of clang, you may need to
 update your CMake beforehand since GNU *configure* can only be used prior
@ -411,9 +425,9 @@ you may have additional hurdles to using the newest versions of clang.
 | Name                  | Location
 |-----------------------|------------------------
 | [openmpi][page openmpi] | [download][link openmpi]. The newer [openmpi][newer openmpi] make exhibit stability issues.
-| [adios][page adios]   | [repo][repo adios] or [github download][link adios] or [alt download][altlink adios]
-| [scotch, ptscotch][page scotch] | [download][link scotch] or older: [6.0.3][link scotch603]
-| [kahip][page kahip] | [download][link kahip]
+| [adios][page adios]   | [repo][repo adios] or [github download][link adios]
+| [scotch, ptscotch][page scotch] | [download][link scotch] or [older][older scotch] or [even older][oldest scotch]
+| [kahip][page kahip] | [download][link kahip] or [older][older kahip]
 | [metis][page metis] | [download][link metis]


@ -422,39 +436,58 @@ you may have additional hurdles to using the newest versions of clang.
 | Name                  | Location
 |-----------------------|------------------------
 | [MESA][page mesa]     | [download][link mesa] or [older 13][link mesa13], [older 11][link mesa11]
-| [ParaView][page ParaView] | [download][link ParaView] or [older paraview-55][link ParaView55], [older paraview-54][link ParaView54] or [binaries][download ParaView]
+| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56], [paraview-55][link ParaView55] or [binaries][download ParaView]
 | [Qt][page Qt]         | [QT5][link Qt5] for ParaView-5.3.0 and later, or the [older qt-56][link Qt56] for older systems.


 ### CMake Minimum Requirements <a name="min-cmake"></a>

 The minimum CMake requirements for building various components.
-
-    2.8         llvm-3.4.2
-    2.8.11      CGAL-4.9
-    2.8.11      CGAL-4.11
-    2.8.12.2    llvm-3.7.0
-    2.8.12.2    llvm-3.8.0
-    2.8.4       cmake-3.6.0
-    3.3         ParaView-5.6.0
-    3.4.3       llvm-3.9.1
-    3.4.3       llvm-4.0.0 - llvm-6.0.0
-    3.6         ADIOS2
-
+```
+2.8         llvm-3.4.2
+2.8.11      CGAL-4.9
+2.8.11      CGAL-4.11
+2.8.12.2    llvm-3.7.0
+2.8.12.2    llvm-3.8.0
+2.8.4       cmake-3.6.0
+3.3         ParaView-5.6.0
+3.4.3       llvm-3.9.1
+3.4.3       llvm-4.0.0 - llvm-6.0.0
+3.6         ADIOS2
+```

 ### GCC Minimum Requirements <a name="min-gcc"></a>

 The minimum gcc/g++ requirements for building various components.
-
-    4.7         llvm-3.7.0
-    4.7         llvm-3.6.2
-    4.7         llvm-3.5.2
-    4.4         llvm-3.4.2
+```
+4.7         llvm-3.7.0
+4.7         llvm-3.6.2
+4.7         llvm-3.5.2
+4.4         llvm-3.4.2
+```

 If your system gcc/g++ is too old to build the desired llvm/clang
 version, you may need to build a lower llvm/clang version and then use
 that clang compiler for building the newer llvm/clang version.

+<!-- OpenFOAM, Internal links -->
+
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
+
+
+## Software Links
+
+If you have access to this information file in its raw form, you will
+note that most of the software pages and download links are listed as
+a collection at the end of the file. This is designed to make it
+easier to use `grep` and find the relevant pages and links.
+

 <!-- gcc-related -->
 [page gcc]:       http://gcc.gnu.org/releases.html
@ -483,27 +516,34 @@ that clang compiler for building the newer llvm/clang version.


 <!-- parallel -->
-[page adios]:     https://www.olcf.ornl.gov/center-projects/adios/
-[repo adios]:     https://github.com/ornladios/ADIOS
-[link adios]:     https://github.com/ornladios/ADIOS/archive/v1.13.0.tar.gz
-[altlink adios]:  http://users.nccs.gov/%7Epnorbert/adios-1.13.0.tar.gz
+[page adios]:     https://csmd.ornl.gov/adios2
+[repo adios]:     https://github.com/ornladios/ADIOS2
+[link adios]:     https://github.com/ornladios/ADIOS2/archive/v2.4.0.tar.gz
+
 [page zfp]:       http://computation.llnl.gov/projects/floating-point-compression/zfp-versions

 [page scotch]:    https://www.labri.fr/perso/pelegrin/scotch/
-[link scotch603]: https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz
-[link scotch605]: https://gforge.inria.fr/frs/download.php/file/37398/scotch_6.0.5a.tar.gz
-[link scotch]:    https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
+[oldest scotch]:  https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
+[older scotch]:   https://gforge.inria.fr/frs/download.php/file/38114/scotch_6.0.8.tar.gz
+[link scotch]:    https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz

 [page kahip]:     http://algo2.iti.kit.edu/documents/kahip/
-[link kahip]:     http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz
+[older kahip]:    http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz
+[link kahip]:     http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.12.tar.gz

 [page metis]:     http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 [link metis]:     http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz

 [page openmpi]:   http://www.open-mpi.org/
-[link openmpi]:   https://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.4.tar.bz2
+[link openmpi]:   https://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.7.tar.bz2
 [newer openmpi]:  https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.bz2

+[page mpich]:     http://www.mpich.org/
+[link mpich]:     http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz
+
+[page mvpapich]:   http://mvapich.cse.ohio-state.edu/
+[link mvpapich]:   http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.tar.gz
+

 <!-- general -->
 [page cmake]:     http://www.cmake.org/
@ -525,6 +565,9 @@ that clang compiler for building the newer llvm/clang version.
 [repo gperftools]: https://github.com/gperftools/gperftools
 [link gperftools]: https://github.com/gperftools/gperftools/releases/download/gperftools-2.5/gperftools-2.5.tar.gz

+[page zlib]:      https://www.zlib.net/
+[link zlib]:      https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.xz
+

 <!-- Visualization -->

@ -532,7 +575,8 @@ that clang compiler for building the newer llvm/clang version.
 [download ParaView]: https://www.paraview.org/download/
 [link ParaView54]: http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz
 [link ParaView55]:   http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz
-[link ParaView]: http://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.gz
+[link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.gz
+[link ParaView]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.gz

 [page mesa]:  http://mesa3d.org/
 [link mesa]:  ftp://ftp.freedesktop.org/pub/mesa/mesa-17.1.1.tar.xz
@ -544,24 +588,6 @@ that clang compiler for building the newer llvm/clang version.
 [link Qt56]: http://download.qt.io/official_releases/qt/5.6/5.6.3/single/qt-everywhere-opensource-src-5.6.3.tar.xz
 [link Qt5]: http://download.qt.io/official_releases/qt/5.9/5.9.3/single/qt-everywhere-opensource-src-5.9.3.tar.xz

-<!-- OpenFOAM -->
-
-[link AddOns]: https://develop.openfoam.com/Community/OpenFOAM-addOns
-[link community-projects]: http://www.openfoam.com/community/projects.php
-
 ---

-<!-- Standard Footer -->
-## Additional OpenFOAM Links
-
- [Community AddOns][link AddOns] repository
- [Collaborative and Community-based Developments][link community-projects]
- [Download](http://www.openfoam.com/download) and
-  [installation instructions](http://www.openfoam.com/code/build-guide.php)
- [Documentation](http://www.openfoam.com/documentation)
- [Reporting bugs/issues](http://www.openfoam.com/code/bug-reporting.php) (including bugs/suggestions/feature requests) in OpenFOAM
- [Contacting OpenCFD](http://www.openfoam.com/contact)
-
---
-
-Copyright 2016-2018 OpenCFD Ltd
+Copyright 2016-2019 OpenCFD Ltd
--- a/README.md
+++ b/README.md
@ -1,15 +1,3 @@
-<!--
-   |--------------------------------------------------------------------------|
-   | =========                 |                                              |
-   | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox        |
-   |  \\    /   O peration     |                                              |
-   |   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.         |
-   |    \\/     M anipulation  |                                              |
-   |--------------------------------------------------------------------------|
-  -->
-
---
-
 # OpenFOAM&reg; ThirdParty

 OpenFOAM depends to a certain extent on third-party libraries
@ -34,14 +22,14 @@ version specified on the command-line.

 ## Before Starting

-0. Review the [system requirements](http://www.openfoam.com/documentation/system-requirements.php)
+0. Review the [system requirements][link openfoam-require]
   and decide on the following:
   * compiler type/version (you may need a third-party compiler installation).
   * MPI type/version.
   * ParaView type/version.
   * CMake type/version, ...
 1. Adjust the OpenFOAM `etc/bashrc`, `etc/config.sh/...` or equivalent
-   `prefs.sh` files to reflect your preferred configuration.
+   `prefs.sh` files to reflect your preferred [configuration][link openfoam-config].
 2. Source the updated OpenFOAM environment

 ---
@ -53,38 +41,82 @@ automatically as part of the top-level OpenFOAM `Allwmake`.
 Nonetheless it may be necessary or useful to build particular
 ThirdParty components prior to building OpenFOAM itself.

-### Build Sequence
+### Sequence

 1. `makeGcc` _or_ `makeLLVM` *(optional)*
 2. `makeCmake`  *(optional)*
 3. `Allwmake`
   - This will be automatically invoked by the top-level OpenFOAM `Allwmake`.
-4. `makeParaView`  *(optional but highly recommended)*
+4. `makeParaView`  *(optional)*
 5. Any other additional optional components

+If the `Allwmake` is being invoked directly (not from the OpenFOAM `Allwmake`),
+it may be necessary to bootstrap the binary parts of the `wmake` toolchain
+manually before proceeding. This is done with the following command:
+```
+$WM_PROJECT_DIR/wmake/src/Allmake
+```

-### Build Details
+**It normally advisable to skip the ParaView compilation initially**.

-More details can be found the ThirdParty BUILD.md information.
+Building ParaView from source tends to be the most difficult part of
+any third-party compilation.
+
+For general functionality, the paraview version distributed with
+the operating system or a [binary package][download ParaView]
+may be sufficient for your needs.
+
+
+### Details
+
+- More details can be found the [ThirdParty BUILD.md][link third-build] information.
+- Some configuration details can be found in the
+  [OpenFOAM doc/Config.md][link openfoam-config] information.
+
+
+### Other
+
+When building other libraries directly, with autoconfig or cmake, it
+will be useful or necessary to use the same compiler and compiler
+settings as are used by OpenFOAM itself. These are obtained from the
+`wmake` show options and can be used to set corresponding environment
+variables. For example,
+```
+CC="$(wmake -show-c)" CFLAGS="$(wmake -show-cflags)" ./configure
+```
+
+Here is the correspondence to commonly used environment variables
+
+| Env variable      | Obtaining from wmake      | Meaning               |
+|-------------------|---------------------------|-----------------------|
+| CC                | `wmake -show-c`           | C compiler            |
+| CFLAGS            | `wmake -show-cflags`      | C compiler flags      |
+| CXX               | `wmake -show-cxx`         | C++ compiler          |
+| CXXFLAGS          | `wmake -show-cxxflags`    | C++ compiler flags    |
+| | `wmake -show-cflags-arch`   | Architecture information when linking |
+| | `wmake -show-cxxflags-arch` | Architecture information when linking |
+
+
+In some situations it can also be useful to have the compiler and flags
+together (similar to `mpicc -show` and `mpicxx -show`):
+```
+wmake -show-compile-c
+wmake -show-compile-cxx
+```
+
+<!-- Quick links -->
+
+[download ParaView]: https://www.paraview.org/download/

 <!-- OpenFOAM -->

-[link AddOns]: https://develop.openfoam.com/Community/OpenFOAM-addOns
-[link community-projects]: http://www.openfoam.com/community/projects.php
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md

 ---
-
-<!-- Standard Footer -->
-## Additional OpenFOAM Links
-
- [Community AddOns][link AddOns] repository
- [Collaborative and Community-based Developments][link community-projects]
- [Download](http://www.openfoam.com/download) and
-  [installation instructions](http://www.openfoam.com/code/build-guide.php)
- [Documentation](http://www.openfoam.com/documentation)
- [Reporting bugs/issues](http://www.openfoam.com/code/bug-reporting.php) (including bugs/suggestions/feature requests) in OpenFOAM
- [Contacting OpenCFD](http://www.openfoam.com/contact)
-
---
-
-Copyright 2016-2017 OpenCFD Ltd
+Copyright 2016-2019 OpenCFD Ltd
--- a/Requirements.md
+++ b/Requirements.md
@ -0,0 +1,51 @@
+## OpenFOAM&reg; ThirdParty System Requirements
+
+For building some particular third-party libraries from source,
+the normal [OpenFOAM System Requirements][link openfoam-require]
+will be insufficient.
+
+This is most notably the case for ParaView and/or QT compilation.
+As duly noted in [BUILD][link third-build] and [README][link third-readme] and information,
+building ParaView from source tends to be the most difficult part of
+any third-party compilation.
+
+For general functionality, the paraview version distributed with
+the operating system or a [binary package][download ParaView]
+may be sufficient for your needs.
+
+
+**Please help us with keeping the information here up-to-date and accurate.**
+
+### Ubuntu
+
+Dependencies:
+```
+sudo apt-get install qt4-dev-tools libqt4-dev libqt4-opengl-dev freeglut3-dev libqtwebkit-dev  libxt-dev
+```
+
+### openSUSE
+
+Dependencies:
+
+```
+sudo zypper install glu-devel
+sudo zypper install libQtWebKit-devel libqt4-devel qt4-assistant-adp-devel qt4-x11-tools
+```
+
+<!-- Quick links -->
+
+[download ParaView]: https://www.paraview.org/download/
+
+
+<!-- OpenFOAM -->
+
+[link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
+[link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
+[link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
+[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
+[link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
+[link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
+
+---
+Copyright 2019 OpenCFD Ltd
--- a/SOURCES.txt
+++ b/SOURCES.txt
@ -1,5 +1,30 @@
 Short summary of third-party software versions for recent OpenFOAM versions.

+OpenFOAM-1912
+---------------
+
+ADIOS-2.4.0         *new*
+CGAL-4.9.1
+ParaView-5.6.3      *minor*
+boost_1_64_0
+fftw-3.3.7
+openmpi-1.10.7      *minor*
+scotch_6.0.9        *minor*
+kahip-2.12          *update*
+
+
+OpenFOAM-1906
+---------------
+
+CGAL-4.9.1
+ParaView-5.6.0
+boost_1_64_0
+fftw-3.3.7
+openmpi-1.10.7      *minor*
+scotch_6.0.6
+kahip-2.00d
+
+
 OpenFOAM-1812
 ---------------

@ -64,7 +89,7 @@ openmpi-1.10.2      *minor*
 scotch_6.0.3


-OpenFOAM-3.0+
+OpenFOAM-1601 (3.0+)
 ---------------
 CGAL-4.7            *update*
 ParaView-4.4.0      *update*
--- a/etc/makeFiles/kahip/options
+++ b/etc/makeFiles/kahip/options
@ -13,3 +13,5 @@ EXE_INC = \
    -I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement

 LIB_LIBS =
+
+PROJECT_LIBS =
--- a/etc/makeFiles/libccmio/options
+++ b/etc/makeFiles/libccmio/options
@ -1,3 +1,7 @@
 /* NOTE: make any changes to this file in etc/makeFiles/ */

-/* EXE_INC = */
+EXE_INC =
+
+LIB_LIBS =
+
+PROJECT_LIBS =
--- a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib
+++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib
@ -1,12 +1,23 @@
 #-------------------------------*- makefile -*---------------------------------
-# OpenFOAM notes:
 #
-# WM_CFLAGS, WM_LDFLAGS contain "-m32 -fPIC" etc
-# WM_LABEL_SIZE == 64 for 'long' instead of 'int' for OpenFOAM labels
+# Prior to OpenFOAM-v1906, these were always part of the environment
 #
+# - WM_CFLAGS   : with -m32 / -m64 and -fPIC
+# - WM_LDFLAGS  : with -m32 / -m64
+#
+# With OpenFOAM-v1906 and later
+#
+# - wmake -show-cflags        : with -m32 / -m64
+# - wmake -show-cflags-arch   : with -m32 / -m64
+#
+# Pass these in via the enviroment since using '$(shell ...)' here does not
+# always work well.
+#
+# Notes:
 # - compiled without pthread
 #
 # Normally set CCS, CCP by caller
+#------------------------------------------------------------------------------

 EXE         =
 LIB         = .dylib
@ -17,7 +28,7 @@ ARFLAGS     = $(WM_CFLAGS) -dynamiclib -undefined dynamic_lookup -o
 CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
-CFLAGS      = $(WM_CFLAGS) -O3 \
+CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
    -DCOMMON_FILE_COMPRESS_GZ \
    -DCOMMON_RANDOM_FIXED_SEED \
    -DSCOTCH_DETERMINISTIC \
--- a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux-Mingw.shlib
+++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux-Mingw.shlib
@ -0,0 +1,64 @@
+#-------------------------------*- makefile -*---------------------------------
+#
+# Prior to OpenFOAM-v1906, these were always part of the environment
+#
+# - WM_CFLAGS   : with -m32 / -m64 and -fPIC
+# - WM_LDFLAGS  : with -m32 / -m64
+#
+# With OpenFOAM-v1906 and later
+#
+# - wmake -show-cflags        : with -m32 / -m64
+# - wmake -show-cflags-arch   : with -m32 / -m64
+#
+# Pass these in via the enviroment since using '$(shell ...)' here does not
+# always work well.
+#
+# Notes:
+# - compiled without pthread
+#
+# Normally set CCS, CCP by caller
+#------------------------------------------------------------------------------
+
+EXE         =
+LIB         = .dll
+OBJ         = .o
+
+# Separate the cross-compilation flags from regular CFLAGS to ensure that
+# system gcc does not use them for the scotch build toolchain
+
+CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
+
+AR          = x86_64-w64-mingw32-gcc
+ARFLAGS     = $(CFLAGS) -shared -Wl,--output-def,libscotch.def,--out-implib,libscotch.a,--enable-auto-import,--strip-all -o
+CC          = x86_64-w64-mingw32-gcc $(CFLAGS_CROSS)
+CCS         = x86_64-w64-mingw32-gcc
+CCP         = x86_64-w64-mingw32-gcc
+CCD         = gcc
+CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
+    -DCOMMON_PTHREAD_FILE \
+    -UCOMMON_FILE_COMPRESS \
+    -DCOMMON_RANDOM_FIXED_SEED \
+    -DSCOTCH_DETERMINISTIC \
+    -DSCOTCH_RENAME \
+    -DSCOTCH_PTHREAD \
+    -Drestrict=__restrict
+
+# 32-bit vs. 64-bit labels
+ifeq ($(WM_LABEL_SIZE),64)
+CFLAGS     += -DINTSIZE64
+endif
+
+CLIBFLAGS   = -shared
+LDFLAGS     =
+
+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
+
+#------------------------------------------------------------------------------
--- a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib
+++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib
@ -1,12 +1,23 @@
 #-------------------------------*- makefile -*---------------------------------
-# OpenFOAM notes:
 #
-# WM_CFLAGS, WM_LDFLAGS contain "-m32 -fPIC" etc
-# WM_LABEL_SIZE == 64 for 'long' instead of 'int' for OpenFOAM labels
+# Prior to OpenFOAM-v1906, these were always part of the environment
 #
+# - WM_CFLAGS   : with -m32 / -m64 and -fPIC
+# - WM_LDFLAGS  : with -m32 / -m64
+#
+# With OpenFOAM-v1906 and later
+#
+# - wmake -show-cflags        : with -m32 / -m64
+# - wmake -show-cflags-arch   : with -m32 / -m64
+#
+# Pass these in via the enviroment since using '$(shell ...)' here does not
+# always work well.
+#
+# Notes:
 # - compiled without pthread
 #
 # Normally set CCS, CCP by caller
+#------------------------------------------------------------------------------

 EXE         =
 LIB         = .so
@ -17,7 +28,7 @@ ARFLAGS     = $(WM_CFLAGS) -shared -o
 CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
-CFLAGS      = $(WM_CFLAGS) -O3 \
+CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
    -DCOMMON_FILE_COMPRESS_GZ \
    -DCOMMON_RANDOM_FIXED_SEED \
    -DSCOTCH_DETERMINISTIC \
--- a/etc/patches/scotch_6.0.6
+++ b/etc/patches/scotch_6.0.6
@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
+++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	libscotch$(LIB) scotch.h
+
+endif
+
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+## Add into libscotch instead of having a separate library
+LIBSCOTCHDEPS += library_error_exit$(OBJ)
+endif
+
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	required
+					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
+
+else
+
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
+endif
+
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)
--- a/etc/patches/scotch_6.0.7
+++ b/etc/patches/scotch_6.0.7
@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
+++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	libscotch$(LIB) scotch.h
+
+endif
+
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+## Add into libscotch instead of having a separate library
+LIBSCOTCHDEPS += library_error_exit$(OBJ)
+endif
+
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	required
+					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
+
+else
+
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
+endif
+
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)
--- a/etc/patches/scotch_6.0.8
+++ b/etc/patches/scotch_6.0.8
@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
+++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	libscotch$(LIB) scotch.h
+
+endif
+
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+## Add into libscotch instead of having a separate library
+LIBSCOTCHDEPS += library_error_exit$(OBJ)
+endif
+
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	required
+					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
+
+else
+
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
+endif
+
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)
--- a/etc/patches/scotch_6.0.9
+++ b/etc/patches/scotch_6.0.9
@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
+++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	libscotch$(LIB) scotch.h
+
+endif
+
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+## Add into libscotch instead of having a separate library
+LIBSCOTCHDEPS += library_error_exit$(OBJ)
+endif
+
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
+ifeq ($(WM_OSTYPE),MSwindows)
+
+libscotch			:	required
+					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
+
+else
+
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
+endif
+
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)
--- a/etc/pkgconfigAdjust
+++ b/etc/pkgconfigAdjust
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -33,7 +35,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
+cd "${0%/*}" || exit
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
--- a/etc/pkgconfigPrefix
+++ b/etc/pkgconfigPrefix
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -31,7 +33,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
+cd "${0%/*}" || exit
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
--- a/etc/relocateQt
+++ b/etc/relocateQt
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -19,7 +22,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
+cd "${0%/*}" || exit
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : current directory is not \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
--- a/etc/testThirdPartyFunctions
+++ b/etc/testThirdPartyFunctions
@ -0,0 +1,45 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# Script
+#     testThirdPartyFunctions
+#
+# Description
+#     Simple ad hoc tests of etc/tools/ThirdPartyFunctions
+#
+#------------------------------------------------------------------------------
+
+echo ========================================
+echo "Calling environment"
+echo "CC=$CC"
+echo "CXX=$CXX"
+echo
+echo ========================================
+
+. "$WM_THIRD_PARTY_DIR/etc/tools/ThirdPartyFunctions"
+
+#------------------------------------------------------------------------------
+
+echo "CC=$(whichCC)"
+echo "CXX=$(whichCXX)"
+echo "mpicc=$(whichMpicc)"
+echo "mpicxx=$(whichMpicxx)"
+
+exportCompiler
+
+echo ========================================
+echo "using:  $CC $CFLAGS"
+echo "using:  $CXX $CXXFLAGS"
+echo
+echo ========================================
+
+#------------------------------------------------------------------------------
--- a/etc/tools/ParaViewFunctions
+++ b/etc/tools/ParaViewFunctions
@ -2,8 +2,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -16,8 +19,7 @@
 #     ParaView make/install helper functions
 #
 # Note
-#     Obtaining paths via 'python-config' is possible, but may not always
-#     resolve properly:
+#     Obtaining paths via 'python-config' may not always resolve properly:
 #
 #         python-config --includes
 #         >>
@ -36,6 +38,7 @@ unset withMPI     MPI_MAX_PROCS
 unset withQT      QT_VERSION      QMAKE_PATH
 unset withMESA    MESA_INCLUDE    MESA_LIBRARY    withOSMESA
 unset withPYTHON  PYTHON_INCLUDE  PYTHON_LIBRARY
+unset withPYTHON3
 unset withGL2
 BUILD_TYPE=Release  # The cmake build type

@ -83,7 +86,7 @@ setParaViewDirs()
    echo "ParaView_BUILD_DIR=$ParaView_BUILD_DIR"
    echo "ParaView_DIR=$ParaView_DIR"

-    export GIT_DIR=$ParaView_SOURCE_DIR/.git # Mask seeing our own git-repo
+    export GIT_DIR="$ParaView_SOURCE_DIR/.git" # Mask seeing our own git-repo
 }


@ -164,9 +167,17 @@ addPythonSupport()
        return
    fi

-    local pythonBin pythonConfig pythonMajor
+    local pythonBin="python"
+    local pythonConfig="python-config"
+    local pythonMajor

-    pythonBin=$(which python 2>/dev/null) || {
+    if [ "$withPYTHON3" = true ]
+    then
+        pythonBin="python3"
+        pythonConfig="python3-config"
+    fi
+
+    pythonBin=$(which "$pythonBin" 2>/dev/null) || {
        echo "*** Error: python not found"
        echo "***        Deactivate python support by not using the -python "
        echo "***        option"
@ -185,7 +196,7 @@ addPythonSupport()

        # Fallback: get PYTHON_LIBRARY from dynamically linked binary

-        PYTHON_LIBRARY=$(ldd $pythonBin | \
+        PYTHON_LIBRARY=$(ldd "$pythonBin" | \
            sed -ne '/libpython/s/^.* => \(.*\) (.*/\1/p')

        [ -e "$PYTHON_LIBRARY" ] || {
@ -203,7 +214,7 @@ addPythonSupport()
    }

    # Guess major from library
-    pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
+    pythonMajor=$(echo "$PYTHON_LIBRARY" | sed 's/.*libpython\(.*\)\.so.*/\1/')

    if [ -n "$PYTHON_INCLUDE" ]
    then
@ -213,12 +224,12 @@ addPythonSupport()
            echo "*** Error: Python.h not found at location specified " \
                 "by -python-include : PYTHON_INCLUDE=$PYTHON_INCLUDE"

-    elif pythonConfig=$(which python-config 2>/dev/null)
+    elif pythonConfig=$(which "$pythonConfig" 2>/dev/null)
    then
        # Guess from python-config
        # parse '-I/usr/include/python2.7 -I/usr/include/python2.7'
        # -> '/usr/include/python2.7'
-        PYTHON_INCLUDE=$(python-config --includes | sed -ne 's/^-I\([^ ][^ ]*\).*$/\1/p')
+        PYTHON_INCLUDE=$("$pythonConfig" --includes | sed -ne 's/^-I\([^ ][^ ]*\).*$/\1/p')

    else

@ -386,7 +397,7 @@ configParaView()

    addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"

-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$ParaView_BUILD_DIR" || exit  # Change to build folder

    echo "----"
    echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR)"
@ -424,7 +435,7 @@ configParaView()
 #
 makeParaView()
 {
-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$ParaView_BUILD_DIR" || exit  # Change to build folder
    echo "    Starting make"
    time make -j $WM_NCOMPPROCS
    echo "    Done make"
@ -443,7 +454,7 @@ makeParaView()
 #
 installParaView()
 {
-    cd $ParaView_BUILD_DIR || exit 1  # Change to build folder
+    cd "$ParaView_BUILD_DIR" || exit  # Change to build folder
    echo "    Installing ParaView to $ParaView_DIR"

    make install
--- a/etc/tools/QtFunctions
+++ b/etc/tools/QtFunctions
@ -2,8 +2,10 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#                           | Copyright (C) 2011 OpenFOAM Foundation
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
--- a/etc/tools/ThirdPartyFunctions
+++ b/etc/tools/ThirdPartyFunctions
@ -2,8 +2,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -17,6 +20,10 @@
 #
 #     Define the standard buildBASE and installBASE for the platform
 #     Define WM_NCOMPPROCS always.
+#
+#     Compiler and flags are managed via the 'wmake -show-c, -show-cflags, ..'
+#     but also with WM_CC, WM_CFLAGS,... env variables
+#
 #------------------------------------------------------------------------------

 # The normal locations for source, build and installation (prefix-dir)
@ -27,44 +34,135 @@ installBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 # Synthetic value combining precision and label size (Eg, DPInt32)
 WM_SIZE_OPTIONS="${WM_PRECISION_OPTION}Int${WM_LABEL_SIZE}"

-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+EXT_SO="$(wmake -show-ext-so 2>/dev/null)"
+if [ -z "$EXT_SO" ]
+then
+    [ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+fi
+
+
+# Fallback values, needed for our scotch Makefile which uses
+# WM_CFLAGS and WM_LDFLAGS for arch information
+if [ -z "$WM_CFLAGS" ]
+then
+    export WM_CFLAGS="$(wmake -show-cflags 2>/dev/null)"
+fi
+
+if [ -z "$WM_LDFLAGS" ]
+then
+    export WM_LDFLAGS="$(wmake -show-cflags-arch 2>/dev/null)"
+fi

 unset BUILD_SUFFIX
 #------------------------------------------------------------------------------
-# Export WM compiler settings (and flags) for CMake/configure
-# $1 = true: export compiler flags too
+# Service routine to strip out OpenFOAM-specific portions from the compiler
+# flags (ie, everything after "-DOPENFOAM=...") while retaining '-fPIC'
+#
+stripCompilerFlags()
+{
+    local input="$@"
+    local flags="${input%-DOPENFOAM=*}"  # Strip out OpenFOAM-specific
+    flags="${flags## }"                  # Trim leading space
+    flags="${flags%% }"                  # Trim trailing space
+
+    # Retain -fPIC though
+    case "$flags" in
+    (*-fPIC*)
+        # -fPIC already included
+        ;;
+
+    (*)
+        case "$input" in
+        (*-fPIC*)
+            # Add -fPIC back in (was after the -DOPENFOAM=... content)
+            flags="$flags${flags+ }-fPIC"
+            ;;
+        esac
+        ;;
+    esac
+
+    echo "$flags"
+}
+
+
+# Export compiler settings (and flags) for CMake/configure
+# based on the values from wmake -show-compile-*
+#
+# Since "wmake -show-XX" is only available after 1904, continue to support
+# the previous env variables method (WM_CC, WM_CFLAGS, WM_CXX, WM_CXXFLAGS)
+#
+# $1 = "basic|minimal|strip" (optional)
+#
+# If the option 'basic' is provided, the OpenFOAM-specific portions of
+# the flags are stripped out. Ie, everything after "-DOPENFOAM=..."
+# but retaining '-fPIC'
+#
 exportCompiler()
 {
-    if test -n "$WM_CC" && command -v "$WM_CC" >/dev/null
+    local option="$1"
+    local comp flag
+
+    # C compiler and flags
+    comp="$(wmake -show-c 2>/dev/null)" && \
+    flag="$(wmake -show-cflags 2>/dev/null)" || {
+        comp="$WM_CC"
+        flag="$WM_CFLAGS"
+    }
+
+    if test -n "$comp" && command -v "$comp" >/dev/null
    then
-        export CC="$WM_CC"
-        if [ "$1" = true -a -n "$WM_CFLAGS" ]
+        export CC="$comp"
+        if [ -n "$flag" ]
        then
-            export CFLAGS="$WM_CFLAGS"
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags $flag)"
+                    ;;
+            esac
+            export CFLAGS="$flag"
        fi
    fi

-    if test -n "$WM_CXX" && command -v "$WM_CXX" >/dev/null
+    # C++ compiler and flags
+    comp="$(wmake -show-cxx 2>/dev/null)" && \
+    flag="$(wmake -show-cxxflags 2>/dev/null)" || {
+        comp="$WM_CXX"
+        flag="$WM_CXXFLAGS"
+    }
+
+    if test -n "$comp" && command -v "$comp" >/dev/null
    then
-        export CXX="$WM_CXX"
-        if [ "$1" = true -a -n "$WM_CXXFLAGS" ]
+        export CXX="$comp"
+        if [ -n "$flag" ]
        then
-            export CXXFLAGS="$WM_CXXFLAGS"
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags $flag)"
+                    ;;
+            esac
+            export CXXFLAGS="$flag"
        fi
    fi
 }

-# Export WM linker settings for CMake/configure
+
+# Export linker settings for CMake/configure
 exportLinker()
 {
-    if [ -n "$WM_LDFLAGS" ]
+    local flag
+
+    # Linker flags, actually just the machine arch
+    flag="$(wmake -show-cflags-arch 2>/dev/null)" || flag="$WM_LDFLAGS"
+
+    if test -n "$flag"
    then
-        export LDFLAGS="$WM_LDFLAGS"
+        export LDFLAGS="$flag"
    fi
 }

-# Force use of gcc/g++
+
+# Force use of gcc/g++, but the values of CFLAGS, CXXFLAGS may be incorrect
 useGcc()
 {
    export CC=gcc
@ -84,39 +182,73 @@ useGccFlag()
    done
 }

-# Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
-# Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
-# NOTE: could further refine based on $CC or $WM_CC, but not yet needed
-whichMpicc()
+# Return current value of $CC if set or obtain from 'wmake -show-c',
+# using $WM_CC (older env variable) as the first level fallback.
+# Final fallback is <gcc>
+whichCC()
 {
-    local mpicc=$(command -v mpicc)
-    case "$WM_MPLIB" in
-    (INTELMPI)
-        mpicc=$(command -v mpiicc)      # Intel <mpiicc> available?
-        ;;
-    (CRAY-MPI*)
-        : ${mpicc:=cc}                  # Cray <cc> if there is no <mpicc>
-        ;;
-    esac
-    echo "${mpicc:-mpicc}"
+    local comp="$CC"
+
+    if [ -z "$comp" ]
+    then
+        comp="$(wmake -show-c 2>/dev/null)" || comp="$WM_CC"
+        test -n "$comp" && command -v "$comp" >/dev/null || unset comp
+    fi
+
+    echo "${comp:-gcc}"
+}
+
+
+# Return current value of $CXX if set or obtain from 'wmake -show-cxx',
+# using $WM_CXX (older env variable) as the first level fallback.
+# Final fallback is <g++>
+whichCXX()
+{
+    local comp="$CXX"
+
+    if [ -z "$comp" ]
+    then
+        comp="$(wmake -show-cxx 2>/dev/null)" || comp="$WM_CXX"
+        test -n "$comp" && command -v "$comp" >/dev/null || unset comp
+    fi
+
+    echo "${comp:-g++}"
 }


 # Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
 # Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
-# NOTE: could further refine based on $CC or $WM_CC, but not yet needed
-whichMpicxx()
+# NOTE: could further refine based on "wmake -show-c", but not yet needed
+whichMpicc()
 {
-    local mpicxx=$(command -v mpicxx)
+    local comp="$(command -v mpicc)"
    case "$WM_MPLIB" in
    (INTELMPI)
-        mpicxx=$(command -v mpiicpc)    # Intel <mpiicpc> available?
+        comp="$(command -v mpiicc)"     # Intel <mpiicc> available?
        ;;
    (CRAY-MPI*)
-        : ${mpicxx:=CC}                 # Cray <CC> if there is no <mpicc>
+        : "${comp:=cc}"                 # Cray <cc> if there is no <mpicc>
        ;;
    esac
-    echo "${mpicxx:-mpicxx}"
+    echo "${comp:-mpicc}"
+}
+
+
+# Return <mpicxx> by default or <mpiicpc> if possible for INTELMPI.
+# Cray doesn't have <mpicxx>, but its <CC> manages mpi paths directly.
+# NOTE: could further refine based on "wmake -show-cxx", but not yet needed
+whichMpicxx()
+{
+    local comp="$(command -v mpicxx)"
+    case "$WM_MPLIB" in
+    (INTELMPI)
+        comp="$(command -v mpiicpc)"    # Intel <mpiicpc> available?
+        ;;
+    (CRAY-MPI*)
+        : "${comp:=CC}"                 # Cray <CC> if there is no <mpicc>
+        ;;
+    esac
+    echo "${comp:-mpicxx}"
 }

 # Require wmkdepend etc when building with wmake
@ -145,6 +277,25 @@ requireWMakeToolchain()
 }


+# grep for package http or ftp entries in BUILD.md
+# Should be of the form "[link xx]:  http://..."
+showDownloadHint()
+{
+    local package="$1"
+
+    if [ -n "$package" ]
+    then
+        echo "Possible download locations for $package :"
+
+        if [ -f "$WM_THIRD_PARTY_DIR/BUILD.md" ]
+        then
+            grep -i "$package" "$WM_THIRD_PARTY_DIR/BUILD.md" | \
+            grep -E '(http|ftp)' | sed -ne 's/^ *\[.*\]: */    /p'
+        fi
+    fi
+}
+
+
 #------------------------------------------------------------------------------
 # Some functions as per OpenFOAM etc/config.sh/functions

@ -220,6 +371,24 @@ die()
    exit 1
 }

+# Warn
+warnBuildIssues()
+{
+    echo
+    echo "    ---------------------------------------------------"
+    echo "    Optional component ($1) had build issues"
+    echo "    OpenFOAM will nonetheless remain largely functional"
+    echo "    ---------------------------------------------------"
+    echo
+}
+
+# Warn
+warnNotFound()
+{
+    echo "Optional component ($1) was not found"
+}
+
+
 # Test if it matches "*-none"
 _foamIsNone()
 {
@ -570,7 +739,7 @@ applyPatch()
    if [ -r "$patch" ]
    then
    (
-        cd $dst || exit 1
+        cd "$dst" || exit
        if [ -f "$sentinel" ]
        then
            echo "patch for $pkg was already applied"
--- a/etc/tools/vtkFunctions
+++ b/etc/tools/vtkFunctions
@ -2,9 +2,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2018 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -65,7 +67,7 @@ setVtkDirs()
    echo "VTK_BUILD_DIR=$VTK_BUILD_DIR"
    echo "VTK_DIR=$VTK_DIR"

-    export GIT_DIR=$VTK_SOURCE_DIR/.git # Mask seeing our own git-repo
+    export GIT_DIR="$VTK_SOURCE_DIR/.git" # Mask seeing our own git-repo
 }


@ -120,7 +122,7 @@ configVTK()

    addCMakeVariable "CMAKE_BUILD_TYPE=$BUILD_TYPE"

-    cd $VTK_BUILD_DIR || exit 1  # change to build folder
+    cd "$VTK_BUILD_DIR" || exit  # change to build folder

    echo "----"
    echo "Configuring VTK-$VTK_VERSION"
@ -176,7 +178,7 @@ addMpiSupport()
 #
 makeVTK()
 {
-    cd $VTK_BUILD_DIR || exit 1  # Change to build folder
+    cd "$VTK_BUILD_DIR" || exit  # Change to build folder
    echo "    Starting make"
    time make -j $WM_NCOMPPROCS

@ -193,7 +195,7 @@ makeVTK()
 #
 installVTK()
 {
-    cd $VTK_BUILD_DIR || exit 1  # Change to build folder
+    cd "$VTK_BUILD_DIR" || exit  # Change to build folder
    echo "    Installing VTK to $VTK_DIR"

    make install
--- a/87
+++ b/87
@ -3,24 +3,27 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
 #
 # Script
-#     makeADIOS
+#     makeAdios1
 #
 # Description
-#     Build script for ADIOS
+#     Build script for ADIOS1
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -29,9 +32,9 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------

 # ADIOS version from OpenFOAM etc/config.sh file:
-_foamConfig ADIOS
+_foamConfig adios1

-adiosPACKAGE=${adios_version:-adios-none}
+adiosPACKAGE=${adios1_version:-adios-none}

 #------------------------------------------------------------------------------
 usage() {
@ -41,8 +44,8 @@ usage() {

 usage: ${0##*/} [OPTION] [adios-VERSION] [-- configure-options]
 options:
-  -cmake PATH   With cmake from the path given
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
+  -cmake PATH   With cmake from the given path
  -help

 * Build ADIOS
@ -52,7 +55,7 @@ USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure

 # Parse options
 while [ "$#" -gt 0 ]
@ -68,7 +71,10 @@ do
        CMAKE_PATH="${2%%/}"
        shift
        ;;
-    ADIOS-[1-9]* | adios-[1-9]* | ADIOS-git* | adios-git*)
+    ADIOS1-[1-9]* | ADIOS1-git* | ADIOS-[1-9]* | ADIOS-git*)
+        adiosPACKAGE="${1%%/}"
+        ;;
+    adios1-[1-9]* | adios1-git* | adios-[1-9]* | adios-git*)
        adiosPACKAGE="${1%%/}"
        ;;

@ -95,11 +101,11 @@ fi
 #------------------------------------------------------------------------------
 #
 # Build ADIOS
-#   ADIOS_SOURCE_DIR : location of the original sources
-#   ADIOS_ARCH_PATH  : installation directory
+#   ADIOS1_SOURCE_DIR : location of the original sources
+#   ADIOS1_ARCH_PATH  : installation directory

-ADIOS_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
-ADIOS_ARCH_PATH=$installBASE/$adiosPACKAGE
+ADIOS1_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
+ADIOS1_ARCH_PATH=$installBASE/$adiosPACKAGE

 : ${FOAM_MPI:=dummy}

@ -116,7 +122,7 @@ adjustADIOS()
 {
    # Rename libraries according to FOAM_MPI
    (
-        cd $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH || exit 1
+        cd "$ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" || exit

        if [ "$FOAM_MPI" != dummy ]
        then
@ -132,13 +138,13 @@ adjustADIOS()
    )

    # We don't need/use XML things
-    \rm -f $ADIOS_ARCH_PATH/bin/adios_lint
+    \rm -f $ADIOS1_ARCH_PATH/bin/adios_lint

    # Replace resolved paths with variables
    echo "Adjust prefix for ADIOS"
    for i in \
-        $ADIOS_ARCH_PATH/bin/adios_config \
-        $ADIOS_ARCH_PATH/etc/adios_config.flags \
+        $ADIOS1_ARCH_PATH/bin/adios_config \
+        $ADIOS1_ARCH_PATH/etc/adios_config.flags \
    ;
    do
        [ -f "$i" ] || {
@ -163,7 +169,7 @@ adjustADIOS()
    #
    echo "Adjust library names for ADIOS"
    for i in \
-        $ADIOS_ARCH_PATH/etc/adios_config.flags \
+        $ADIOS1_ARCH_PATH/etc/adios_config.flags \
    ;
    do
        [ -f "$i" ] || {
@ -196,7 +202,7 @@ adjustADIOS()
 #
 listMethods()
 {
-    [ -f $ADIOS_ARCH_PATH/bin/adios_config ] || {
+    [ -f $ADIOS1_ARCH_PATH/bin/adios_config ] || {
        echo "Warning: no adios_config"
        return 1
    }
@ -204,13 +210,13 @@ listMethods()
    echo "==============="

    # May have problems listing parallel methods (eg, transport key missing)
-    if $ADIOS_ARCH_PATH/bin/adios_config -m >/dev/null 2>&1
+    if $ADIOS1_ARCH_PATH/bin/adios_config -m >/dev/null 2>&1
    then
-        $ADIOS_ARCH_PATH/bin/adios_config -m 2>/dev/null
+        $ADIOS1_ARCH_PATH/bin/adios_config -m 2>/dev/null
    else
        echo "Warning: could not list parallel methods"
        # Fallback to serial methods
-        $ADIOS_ARCH_PATH/bin/adios_config -s -m 2>/dev/null
+        $ADIOS1_ARCH_PATH/bin/adios_config -s -m 2>/dev/null
    fi || echo "Warning: could not list configured methods"
    echo "==============="

@ -220,12 +226,12 @@ listMethods()
 # Needs future adjustment
 # - for shared library
 # - for mpi-specific library locations
-if [ -f $ADIOS_ARCH_PATH/include/adios.h \
-  -a -r $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
+if [ -f $ADIOS1_ARCH_PATH/include/adios.h \
+  -a -r $ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
 then
-    echo "    ADIOS header in $ADIOS_ARCH_PATH/include"
+    echo "    ADIOS header in $ADIOS1_ARCH_PATH/include"
    ### echo "    ADIOS libs   in $FOAM_EXT_LIBBIN"           # dynamic
-    echo "    ADIOS libs   in $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
+    echo "    ADIOS libs   in $ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
    listMethods
 elif [ -z "$CMAKE_PATH" ]
 then
@ -269,15 +275,15 @@ then
        # ----------------------------
        buildDIR=$buildBASE/$adiosPACKAGE

-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$ADIOS1_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

        [ -e Makefile ] && make distclean 2>/dev/null

-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
+        applyPatch $adiosPACKAGE $ADIOS1_SOURCE_DIR

        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
+        rm -rf $ADIOS1_ARCH_DIR
        rm -rf $buildDIR 2>/dev/null
        mkdir -p $buildDIR

@ -296,9 +302,9 @@ then
        fi

        # Install into lib64/
-        cd $buildDIR && $ADIOS_SOURCE_DIR/configure \
-            --prefix=$ADIOS_ARCH_PATH \
-            --libdir=$ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        cd $buildDIR && $ADIOS1_SOURCE_DIR/configure \
+            --prefix=$ADIOS1_ARCH_PATH \
+            --libdir=$ADIOS1_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
            --disable-fortran \
            --with-pic \
            --without-fastbit \
@ -317,13 +323,13 @@ else
    echo
    (
        buildDIR=$buildBASE/$adiosPACKAGE
-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$ADIOS1_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
+        applyPatch $adiosPACKAGE $ADIOS1_SOURCE_DIR

        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
+        rm -rf $ADIOS1_ARCH_DIR
        rm -rf $buildDIR 2>/dev/null
        mkdir -p $buildDIR

@ -340,11 +346,11 @@ else

        # Install into lib64/
        cd $buildDIR && $cmake \
-            -DCMAKE_INSTALL_PREFIX=$ADIOS_ARCH_PATH \
+            -DCMAKE_INSTALL_PREFIX=$ADIOS1_ARCH_PATH \
            -DCMAKE_BUILD_TYPE=Release \
            -DBUILD_FORTRAN=FALSE \
            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
-            $ADIOS_SOURCE_DIR \
+            $ADIOS1_SOURCE_DIR \
        && make -j $WM_NCOMPPROCS all \
        && make install \
        && echo "Built: $adiosPACKAGE" \
@ -352,6 +358,7 @@ else
        && listMethods
    ) || {
        echo "Error building: $adiosPACKAGE"
+        exit 1
    }
 fi

--- a/96
+++ b/96
@ -1,16 +1,18 @@
 #!/bin/sh
 #------------------------------------------------------------------------------
-# =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
+#     Copyright (C) 2018-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # Script
-#     makeADIOS2
+#     makeAdios2
 #
 # Description
 #     Build script for ADIOS2
@ -18,8 +20,27 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+
+# Short-circuit test for an installation
+if [ "$1" = "-test" ]
+then
+    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
+    dir="${2%/}" # <- FFTW_ARCH_PATH
+    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libadios2$EXT_SO" ]
+    then
+        echo "    adios2 include: $dir/include"
+        echo "    adios2 library: $dir/lib$WM_COMPILER_LIB_ARCH"
+        exit 0
+    else
+        exit 2
+    fi
+fi
+#------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -27,9 +48,9 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 # ADIOS2 version from OpenFOAM etc/config.sh file:
-_foamConfig ADIOS2
+_foamConfig adios2

-adios2PACKAGE=${adios2_version:-adios-none}
+adiosPACKAGE=${adios2_version:-adios-none}

 #------------------------------------------------------------------------------
 usage() {
@ -39,18 +60,18 @@ usage() {

 usage: ${0##*/} [OPTION] [adios-VERSION]
 options:
-  -cmake PATH   With cmake from the path given
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
+  -cmake PATH   With cmake from the given path
  -help

 * Build ADIOS2
-      $adios2PACKAGE
+      $adiosPACKAGE

 USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure

 # Parse options
 while [ "$#" -gt 0 ]
@ -65,8 +86,11 @@ do
        CMAKE_PATH="${2%%/}"
        shift
        ;;
-    ADIOS2-[1-9]* | adios2-[1-9]* | ADIOS2-git* | adios2-git*)
-        adios2PACKAGE="${1%%/}"
+    ADIOS2-[1-9]* | ADIOS2-git* | adios-[1-9]* | ADIOS-git*)
+        adiosPACKAGE="${1%%/}"
+        ;;
+    adios2-[1-9]* | adios2-git* | adios-[1-9]* | adios-git*)
+        adiosPACKAGE="${1%%/}"
        ;;
    *)
        die "unknown option/argument: '$1'"
@ -75,14 +99,14 @@ do
    shift
 done

-[ -n "$adios2PACKAGE" ] || die "The adios2-VERSION was not specified"
+[ -n "$adiosPACKAGE" ] || die "The adios2-VERSION was not specified"

 # nothing to build
-if _foamIsNone "$adios2PACKAGE"
+if _foamIsNone "$adiosPACKAGE"
 then
    echo "Using adios-none (skip ThirdParty build of ADIOS)"
    exit 0
-elif _foamIsSystem "$adios2PACKAGE"
+elif _foamIsSystem "$adiosPACKAGE"
 then
    echo "Using adios-system"
    exit 0
@ -94,8 +118,8 @@ fi
 #   ADIOS2_SOURCE_DIR : location of the original sources
 #   ADIOS2_ARCH_PATH  : installation directory

-ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE
-ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE
+ADIOS2_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
+ADIOS2_ARCH_PATH=$installBASE/$adiosPACKAGE

 : ${FOAM_MPI:=dummy}

@ -104,26 +128,23 @@ echo ========================================
 echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
 echo

-
 # 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 ]
+if [ -f $ADIOS2_ARCH_PATH/include/adios2.h \
+  -a -r $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios2$EXT_SO ]
 then
    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
+    echo "    ADIOS2 libs   in $ADIOS2_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
 else
    # CMake options often lag the configure ones
-    echo "Starting build: $adios2PACKAGE (using cmake)"
+    echo "Starting build: $adiosPACKAGE (using cmake)"
    echo
    (
-        buildDIR=$buildBASE/$adios2PACKAGE
-        cd $ADIOS2_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        buildDIR=$buildBASE/$adiosPACKAGE
+        cd "$ADIOS2_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

-        applyPatch $adios2PACKAGE $ADIOS2_SOURCE_DIR
+        applyPatch $adiosPACKAGE $ADIOS2_SOURCE_DIR

        # Remove any existing build folder and recreate
        rm -rf $ADIOS2_ARCH_DIR
@ -131,32 +152,27 @@ else
        mkdir -p $buildDIR

        # May not work properly with FOAM_MPI = dummy
-        if [ "$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 \
+            -DADIOS2_USE_Fortran=FALSE \
            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
            $ADIOS2_SOURCE_DIR \
        && make -j $WM_NCOMPPROCS all \
        && make install \
-        && echo "Built: $adios2PACKAGE"
+        && echo "Built: $adiosPACKAGE"
    ) || {
-        echo "Error building: $adios2PACKAGE"
+        echo "Error building: $adiosPACKAGE"
+        exit 1
    }
 fi

--- a/22
+++ b/22
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -19,11 +22,12 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -51,7 +55,7 @@ usage()

 Usage: ${0##*/} [OPTION] [lib|libso] [libccmio-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * Compile the proprietary libccmio library
@ -123,11 +127,11 @@ install()
 echo "Starting build: $ccmioPACKAGE ($targetType)"
 echo
 (
-    cd $CCMIO_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$CCMIO_SOURCE_DIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

    rm -rf $CCMIO_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libccmio.$SO
+    rm -f $FOAM_EXT_LIBBIN/libccmio$EXT_SO

    libdir=$CCMIO_ARCH_PATH/lib

--- a/115
+++ b/115
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2012-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -25,24 +28,24 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 3 ] || { echo "${0##*/} -test : needs 2 argument"; exit 1; }
-    dir="$2" # <- CGAL_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libCGAL.$SO" ]
+    dir="${2%/}" # <- CGAL_ARCH_PATH
+    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libCGAL$EXT_SO" ]
    then
        echo "    CGAL  include: $dir/include"
        echo "    CGAL  library: $dir/lib$WM_COMPILER_LIB_ARCH"
        # Additional information about boost
-        dir="$3" # <- BOOST_ARCH_PATH
+        dir="${3%/}" # <- BOOST_ARCH_PATH
        for root in "$dir" /usr
        do
            if [ -d "$root/include/boost" \
-              -a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system.$SO" ]
+              -a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system$EXT_SO" ]
            then
                echo "    boost include: $root/include"
                echo "    boost library: $root/lib$WM_COMPILER_LIB_ARCH"
@ -56,7 +59,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -83,10 +87,11 @@ usage() {

 usage: ${0##*/} [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERSION]
 options:
-  -cmake PATH       with cmake from the path given
-  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
-  -no-lib           compile CGAL for use in headers only mode (since CGAL 4.9)
-  -system           use system versions for boost/gmp/mpfr
+  -gcc          Force use of gcc/g++
+  -cmake PATH   Use cmake from the given path
+  -no-lib       Compile CGAL for use in headers only mode (since CGAL 4.9)
+  -toolset=NAME Use named toolset in bootstrap
+  -system       Use system versions for boost/gmp/mpfr
  -help

 * build CGAL with
@ -108,7 +113,7 @@ USAGE
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure

-unset optHeadersOnly
+unset optHeadersOnly optToolset
 # Parse options
 while [ "$#" -gt 0 ]
 do
@ -122,6 +127,9 @@ do
        CMAKE_PATH="${2%%/}"
        shift
        ;;
+    -toolset=*)
+        optToolset="${1#*=}"
+        ;;
    -sys*)
        gmpPACKAGE="gmp-system"
        mpfrPACKAGE="mpfr-system"
@ -227,17 +235,59 @@ else
    # Absolute path for --libdir

    (
-        cd $BOOST_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        # Configuration options:
+        unset buildOpt
+
+        cd "$BOOST_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

        rm -rf $BOOST_ARCH_PATH

+        case "$WM_COMPILER" in
+        (Arm*)
+            # Toolset for bootstrap
+            optToolset="gcc"
+
+            echo "using clang : arm : $(whichCC) ;" > user-config.jam
+            echo "using mpi ;" >> user-config.jam
+
+            # Toolset for build
+            buildOpt="--user-config=user-config.jam toolset=clang"
+            ;;
+
+        (Mingw*)
+            # Toolset for bootstrap
+            optToolset="gcc"
+
+            echo "using gcc : mingw : $(whichCC) ;" > user-config.jam
+
+            # Toolset for build
+            buildOpt="--user-config=user-config.jam toolset=gcc"
+            buildOpt="$buildOpt target-os=windows release"
+            ;;
+
+        (*)
+            # Toolset for bootstrap and build
+            if [ -z "$optToolset" ]
+            then
+                optToolset="$(whichCC)"
+                # Base names for gcc-8, clang-9 etc.
+                case "$optToolset" in
+                (clang*)  optToolset=clang;;
+                (gcc*)    optToolset=gcc;;
+                esac
+            fi
+            buildOpt="toolset=$optToolset"
+            ;;
+        esac
+
        ./bootstrap.sh \
            --prefix=$BOOST_ARCH_PATH \
            --libdir=$boostLib \
            --with-libraries=thread \
            --with-libraries=system \
-        && ./bjam toolset=$WM_CC -j $WM_NCOMPPROCS install \
+            --with-toolset="$optToolset" \
+        && ./b2 $buildOpt -j $WM_NCOMPPROCS install \
        && echo "Built: boost"
    ) || {
        echo "Error building: boost"
@ -422,8 +472,8 @@ fi
    fi
    mkdir -p $CGAL_BUILD_DIR

-    cd $CGAL_BUILD_DIR || exit 1
-    export GIT_DIR=$CGAL_SOURCE_DIR/.git # Mask seeing our own git-repo
+    cd "$CGAL_BUILD_DIR" || exit
+    export GIT_DIR="$CGAL_SOURCE_DIR/.git" # Mask seeing our own git-repo

    unset configBoost configGmp configMpfr
    echo "----"
@ -453,10 +503,10 @@ fi
        configBoost=$(cat <<CMAKE_OPTIONS
 -DBoost_INCLUDE_DIR=$boostInc
 -DBoost_LIBRARY_DIRS=$boostLib
- -DBoost_THREAD_LIBRARY=$boostLib/libboost_thread.$SO
- -DBoost_THREAD_LIBRARY_RELEASE=$boostLib/libboost_thread.$SO
- -DBoost_SYSTEM_LIBRARY=$boostLib/libboost_system.$SO
- -DBoost_SYSTEM_LIBRARY_RELEASE=$boostLib/libboost_system.$SO
+ -DBoost_THREAD_LIBRARY=$boostLib/libboost_thread$EXT_SO
+ -DBoost_THREAD_LIBRARY_RELEASE=$boostLib/libboost_thread$EXT_SO
+ -DBoost_SYSTEM_LIBRARY=$boostLib/libboost_system$EXT_SO
+ -DBoost_SYSTEM_LIBRARY_RELEASE=$boostLib/libboost_system$EXT_SO
 -DBoost_VERSION=$BOOST_VERSION
 CMAKE_OPTIONS
 )
@ -478,12 +528,12 @@ CMAKE_OPTIONS
            $GMP_ARCH_PATH/lib \
        ;
        do
-            if [ -f "$libdir/libgmp.$SO" ]
+            if [ -f "$libdir/libgmp$EXT_SO" ]
            then
                configGmp=$(cat <<CMAKE_OPTIONS
 -DGMP_INCLUDE_DIR=$GMP_ARCH_PATH/include
 -DGMP_LIBRARIES_DIR=$libdir
- -DGMP_LIBRARIES=$libdir/libgmp.$SO
+ -DGMP_LIBRARIES=$libdir/libgmp$EXT_SO
 CMAKE_OPTIONS
 )
                break
@ -509,12 +559,12 @@ CMAKE_OPTIONS
            $MPFR_ARCH_PATH/lib \
        ;
        do
-            if [ -f "$libdir/libmpfr.$SO" ]
+            if [ -f "$libdir/libmpfr$EXT_SO" ]
            then
                configMpfr=$(cat <<CMAKE_OPTIONS
 -DMPFR_INCLUDE_DIR=$MPFR_ARCH_PATH/include
 -DMPFR_LIBRARIES_DIR=$libdir
- -DMPFR_LIBRARIES=$libdir/libmpfr.$SO
+ -DMPFR_LIBRARIES=$libdir/libmpfr$EXT_SO
 CMAKE_OPTIONS
 )
                break
@ -526,6 +576,16 @@ CMAKE_OPTIONS

    cmake=$(findCMake)

+    unset cmakeDefs
+
+    case "$WM_COMPILER" in
+    (Mingw*)
+        cmakeDefs="$cmakeDefs -DCMAKE_SYSTEM_NAME=Windows"
+        cmakeDefs="$cmakeDefs -DCMAKE_C_COMPILER=$(wmake -show-c)"
+        cmakeDefs="$cmakeDefs -DCMAKE_CXX_COMPILER=$(wmake -show-cxx)"
+        ;;
+    esac
+
    # For CGAL < 4.9, for installation into lib64/, not lib/
    # Name only (not path) for CGAL_INSTALL_LIB_DIR
    echo "----"
@ -537,6 +597,7 @@ CMAKE_OPTIONS
        -DWITH_CGAL_Core=OFF \
        -DWITH_CGAL_ImageIO=OFF \
        -DWITH_CGAL_Qt5=OFF \
+        $cmakeDefs \
        ${optHeadersOnly:+-DCGAL_HEADER_ONLY=TRUE} \
        $configBoost $configGmp $configMpfr \
        ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
--- a/18
+++ b/18
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -23,7 +26,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -42,7 +46,7 @@ usage() {

 usage: ${0##*/} [OPTION] cmake-VERSION
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -link         Create additional symlink as 'cmake-system'
  -help

@ -101,8 +105,8 @@ else
    (
        buildDIR=$buildBASE/$cmakePACKAGE

-        cd $CMAKE_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$CMAKE_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        make distclean 2>/dev/null

        rm -rf $buildDIR
@ -123,7 +127,7 @@ fi
 if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ]
 then
 (
-    cd ${CMAKE_ARCH_PATH%/*} || exit 1
+    cd "${CMAKE_ARCH_PATH%/*}" || exit
    if [ -L cmake-system ]
    then
        rm cmake-system
--- a/23
+++ b/23
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,15 +21,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- FFTW_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libfftw3.$SO" ]
+    dir="${2%/}" # <- FFTW_ARCH_PATH
+    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
    then
        echo "    fftw include: $dir/include"
        echo "    fftw library: $dir/lib$WM_COMPILER_LIB_ARCH"
@ -38,7 +40,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -59,7 +62,7 @@ usage() {

 usage: ${0##*/} [OPTION] [fftw-VERSION] [-- configure-options]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build FFTW with
@ -118,7 +121,7 @@ fi
 FFTW_SOURCE_DIR=$sourceBASE/$fftwPACKAGE
 FFTW_ARCH_PATH=$installBASE/$fftwPACKAGE

-if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3.$SO" ]
+if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
 then
    echo "Already has FFTW shared library"
 else
@ -140,8 +143,8 @@ else
        # ----------------------------
        buildDIR=$buildBASE/$fftwPACKAGE

-        cd $FFTW_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$FFTW_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

        rm -rf $FFTW_ARCH_PATH
        rm -rf $buildDIR
--- a/56
+++ b/56
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  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.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -32,7 +35,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -61,6 +65,7 @@ usage() {
 usage: ${0##*/} [OPTION] [gcc-VERSION] [gmp-VERSION] [mpfr-VERSION] [mpc-VERSION]
 options:
  -clang            Force clang/clang++ for building
+  -m32 | -m64       32-bit or 64-bit (default) ABI
  -multilib         for 64-bit systems with 32-bit support required
  -no-multilib      for 64-bit systems without 32-bit support (DEFAULT)
  -no-threadsafe    disable mpfr thread-safe (default is auto-detect)
@ -77,6 +82,8 @@ USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
+optArch=64      # Use 64-bit ABI
+
 # Build 32-bit libraries on 64-bit systems (normally not needed)
 optMultilib=disable
 unset optThreadSafe # unset=auto
@ -92,6 +99,9 @@ do
        export CXX=clang++
        ;;

+    -m32 | -m64)
+        optArch="${1#*m}"
+        ;;
    -multi*)
        optMultilib=enable
        ;;
@ -134,6 +144,7 @@ cat<<SUMMARY
 GCC configuration
 ------------------
    GCC     = $gccPACKAGE
+    ABI     = $optArch
    GMP     = $gmpPACKAGE
    MPFR    = $mpfrPACKAGE
    MPC     = $mpcPACKAGE
@ -142,17 +153,6 @@ Using CC    = $CC $CFLAGS
 Using CXX   = $CXX $CXXFLAGS
 SUMMARY

-# Set 32 or 64 bit ABI
-case "$WM_ARCH_OPTION" in
-32 | 64)
-    ABI=$WM_ARCH_OPTION
-    ;;
-*)
-    die "The WM_ARCH_OPTION ($WM_ARCH_OPTION) must be 32 or 64"
-    ;;
-esac
-
-
 #------------------------------------------------------------------------------
 # Build/install without compiler name
 buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER_ARCH
@ -193,8 +193,8 @@ else
    sourceDIR=$sourceBASE/$gmpPACKAGE
    buildDIR=$buildBASE/$gmpPACKAGE

-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$sourceDIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
    make distclean 2>/dev/null

    rm -rf $buildDIR
@ -202,7 +202,7 @@ else
    cd $buildDIR

    set -x
-    $sourceDIR/configure ABI=$ABI \
+    $sourceDIR/configure ABI=$optArch \
        --prefix=$GMP_ARCH_PATH \
        --libdir=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
        --enable-cxx \
@ -232,7 +232,7 @@ fi
 # Build MPFR
 # ================
 echo "---------------"
-if [ -d $MPFR_ARCH_PATH ]
+if [ -d "$MPFR_ARCH_PATH" ]
 then
    echo "Already built: $mpfrPACKAGE"
 elif _foamIsSystem $MPFR_ARCH_PATH
@ -245,8 +245,8 @@ else
    sourceDIR=$sourceBASE/$mpfrPACKAGE
    buildDIR=$buildBASE/$mpfrPACKAGE

-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$sourceDIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
    make distclean 2>/dev/null

    rm -rf $buildDIR
@ -258,7 +258,7 @@ else
    [ -n "$optThreadSafe" ] && configOpt="--${optThreadSafe}-thread-safe"

    set -x
-    $sourceDIR/configure ABI=$ABI \
+    $sourceDIR/configure ABI=$optArch \
        --prefix=$MPFR_ARCH_PATH \
        --libdir=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
        $configGMP $configOpt \
@ -288,7 +288,7 @@ fi
 # Build MPC
 # ================
 echo "---------------"
-if [ -d $MPC_ARCH_PATH ]
+if [ -d "$MPC_ARCH_PATH" ]
 then
    echo "Already built: $mpcPACKAGE"
 elif _foamIsSystem $MPC_ARCH_PATH
@ -301,8 +301,8 @@ else
    sourceDIR=$sourceBASE/$mpcPACKAGE
    buildDIR=$buildBASE/$mpcPACKAGE

-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$sourceDIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
    make distclean 2>/dev/null

    rm -rf $buildDIR
@ -310,7 +310,7 @@ else
    cd $buildDIR

    set -x
-    $sourceDIR/configure ABI=$ABI \
+    $sourceDIR/configure ABI=$optArch \
        --prefix=$MPC_ARCH_PATH \
        --libdir=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
        $configGMP $configMPFR \
@ -344,7 +344,7 @@ fi
 # or specify -no-multilib on the command-line
 #
 echo "---------------"
-if [ -d $GCC_ARCH_PATH ]
+if [ -d "$GCC_ARCH_PATH" ]
 then
    echo "Already built: $gccPACKAGE"
 elif _foamIsSystem $GCC_ARCH_PATH
@ -357,8 +357,8 @@ else
    sourceDIR=$sourceBASE/$gccPACKAGE
    buildDIR=$buildBASE/$gccPACKAGE

-    cd $sourceDIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$sourceDIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
    make distclean 2>/dev/null

    rm -rf $buildDIR
--- a/16
+++ b/16
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2012 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -20,7 +23,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -41,7 +45,7 @@ usage() {

 usage: ${0##*/} [gperftools-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build gperftools
@ -100,8 +104,8 @@ else
    (
        buildDIR=$buildBASE/$gperftoolsPACKAGE

-        cd $GPERFTOOLS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$GPERFTOOLS_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        [ -e Makefile ] && make distclean 2>/dev/null

        rm -rf $GPERFTOOLS_ARCH_PATH
--- a/28
+++ b/28
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,22 +21,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- HYPRE_ARCH_PATH
+    dir="${2%/}" # <- HYPRE_ARCH_PATH
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libhypre.$SO \
+            $FOAM_EXT_LIBBIN/libhypre$EXT_SO \
            $dir/lib/libhypre.a \
-            $dir/lib/libhypre.$SO \
+            $dir/lib/libhypre$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@ -49,7 +51,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -74,7 +77,7 @@ usage() {

 usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build HYPRE with
@ -130,10 +133,11 @@ fi
 #   HYPRE_SOURCE_DIR : location of the original sources

 HYPRE_SOURCE_DIR=$sourceBASE/$hyprePACKAGE
-: ${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$hyprePACKAGE}
+: "${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$hyprePACKAGE}"

 [ -d "$HYPRE_SOURCE_DIR" ] || {
    echo "Missing sources: '$hyprePACKAGE'"
+    showDownloadHint HYPER
    exit 1
 }

@ -148,8 +152,8 @@ echo
    # Configuration options:
    unset configOpt

-    cd $HYPRE_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$HYPRE_SOURCE_DIR/src" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

    rm -rf $HYPRE_ARCH_PATH
    [ -e Makefile ] && make distclean 2>/dev/null
--- a/63
+++ b/63
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,22 +21,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- KAHIP_ARCH_PATH
+    dir="${2%/}" # <- KAHIP_ARCH_PATH
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libkahip.$SO \
+            $FOAM_EXT_LIBBIN/libkahip$EXT_SO \
            $dir/lib/libkahip.a \
-            $dir/lib/libkahip.$SO \
+            $dir/lib/libkahip$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@ -49,7 +51,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -75,7 +78,8 @@ usage()

 Usage: ${0##*/} [OPTION] [lib|libso] [kahip-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
+  -cmake PATH   With cmake from the given path
  -help

 * Compile KaHIP
@ -85,6 +89,7 @@ USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
+exportCompiler minimal  # Minimal compiler info for CMake/configure

 # Parse options
 while [ "$#" -gt 0 ]
@ -94,11 +99,17 @@ do
    -h | -help) usage   ;;
    -gcc)       useGcc  ;;

+    -cmake)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        CMAKE_PATH="${2%%/}"
+        shift
+        ;;
+
    lib|libso)
        targetType="$1"
        ;;

-    kahip-[1-9]* | kahip-git)
+    kahip-[1-9]* | kahip-git | KaHIP_* |  KaHIP-[1-9]*)
        kahipPACKAGE="${1%%/}"
        unset KAHIP_ARCH_PATH  # Avoid inconsistency
        ;;
@ -136,7 +147,8 @@ KAHIP_ARCH_PATH=$installBASE/$kahipPACKAGE

 [ -d "$KAHIP_SOURCE_DIR" ] || {
    echo "Missing sources: '$kahipPACKAGE'"
-    exit 1
+    showDownloadHint KAHIP
+    exit 2
 }

 #
@ -158,20 +170,31 @@ install()
        $incdir
 }

-echo "Starting build: $kahipPACKAGE ($targetType)"
-echo
-(
-    cd $KAHIP_SOURCE_DIR/lib || exit 1
-    export GIT_DIR=$KAHIP_SOURCE_DIR/.git # Mask seeing our own git-repo

-    rm -rf $KAHIP_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libkahip.$SO
+# Newer KAHIP (>= 2.11) uses CMake,
+# but unfortunately does not install include/
+# nor pass through flags for 64bit indices in the header.
+withCmake=true
+version=$(echo "$kahipPACKAGE" | sed -e 's/^kahip[-_]*//i')
+case "$version" in 2.0*) unset withCmake;; esac
+
+if true
+then
+(
+    echo "Starting build: $kahipPACKAGE ($targetType) using wmake"
+    echo
+
+    cd "$KAHIP_SOURCE_DIR/lib" || exit
+    export GIT_DIR="$KAHIP_SOURCE_DIR/.git" # Mask seeing our own git-repo
+
+    rm -rf "$KAHIP_ARCH_PATH"
+    rm -f "$FOAM_EXT_LIBBIN/libkahip$EXT_SO"

    libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH

    cpMakeFiles kahip 2>/dev/null

-    if [ -e ../interface -a ! -e interface ]
+    if [ -e ../interface ] && [ ! -e interface ]
    then
        ln -s ../interface interface
    fi
@ -193,6 +216,6 @@ echo
    echo "Error building: kahip"
    exit 1
 }
-
+fi

 #------------------------------------------------------------------------------
--- a/22
+++ b/22
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -38,7 +41,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -62,8 +66,8 @@ usage() {

 usage: ${0##*/} [OPTION] [llvm-VERSION]
 options:
-  -cmake PATH       with cmake from the path given
-  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
+  -cmake PATH   with cmake from the given path
  -help

 * build llvm/clang
@ -133,8 +137,8 @@ then
    echo "Starting build: $llvmPACKAGE (using configure)"
    echo
    (
-        cd $LLVM_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$LLVM_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        make distclean 2>/dev/null

        rm -rf $LLVM_BUILD_DIR
@ -165,8 +169,8 @@ else
        # Configuration options:
        unset configOpt

-        cd $LLVM_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$LLVM_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

        if [ -f tools/openmp/CMakeLists.txt ]
        then
--- a/36
+++ b/36
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2018 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,22 +21,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- METIS_ARCH_PATH
+    dir="${2%/}" # <- METIS_ARCH_PATH
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libmetis.$SO \
+            $FOAM_EXT_LIBBIN/libmetis$EXT_SO \
            $dir/lib/libmetis.a \
-            $dir/lib/libmetis.$SO \
+            $dir/lib/libmetis$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@ -49,7 +51,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -74,7 +77,7 @@ usage() {

 usage: ${0##*/} [OPTION] [lib|libso] [METIS-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build METIS with
@ -130,11 +133,12 @@ fi
 #   METIS_SOURCE_DIR : location of the original sources

 METIS_SOURCE_DIR=$sourceBASE/$metisPACKAGE
-: ${METIS_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$metisPACKAGE}
+: "${METIS_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$metisPACKAGE}"

 [ -d "$METIS_SOURCE_DIR" ] || {
    echo "Missing sources: '$metisPACKAGE'"
-    exit 1
+    showDownloadHint METIS
+    exit 2
 }

 #
@ -146,10 +150,10 @@ install()

    if [ "$targetType" = libso ]
    then
-        \mv $libdir/libmetis.$SO $FOAM_EXT_LIBBIN
+        \mv $libdir/libmetis$EXT_SO $FOAM_EXT_LIBBIN
        rmdir $libdir 2>/dev/null # Failed rmdir is uncritical

-        echo "Installing: $FOAM_EXT_LIBBIN/libmetis.$SO"
+        echo "Installing: $FOAM_EXT_LIBBIN/libmetis$EXT_SO"
    fi
    return 0
 }
@ -164,11 +168,11 @@ echo
        configOpt="shared=1"
    fi

-    cd $METIS_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$METIS_SOURCE_DIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

    rm -rf $METIS_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libmetis.$SO
+    rm -f $FOAM_EXT_LIBBIN/libmetis$EXT_SO

    # Adjust metis integer size to match OpenFOAM label-size
    sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '$WM_LABEL_SIZE'=' \
--- a/30
+++ b/30
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -20,6 +22,7 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from ThirdParty directory only
+cd "${0%/*}" || exit
 wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
    echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
    echo "    The environment variables are inconsistent with the installation."
@ -42,7 +45,7 @@ usage() {

 usage: ${0##*/} [OPTION] [mgridgen-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * Build MGridGen
@ -59,12 +62,10 @@ exportCompiler          # Compiler info for CMake/configure
 while [ "$#" -gt 0 ]
 do
    case "$1" in
-    -h | -help)
-        usage
-        ;;
-    -gcc)
-        useGcc  # Use gcc/g++
-        ;;
+    '') ;;      # Ignore empty
+    -h | -help) usage   ;;
+    -gcc)       useGcc  ;;
+
    mgridgen-[1-9]* | MGridGen-[1-9]* | parmgridgen-[1-9]* | ParMGridGen-[1-9]*)
        mgridgenPACKAGE="${1%%/}"
        ;;
@ -96,7 +97,7 @@ fi
 #   MGRIDGEN_ARCH_PATH  : installation directory

 MGRIDGEN_SOURCE_DIR=$WM_THIRD_PARTY_DIR/$mgridgenPACKAGE
-MGRIDGEN_ARCH_PATH=$installBASE$WM_SIZE_OPTIONS/$mgridgenPACKAGE
+MGRIDGEN_ARCH_PATH="$installBASE$WM_SIZE_OPTIONS/$mgridgenPACKAGE"

 : ${FOAM_MPI:=dummy}

@ -141,14 +142,14 @@ then
    echo
 else
 (
-    cd $MGRIDGEN_SOURCE_DIR || exit 1
+    cd "$MGRIDGEN_SOURCE_DIR" || exit
    [ -e Makefile ] && make realclean 2>/dev/null

    # Remove any existing build folder and recreate
    rm -rf $MGRIDGEN_ARCH_PATH

-    serial="${CC:-$WM_CC}"   # CC (serial compiler)   default=cc
-    # parallel=$(whichMpicc)   # PARCC (parallel compiler) default=mpicc
+    serial="$(whichCC)"             # CC (serial compiler) default=gcc
+    # parallel=$(whichMpicc)        # PARCC (parallel compiler) default=mpicc
    # PARCC=$parallel
    # PARLD=$parallel
    # PARLIBS="-L../.. -lparmgrid -lmgrid -lm"
@ -156,8 +157,8 @@ else
    make \
        COPTIONS="-fPIC"  \
        LDOPTIONS="-fPIC" \
-        CC=$serial \
-        LD=$serial \
+        CC="$serial" \
+        LD="$serial" \
        LIBDIR="-L../.." \
        LIBS="-L../.. -lmgrid -lm" \
        make=make \
@ -166,6 +167,7 @@ else
    && echo "Built: $mgridgenPACKAGE"
 ) || {
    echo "Error building: $mgridgenPACKAGE"
+    exit 1
 }
 fi

--- a/31
+++ b/31
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -14,24 +16,24 @@
 #     makeMPICH
 #
 # Description
-#     Build script for mpich - legacy (unmaintained) build code!
+#     Build script for mpich [unmaintained]
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpich.$SO" ]
+    dir="${2%/}" # <- MPI_ARCH_PATH
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
    then
        echo "Have mpich shared library (${dir##*/})"
        exit 0
-    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpich.a" ]
+    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
    then
        echo "Have mpich static library (${dir##*/})"
        exit 0
@ -42,7 +44,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -70,7 +73,7 @@ usage() {

 usage: ${0##*/} [OPTION] [mpich-VERSION] [-- configure-options]
 options:
-  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build mpich with
@ -125,10 +128,10 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE

-if [ -r "$MPI_ARCH_PATH/lib_ARCH/libmpi.$SO" ]
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
 then
    echo "Already has shared library"
-elif [ -r "$MPI_ARCH_PATH/lib/libmpi.a" ]
+elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
 then
    echo "Already has static library"
 else
@ -149,8 +152,10 @@ else
        # End of configuration options
        # ----------------------------

-        cd $MPI_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        buildDIR=$buildBASE/$mpiPACKAGE
+
+        cd "$MPI_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        [ -e Makefile ] && make distclean 2>/dev/null

        rm -rf $MPI_ARCH_PATH
--- a/188
+++ b/188
@ -0,0 +1,188 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# Script
+#     makeMVAPICH2
+#
+# Description
+#     Build script for mvapich2 [unmaintained]
+#
+# ----------------------------------------------
+# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
+#------------------------------------------------------------------------------
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+
+# Short-circuit test for an installation
+if [ "$1" = "-test" ]
+then
+    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
+    dir="${2%/}" # <- MPI_ARCH_PATH
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+    then
+        echo "Have mpich shared library (${dir##*/})"
+        exit 0
+    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+    then
+        echo "Have mpich static library (${dir##*/})"
+        exit 0
+    else
+        echo "No mpich libraries found: ${dir:-not-specified}"
+        exit 2
+    fi
+fi
+#------------------------------------------------------------------------------
+# Run from third-party directory only
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+    echo "    Check your OpenFOAM environment and installation"
+    exit 1
+}
+. etc/tools/ThirdPartyFunctions
+# Transition
+# ~~~~~~~~~~
+_foamAddLib()  { true; }
+_foamAddMan()  { true; }
+_foamAddPath() { true; }
+#------------------------------------------------------------------------------
+
+WM_MPLIB=MV2MPI                                 # Ensure we get the correct MPI
+
+# mvapich2 version from OpenFOAM etc/config.sh file:
+_foamConfig mpi
+
+mpiPACKAGE=${FOAM_MPI:-mvapich2-system}
+
+#------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION] [mvapich2-VERSION] [-- configure-options]
+options:
+  -gcc          Force use of gcc/g++
+  -help
+
+* build mvapich2 with
+      ${mpiPACKAGE:-'unspecified mpich version'}
+
+The additional configure-options could include, for example,
+
+    ${0##*/} -- --disable-mcast
+
+USAGE
+    exit 1
+}
+#------------------------------------------------------------------------------
+exportCompiler          # Compiler info for CMake/configure
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    --) break;; # Extra configure options (leave on $@ for later detection)
+    -h | -help) usage   ;;
+    -gcc)       useGcc  ;;
+
+    mvapich*)
+        mpiPACKAGE="${1%%/}"
+        ;;
+
+    *)
+        die "unknown option/argument: '$1'"
+        ;;
+    esac
+    shift
+done
+
+[ -n "$mpiPACKAGE" ] || die "The mvapich-VERSION was not specified"
+
+# Nothing to build
+if _foamIsNone "$mpiPACKAGE"
+then
+    echo "Using mvapich-none (skip ThirdParty build of mvapich)"
+    exit 0
+elif _foamIsSystem "$mpiPACKAGE"
+then
+    echo "Using mvapich-system (skip ThirdParty build of mvapich)"
+    exit 0
+fi
+
+#------------------------------------------------------------------------------
+#
+# Build mvapich
+#
+#   MPI_SOURCE_DIR : location of the original sources
+#   MPI_ARCH_PATH  : installation directory
+
+MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
+MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
+
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+then
+    echo "Already has shared library"
+elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+then
+    echo "Already has static library"
+else
+    echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
+    echo
+
+    (
+        # Configuration options:
+        unset configOpt
+
+        # Additional configure options
+        if [ "$1" = "--" ]
+        then
+            shift
+            configOpt="$configOpt $@"
+        fi
+
+        # End of configuration options
+        # ----------------------------
+
+        buildDIR=$buildBASE/$mpiPACKAGE
+
+        cd "$MPI_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
+        [ -e Makefile ] && make distclean 2>/dev/null
+
+        rm -rf $MPI_ARCH_PATH
+        rm -rf $buildDIR
+        mkdir -p $buildDIR
+        cd $buildDIR
+
+        set -x
+        $MPI_SOURCE_DIR/configure \
+            --prefix=$MPI_ARCH_PATH \
+            --disable-fortran --disable-g \
+            --libdir=$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+            --enable-shared --disable-static \
+            $configOpt \
+        && set +x \
+        && make -j $WM_NCOMPPROCS \
+        && make install \
+        && echo "Built: $mpiPACKAGE" \
+        && pkgconfigAdjust $MPI_ARCH_PATH
+    ) || {
+        echo "Error building: $mpiPACKAGE"
+        exit 1
+    }
+fi
+
+#------------------------------------------------------------------------------
--- a/109
+++ b/109
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -26,7 +28,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -34,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------

-unset vtk_version mesa_version                           # Purge current values
+unset vtk_version mesa_version mesa_llvm              # Purge current values

 # mesa version from OpenFOAM etc/config.sh file:
 _foamConfig vtk
@ -49,7 +52,8 @@ usage() {

 usage: ${0##*/} [OPTION] mesa-VERSION [-- configure-options]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
+  -llvm VER     llvm version (in ThirdParty) or 'system' to use system
  -help

 * build Mesa with
@ -60,14 +64,26 @@ USAGE
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
+unset withLLVM

 # Non-standard location for clang?
 case "$WM_COMPILER_TYPE-$WM_COMPILER" in
-ThirdParty-Clang*)
-    thirdPartyClang=true
+(ThirdParty-Clang*)
+    withLLVM=true       # 'true' means find on path
    ;;
-*)
-    unset thirdPartyClang
+(system-Clang*)
+    withLLVM=system     # 'system' means find on path
+    ;;
+(*)
+    if _foamIsNone "$mesa_llvm"
+    then
+        withLLVM=false
+    elif _foamIsSystem "$mesa_llvm"
+    then
+        withLLVM=system     # 'system' means find on path
+    else
+        withLLVM="$mesa_llvm"  # Take value from mesa config
+    fi
    ;;
 esac

@ -80,12 +96,19 @@ do
    -h | -help) usage   ;;
    -gcc)
        useGcc
-        unset thirdPartyClang
+        unset withLLVM
+        ;;
+    -llvm)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        withLLVM="$2"
+        shift
+        ;;
+    llvm-*)
+        withLLVM="$1"
        ;;
    mesa-*)
        mesaPACKAGE="${1%%/}"
        ;;
-
    *)
        die "unknown option/argument: '$1'"
        ;;
@ -108,27 +131,43 @@ fi

 #------------------------------------------------------------------------------
 # Locate third-party clang as required
-if [ "$thirdPartyClang" = true ]
-then
-    thirdPartyClang=$(command -v clang) || {
-        echo "Error: could not properly locate clang"
+case "$withLLVM" in
+(true | system)
+    LLVM_ARCH_PATH="$(command -v clang)" || {
+        echo "Error: could not properly locate llvm/clang"
        exit 2
    }

    # Root installation directory
-    thirdPartyClang=${thirdPartyClang%/bin/clang}
+    LLVM_ARCH_PATH="${LLVM_ARCH_PATH%/bin/clang}"

-    [ -d "$thirdPartyClang" ] || {
-        echo "Error: could not properly locate clang"
+    [ -d "$LLVM_ARCH_PATH" ] || {
+        echo "Error: could not properly locate llvm/clang"
        exit 2
    }
-fi
+    ;;
+
+('' | none | false)
+    withLLVM=none
+    echo "No llvm"
+    ;;
+
+(llvm-*)
+    echo "check llvm = $withLLVM"
+    LLVM_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$withLLVM"
+
+    [ -d "$LLVM_ARCH_PATH" ] || {
+        echo "Error: could not properly locate llvm/clang"
+        exit 2
+    }
+    ;;
+esac

 #------------------------------------------------------------------------------
 #
 # Build MESA
 # For 64-bit
-# - MESA itself will normally build into 'lib64'.
+# - MESA itself will normally build into 'lib64' (depends on autoconfig).
 #
 #   MESA_SOURCE_DIR : location of the original sources
 #   MESA_ARCH_DIR   : installation directory
@ -149,11 +188,17 @@ adjustMESA()

 (
    # Configuration options:
-    unset configOpt
+    unset configOpt compFlags

-    if [ -d "$thirdPartyClang" ]
+    # Sometimes for LLVM issues
+    # compFlags="-D_GLIBCXX_USE_CXX11_ABI=0"
+
+    # Possibly for older mesa versions (see paraview wiki)
+    # compFlags="-O2 -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
+
+    if [ -d "$LLVM_ARCH_PATH" ]
    then
-        configOpt="$configOpt --with-llvm-prefix=$thirdPartyClang"
+        configOpt="$configOpt --with-llvm-prefix=$LLVM_ARCH_PATH"
    fi

    # Additional configure options
@ -167,8 +212,8 @@ adjustMESA()
    # ----------------------------
    buildDIR=$buildBASE/$mesaPACKAGE

-    cd $MESA_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$MESA_SOURCE_DIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

    # Remove any existing build
    rm -rf $MESA_ARCH_PATH
@ -178,17 +223,19 @@ adjustMESA()

    echo "----"
    echo "Building $mesaPACKAGE"
-    echo "    Source         : $MESA_SOURCE_DIR"
-    echo "    Target         : $MESA_ARCH_PATH"
-    if [ -d "$thirdPartyClang" ]
+    echo "    Source  : $MESA_SOURCE_DIR"
+    echo "    Target  : $MESA_ARCH_PATH"
+    if [ -d "$LLVM_ARCH_PATH" ]
    then
-        echo "    Clang          : $thirdPartyClang"
+        echo "    llvm    : $LLVM_ARCH_PATH"
    fi
    echo "----"

-    # Possibly for older mesa versions (see paraview wiki)
-    # CXXFLAGS="-O2 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
-    # CFLAGS="-O2 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
+    if [ -n "$compFlags" ]
+    then
+        CFLAGS="$CFLAGS $compFlags"
+        CXXFLAGS="$CXXFLAGS $compFlags"
+    fi

    ## autoreconf -fi
    set -x
--- a/makeMesa.example
+++ b/makeMesa.example
@ -0,0 +1,12 @@
+#!/bin/sh
+# An example for building mesa with llvm
+
+mesa=mesa-18.3.4
+llvm=llvm-4.0.1
+
+set -x
+./makeMesa \
+    $mesa $llvm
+    "$@"
+
+#------------------------------------------------------------------------------
--- a/23
+++ b/23
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,15 +21,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+    dir="${2%/}" # <- MPI_ARCH_PATH
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
    then
        echo "    Have openmpi shared library (${dir##*/})"
        exit 0
@ -42,7 +44,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -70,7 +73,7 @@ usage() {

 usage: ${0##*/} [OPTION] [openmpi-VERSION] [-- configure-options]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -memcheck     Configure with --enable-memcheck (requires valgrind.h)
  -threaded     Configure with --enable-mpi-thread-multiple
  -no-threaded  Configure with --disable-mpi-thread-multiple
@ -133,7 +136,7 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE

-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
 then
    echo "Already has shared library: $MPI_ARCH_PATH"
 elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
@ -171,8 +174,8 @@ else

        buildDIR=$buildBASE/$mpiPACKAGE

-        cd $MPI_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$MPI_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        [ -e Makefile ] && make distclean 2>/dev/null

        rm -rf $MPI_ARCH_PATH
--- a/30
+++ b/30
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -19,22 +21,22 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="$2" # <- PETSC_ARCH_PATH
+    dir="${2%/}" # <- PETSC_ARCH_PATH
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libpetsc.$SO \
+            $FOAM_EXT_LIBBIN/libpetsc$EXT_SO \
            $dir/lib/libpetsc.a \
-            $dir/lib/libpetsc.$SO \
+            $dir/lib/libpetsc$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@ -49,7 +51,8 @@ then
 fi
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -74,7 +77,7 @@ usage() {

 usage: ${0##*/} [OPTION] [lib|libso] [PETSC-VERSION]
 options:
-  -gcc          Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build PETSC with
@ -130,11 +133,12 @@ fi
 #   PETSC_SOURCE_DIR : location of the original sources

 PETSC_SOURCE_DIR=$sourceBASE/$petscPACKAGE
-: ${PETSC_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$petscPACKAGE}
+: "${PETSC_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$petscPACKAGE}"

 [ -d "$PETSC_SOURCE_DIR" ] || {
    echo "Missing sources: '$petscPACKAGE'"
-    exit 1
+    showDownloadHint PETSC
+    exit 2
 }


@ -166,8 +170,8 @@ echo
        configOpt="$configOpt --with-precision=double"
    fi

-    cd $PETSC_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    cd "$PETSC_SOURCE_DIR" || exit
+    export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo

    rm -rf $PETSC_ARCH_PATH

--- a/45
+++ b/45
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -25,7 +28,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -70,7 +74,8 @@ usage() {

 usage: ${0##*/} [OPTION] [paraview-VERSION] [CMAKE-OPTION]
 options:
-  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
+  -gcc              Force use of gcc/g++
+  -cmake PATH       with cmake from the given path
  -rebuild          for repeated builds (-make -install) *use with caution*
  -gl2              with new rendering backend (default: auto)
  -mesa             with mesa
@ -79,14 +84,14 @@ options:
  -mesa-lib PATH    path to mesa library     (current: ${MESA_LIBRARY:-none})
  -mpi              with mpi
  -mpi=N            with max 'N' mpi processes. N=0 for no upper-limit.
-  -python           with python
+  -python | -python2 | -python3
+                    with python
  -python-include DIR
                    location of python headers (current: ${PYTHON_INCLUDE:-none})
  -python-lib PATH  path to python library (current: ${PYTHON_LIBRARY:-none})
-  -cmake PATH       with cmake from the path given
-  -qmake PATH       with the Qt version corresponding to the qmake path given
+  -qmake PATH       with QT version corresponding to the qmake in given path
  -qt               with extra Qt gui support (if not already enabled)
-  -qt-VER           with Qt version corresponding to
+  -qt-VER           with QT version corresponding to
                        \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/qt-VER/bin/qmake
  -verbose          verbose output in Makefiles
  -version VER      specify an alternative version (current: $ParaView_VERSION)
@ -125,7 +130,7 @@ USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler          # Compiler info for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure

 # Various building stages
 unset runPATCH runCONFIG runMAKE runINSTALL
@ -232,8 +237,14 @@ do
    -python)
        withPYTHON=true
        ;;
+    -python2)
+        withPYTHON=true; withPYTHON3=false
+        ;;
+    -python3)
+        withPYTHON=true; withPYTHON3=true
+        ;;
    -no-python)
-        withPYTHON=false
+        withPYTHON=false; unset withPYTHON3
        ;;
    -python-include)
        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
@ -317,6 +328,16 @@ then
    fi
 fi

+# ParaView-5.7.0 default is python3
+if [ "$withPYTHON" = true ] && [ -z "$withPYTHON3" ]
+then
+    case "${ParaView_VERSION}" in
+    (5.[7-9]* | [6-9]* | [1-9][0-9].*)
+        withPYTHON3=true
+        ;;
+    esac
+fi
+
 if [ "$runDEFAULT" = true ]
 then
    : ${runPATCH:=true}
@ -365,6 +386,10 @@ Features selected
    python    ${withPYTHON:-false}
    qt        ${withQT:-false}
 ---------------------
+Compiler
+    cxx       ${CXX:-unknown}
+    flags     ${CXXFLAGS:-none}
+---------------------
 Version information
    paraview  ${ParaView_VERSION:-unknown}
    major     ${ParaView_MAJOR:-unknown}
--- a/makeParaView.example
+++ b/makeParaView.example
@ -9,11 +9,12 @@

 # mesa=mesa-11.2.2
 # mesa=mesa-13.0.3
-mesa=mesa-17.1.1
+# mesa=mesa-17.1.1
+mesa=mesa-18.3.4

 set -x
 ./makeParaView \
-    -mpi=0 \
+    -mpi \
    -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
    -python \
    -suffix mesa-mpi-py \
--- a/18
+++ b/18
@ -3,8 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@ -20,7 +23,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -35,7 +39,7 @@ usage() {

 usage: ${0##*/} [OPTION] [qt-VERSION] [-- configure-options]
 options:
-  -gcc              Force gcc/g++ instead of using \$WM_CC, \$WM_CXX
+  -gcc          Force use of gcc/g++
  -help

 * build $qtTYPE, version ${qtVERSION:-undefined}
@ -131,8 +135,8 @@ else
        # ----------------------------
        buildDIR=$buildBASE/$qtPACKAGE

-        cd $QT_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+        cd "$QT_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
        [ -e Makefile ] && make distclean 2>/dev/null

        # Remove any existing build folder and recreate
@ -145,7 +149,7 @@ else
        rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.h" 2>/dev/null
        rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.cpp" 2>/dev/null

-        cd $buildDIR || exit 1
+        cd "$buildDIR" || exit

        # Compile as opensource, accepting LGPL conditions (yes)
        echo yes | $QT_SOURCE_DIR/configure \
--- a/294
+++ b/294
@ -0,0 +1,294 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# Script
+#     makeSCOTCH
+#
+# Description
+#     Build the SCOTCH and PTSCOTCH libraries
+#
+# ----------------------------------------------
+# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Run from third-party directory only
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
+    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
+#------------------------------------------------------------------------------
+_foamConfig scotch  # Get SCOTCH_ARCH_PATH, SCOTCH_VERSION
+
+scotchPACKAGE=${SCOTCH_VERSION:-scotch-system}
+
+unset withMPI
+case "$WM_MPLIB" in (*MPI*) [ "$FOAM_MPI" = dummy ] || withMPI=true ;; esac
+
+#------------------------------------------------------------------------------
+usage()
+{
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    /bin/cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [libso] [scotch-VERSION]
+options:
+  -gcc          Force use of gcc/g++
+  -no-mpi       Suppress build of pt-scotch
+  -help
+
+* Compile SCOTCH
+      $kahipPACKAGE
+
+USAGE
+    exit 1
+}
+#------------------------------------------------------------------------------
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    '') ;;      # Ignore empty
+    -h | -help) usage   ;;
+    -gcc)       useGcc  ;;
+
+    -no-mpi)
+        unset withMPI
+        ;;
+    scotch-[1-9]* | scotch-git | scotch_* |  scotch-[1-9]*)
+        scotchPACKAGE="${1%%/}"
+        unset SCOTCH_ARCH_PATH  # Avoid inconsistency
+        ;;
+    *)
+        die "unknown option/argument: '$1'"
+        ;;
+    esac
+    shift
+done
+
+[ -n "$scotchPACKAGE" ] || die "The scotch-VERSION was not specified"
+
+# Nothing to build
+if _foamIsNone $scotchPACKAGE
+then
+    echo "Using scotch-none (skip ThirdParty build of SCOTCH)"
+    exit 0
+elif _foamIsSystem $scotchPACKAGE
+then
+    echo "Using scotch-system"
+    exit 0
+fi
+
+#------------------------------------------------------------------------------
+
+# Needs generalizing, but works fairly well
+for scotchMakefile in \
+    "OpenFOAM-$(uname -s)-${WM_COMPILER}.shlib" \
+    "OpenFOAM-$(uname -s).shlib" \
+    OpenFOAM-Linux.shlib \
+;
+do
+    scotchMakefile="etc/makeFiles/scotch/Makefile.inc.$scotchMakefile"
+    [ -f "$scotchMakefile" ] && break
+done
+
+# The relative link location within the "scotch/src/" directory
+makefileInc="../../$scotchMakefile"
+
+#------------------------------------------------------------------------------
+#
+# Build SCOTCH
+#
+#   SCOTCH_ARCH_PATH  : installation directory
+#   SCOTCH_SOURCE_DIR : location of the original sources
+
+SCOTCH_SOURCE_DIR=$sourceBASE/$scotchPACKAGE
+: "${SCOTCH_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$scotchPACKAGE}"
+
+[ -d "$SCOTCH_SOURCE_DIR/src" ] || {
+    echo "Missing sources: '$scotchPACKAGE'"
+    showDownloadHint SCOTCH
+    exit 2
+}
+
+echo
+echo ========================================
+echo "scotch decomposition ($scotchPACKAGE)"
+echo "    Makefile.inc  : ${makefileInc##*/}"
+
+# Test installation. May or may not have libscotcherrexit.so
+if [ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] \
+&& [ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_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
+
+    [ -f "$scotchMakefile" ] || {
+        echo " Error: no such makefile: $scotchMakefile"
+        exit 1
+    }
+
+    cd "$SCOTCH_SOURCE_DIR/src" || exit
+    export GIT_DIR="$SCOTCH_SOURCE_DIR/.git" # Mask seeing our own git-repo
+    rm -rf "$SCOTCH_ARCH_PATH"
+
+    applyPatch "$scotchPACKAGE" ..      # patch at parent-level
+
+    prefixDIR=$SCOTCH_ARCH_PATH
+    incDIR=$SCOTCH_ARCH_PATH/include
+    libDIR=$FOAM_EXT_LIBBIN
+
+    mkdir -p $prefixDIR 2>/dev/null
+    mkdir -p $incDIR    2>/dev/null
+    mkdir -p $libDIR    2>/dev/null
+
+    if [ -f "$makefileInc" ]
+    then
+        rm -f Makefile.inc
+        ln -s $makefileInc Makefile.inc
+    fi
+    [ -f Makefile.inc ] || {
+        echo " Error: scotch needs an appropriate Makefile.inc"
+        exit 1
+    }
+
+    export CCS="$(whichCC)"         # CCS (serial compiler)
+    export CCP="$(whichMpicc)"      # CCP (parallel compiler) default=mpicc
+
+    # Consistency for Intel-MPI and non-icc compilers
+    [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
+
+    make realclean 2>/dev/null  # Extra safety
+    make -j $WM_NCOMPPROCS libscotch \
+     && make \
+        prefix=$prefixDIR \
+        includedir=$incDIR \
+        libdir=$libDIR \
+        install
+
+    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
+    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+) || warnBuildIssues SCOTCH
+else
+    warnNotFound SCOTCH
+fi
+
+
+# Build ptscotch when MPI (ThirdParty or system) is available
+
+[ "${withMPI}" = true ] || {
+    # Report that the above tests failed and pass-through the failure
+    echo "Skipping pt-scotch (no mpi)"
+    exit 0
+}
+
+echo
+echo ========================================
+echo "pt-scotch decomposition ($scotchPACKAGE with $FOAM_MPI)"
+
+# Build ptscotch if normal scotch was built (has include and library)
+[ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] && \
+[ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_SO" ] || \
+{
+    # Report that the above tests failed and pass-through the failure
+    echo
+    echo "    skipping - no <scotch.h> found"
+    exit 2
+}
+
+if [ -f "$SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h" ] && \
+   [ -r "$FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch$EXT_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 ***"
+
+    [ -f "$scotchMakefile" ] || {
+        echo " Error: no such makefile: $scotchMakefile"
+        exit 1
+    }
+
+    cd "$SCOTCH_SOURCE_DIR/src" || exit
+    export GIT_DIR="$SCOTCH_SOURCE_DIR/.git" # Mask seeing our own git-repo
+    echo
+
+    prefixDIR=$SCOTCH_ARCH_PATH
+    incDIR=$SCOTCH_ARCH_PATH/include/$FOAM_MPI
+    libDIR=$FOAM_EXT_LIBBIN/$FOAM_MPI
+
+    mkdir -p $prefixDIR 2>/dev/null
+    mkdir -p $incDIR    2>/dev/null
+    mkdir -p $libDIR    2>/dev/null
+
+    if [ -f "$makefileInc" ]
+    then
+        rm -f Makefile.inc
+        ln -s $makefileInc Makefile.inc
+    fi
+    [ -f Makefile.inc ] || {
+        echo " Error: ptscotch needs an appropriate Makefile.inc"
+        exit 1
+    }
+
+    export CCS="$(whichCC)"     # CCS (serial compiler)
+    export CCP="$(whichMpicc)"  # CCP (parallel compiler) default=mpicc
+
+    # Consistency for Intel-MPI and non-icc compilers
+    [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
+
+    make realclean 2>/dev/null  # Extra safety
+    make -j $WM_NCOMPPROCS libptscotch \
+     && make \
+        prefix=$prefixDIR \
+        includedir=$incDIR \
+        libdir=$libDIR \
+        install
+
+    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
+    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+) || warnBuildIssues PTSCOTCH
+fi
+
+# Verify existence of ptscotch include
+[ -f "$SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h" ] || {
+    echo
+    echo "    WARNING: required include file 'ptscotch.h' not found!"
+}
+
+# Could now remove $SCOTCH_SOURCE_DIR/src/Makefile.inc
+
+#------------------------------------------------------------------------------
--- a/17
+++ b/17
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -27,7 +29,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
@ -63,7 +66,8 @@ usage() {

 usage: ${0##*/} [OPTION] [vtk-VERSION] [CMAKE-OPTION]
 options:
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              Force use of gcc/g++
+  -cmake PATH       with cmake from the given path
  -rebuild          for repeated builds (-make -install) *use with caution*
  -gl2              with new rendering backend (default: auto)
  -mesa             with mesa (if not already enabled)
@ -73,7 +77,6 @@ options:
  -osmesa           with off-screen mesa only
  -mpi              with mpi (VTK_Group_MPI=ON)
  -mpi=N            with max 'N' mpi processes. N=0 for no upper-limit.
-  -cmake PATH       with cmake from the path given
  -verbose          verbose output in Makefiles
  -version VER      specify an alternative version (current: $VTK_VERSION)
  -buildType NAME   specify the build type (default: Release)
@ -103,7 +106,7 @@ USAGE
    exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler          # Compiler info for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure

 # Various building stages
 unset runPATCH runCONFIG runMAKE runINSTALL
@ -293,6 +296,10 @@ Features selected
    mesa      ${withMESA:-false}
    mpi       ${withMPI:-false}
 ---------------------
+Compiler
+    cxx       ${CXX:-unknown}
+    cxxflags  ${CXXFLAGS:-none}
+---------------------
 Version information
    vtk       ${VTK_VERSION:-unknown}
    build     ${BUILD_TYPE:-unknown}
--- a/makeVTK.example
+++ b/makeVTK.example
@ -2,10 +2,11 @@
 # An example for building particular combinations of VTK with
 # - mesa (off-screen only)

-vtk=VTK-9.0.0
+vtk=VTK-8.2.0
 # mesa=mesa-11.2.2
 # mesa=mesa-13.0.3
-mesa=mesa-17.1.1
+# mesa=mesa-17.1.1
+mesa=mesa-18.3.4

 # Module_vtkAcceleratorsVTKm    : Request building vtkAcceleratorsVTKm
 #
@ -13,11 +14,10 @@ mesa=mesa-17.1.1

 set -x
 ./makeVTK \
-    -mpi  \
+    -mpi \
    -osmesa \
    -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
    $vtk "$@" \
    Module_vtkAcceleratorsVTKm=ON

-
 #------------------------------------------------------------------------------
--- a/7
+++ b/7
@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2019 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@ -20,7 +22,8 @@
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
 # Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
    echo "    Check your OpenFOAM environment and installation"
    exit 1
Author	SHA1	Message	Date
Mark Olesen	03f529f3bd	DOC: update list of software versions	2019-12-17 07:53:39 +01:00
Mark Olesen	cb75d01584	ENH: improve toolset naming - if passed things like "clang-9", strip down to the base name "clang"	2019-12-15 13:54:12 +01:00
Mark Olesen	baae61e0ec	DOC: update internal repo links	2019-12-09 13:15:26 +01:00
Mark Olesen	714cddd6ca	DOC: update links and replicate patches for scotch	2019-11-20 12:32:05 +01:00
Mark Olesen	c8a7f46db2	STYLE: regularize quoting and exit on failed 'cd'	2019-11-19 16:17:01 +01:00
Mark Olesen	e51f92f2f1	COMP: add error code to makeAdios2 to cascade error information to caller	2019-11-12 16:51:02 +01:00
Mark Olesen	a0d0ee36af	DOC: add note about LIBGL_DEBUG env variable	2019-11-11 11:53:51 +01:00
Mark Olesen	074481b2f0	CONFIG: updates for kahip and scotch	2019-10-28 12:56:09 +01:00
Mark Olesen	a856a5fcad	STYLE: remove unused branch in makeAdios2	2019-10-28 11:51:29 +01:00
Mark Olesen	c41b591b30	COMP: adjust makeParaView for paraview-5.7.0 (uses python3)	2019-10-02 17:16:20 +02:00
Mark Olesen	a9f5058557	ENH: more forgiving if scotch is missing, provide download hints (#45 ) - include makeAdios2 into the Allwmake list (as optional component)	2019-08-16 15:50:08 +02:00
Mark Olesen	54d6b7994d	CONFIG: harmonize makeAdios1, makeAdios2 files - remove old dependency of adios2 on the adios1 library	2019-07-31 16:16:10 +02:00
Mark Olesen	17a443a557	BUG: export minimal compiler flags for VTK, ParaView (fixes #44 ) - in 1906, we changed the handling of compiler flags to include the exact values as used by OpenFOAM. While this is needed for compiling some external programs -- see https://develop.openfoam.com/Development/OpenFOAM-plus/issues/1256 for the discussion -- it appears to bring in flags that upset some of the ParaView (and possibly VTK) compilation. The culprits are likely to be found in the various '-W' switches, but for now we simply extract a mininal set of compiler flags that include -std=c++11 -m64 -fPIC, but no optimization flags, additional warnings flags or OpenFOAM-specific defines.	2019-07-29 13:55:04 +02:00
Mark Olesen	b987703b3c	STYLE: minor update for README, BUILD information	2019-06-28 09:31:25 +02:00
Mark Olesen	325f848dc1	CONFIG: makeGcc with -m32/-m64 option instead of old WM_ARCH_OPTION	2019-06-27 18:43:10 +02:00
Mark Olesen	4c4a11755a	DOC: relocated OpenFOAM etc/README.md to doc/Config.md	2019-06-13 18:42:18 +02:00
Mark Olesen	3c852a8929	DOC: fix links	2019-06-09 19:09:46 +02:00
Mark Olesen	867d96ec54	DOC: update docs, add initial Requirements information	2019-06-07 13:31:19 +02:00
Mark Olesen	16b59832cc	CONFIG: add comment for compile flags in makeMesa - add links for newest khaip, scotch (untested)	2019-06-06 23:27:08 +02:00
Mark Olesen	ddd4176269	ENH: additional tweaks for building boost. Eg armclang	2019-04-29 21:26:31 +02:00
Mark Olesen	ae5b2326c0	ENH: provide separate makeSCOTCH script for independent use - improve handling of scotch build toolchain - relax the test for existence of libscotcherrexit, which can also be incorporated into libscotch itself	2019-04-29 18:51:05 +02:00
Mark Olesen	bbbc7b2953	COMP: force PROJECT_LIBS to be empty - additional safety when using wmake to generate .so or exe files. These third-party libraries must not themselves have a link dependency on OpenFOAM.	2019-04-27 17:48:22 +02:00
Mark Olesen	5ac0e3624f	STYLE: trim trailing slash from tested directories	2019-04-25 11:44:53 +02:00
Mark Olesen	a7c2a4bfb9	STYLE: use EXT_SO instead of SO for consistency with wmake internal naming	2019-04-25 10:46:45 +02:00
Mark Olesen	c6e6c0abbf	COMP: add Makefile patches for scotch_6.0.6 - bypasses generation of executables	2019-04-25 10:46:45 +02:00
Mark Olesen	fbbb275862	COMP: make libscotch/libptscotch targets instead of scotch/ptscotch - we do not generally need any of executables, just the libraries. This also avoids generating a libscotchmetis too.	2019-04-25 10:46:45 +02:00
Mark Olesen	770e22bf51	ENH: update handling of compiler and flags - support use of wmake -show-xyz, as well as older WM_CC, WM_CFLAGS etc. - add support for Makefile.inc for scotch - add -toolset= option for making boost and use b2 instead of legacy bjam for configuration	2019-04-25 10:46:44 +02:00
OpenFOAM bot	830e92194a	BOT: reformat headers	2019-04-12 08:54:50 +02:00
Mark Olesen	8df5d377e7	STYLE: update some examples for mesa-18.3.4 - still needs more testing to determine the best combination of versions	2019-03-11 11:54:02 +01:00
Mark Olesen	aa9fc0efd2	CONFIG: update makeMPICH and makeMVAPICH - note: mpich now builds libmpi.so instead of libmpich.so	2019-02-14 18:11:33 +01:00
Mark Olesen	f968a67362	CONFIG: update link for openmpi	2019-01-21 14:18:15 +01:00
Mark Olesen	c8135cc48e	CONFIG: update download links for adios + kahip	2019-01-21 10:24:41 +01:00
Mark Olesen	adfe28332e	CONFIG: additional llvm configuration for mesa build (#41 )	2019-01-21 10:24:15 +01:00