CONFIG: update adios and petsc version information

- does not change WM_OPTIONS or output directories, so that the target
  directories are correct.

Allclean

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  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) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     Allclean
@@ -22,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
@@ -33,10 +34,10 @@ usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-Usage: ${0##*/} [OPTION] [<platform> [ ... <platformN> ]]
+Usage: ${0##*/} [OPTION] [platform [ ... platformN]]
 options:
-  -all              remove all platforms directories.
-  -current          clean the current platform ($WM_OPTIONS).
+  -all              remove all platforms directories
+  -current          clean the current platform ($WM_OPTIONS)
   -help             print the usage
 
 Cleanup intermediate build directories.
@@ -48,10 +49,11 @@ USAGE
 }
 
 # Print help message
-if [ "$1" = "-h" -o "$1" = "-help" ]
-then
+case "$1" in
+(-h | -help*)
     usage
-fi
+    ;;
+esac
 
 #------------------------------------------------------------------------------
 
@@ -61,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
 
 
@@ -113,11 +124,11 @@ fi
 removePlatform()
 {
     local platform="$1"
-    if [ -n "$platform" -a -d "platforms/$platform" ]
+    if [ -n "$platform" ] && [ -d "platforms/$platform" ]
     then
         echo
         echo "Cleaning platform '$platform'"
-        \rm -rf "platforms/$platform"
+        rm -rf "platforms/$platform"
     else
         echo
         echo "Platform '$platform' not built"
@@ -138,7 +149,7 @@ do
         echo
         echo "Removing all platforms/sub-directories"
         echo
-        \rm -rf platforms/*
+        rm -rf platforms/*
         break
         ;;
 

Allwmake

@@ -3,17 +3,17 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
-#     Allwmake
+#     ThirdParty Allwmake
 #
 # Description
 #     Build script for ThirdParty applications/libraries
@@ -22,16 +22,12 @@
 # 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
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set for ThirdParty"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 exportCompiler true     # Compiler info + flags for CMake/configure
@@ -52,14 +48,15 @@ echo Build MPI libraries if required
 echo "    $MPI_ARCH_PATH"
 case "$WM_MPLIB" in
 (OPENMPI | MPICH)
-    ./make$WM_MPLIB -test "$MPI_ARCH_PATH" || ./make$WM_MPLIB
+    ./make"$WM_MPLIB" -test "$MPI_ARCH_PATH" || ./make"$WM_MPLIB"
     ;;
 esac
 
 
 #------------------------------------------------------------------------------
 
-./makeSCOTCH
+# Treat as optional, but really isn't if anyone wants parallel calculations
+./makeSCOTCH || warnBuildIssues SCOTCH
 
 #------------------------------------------------------------------------------
 echo
@@ -71,7 +68,7 @@ then
 fi
 if [ -n "$KAHIP_ARCH_PATH" ]
 then
-    echo KaHIP decomposition
+    echo KAHIP decomposition
     ./makeKAHIP -test "$KAHIP_ARCH_PATH" || \
     ./makeKAHIP || warnBuildIssues KAHIP
 else
@@ -88,7 +85,7 @@ then
 fi
 if [ -n "$METIS_ARCH_PATH" ]
 then
-    echo Metis decomposition
+    echo METIS decomposition
     ./makeMETIS -test "$METIS_ARCH_PATH" || \
     ./makeMETIS || warnBuildIssues METIS
 else
@@ -100,13 +97,14 @@ echo
 echo ========================================
 if [ -n "$CGAL_ARCH_PATH" ]
 then
-    echo "CGAL/boost"
+    echo "cgal/boost"
     ./makeCGAL -test "$CGAL_ARCH_PATH" "$BOOST_ARCH_PATH" || \
     ./makeCGAL || warnBuildIssues CGAL
 else
     warnNotFound CGAL   # is optional
 fi
 
+#------------------------------------------------------------------------------
 echo
 echo ========================================
 if [ -n "$FFTW_ARCH_PATH" ]
@@ -118,6 +116,26 @@ else
     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

BUILD.md

@@ -6,7 +6,7 @@ OpenFOAM depends to a certain extent on third-party libraries
 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:
@@ -26,7 +26,7 @@ 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,
 ```
@@ -54,13 +54,17 @@ usage: makeFFTW [OPTION] [fftw-VERSION]
 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.
 
 
 ---
@@ -144,19 +148,15 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
    - 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)*
-   - 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
-     remember to rebuild the post-processing function objects and the
-     reader module as well.
+   - Can be useful for visualization and for run-time post-processing function objects.
+     You can build this at a later point in time, and rebuild the visualization modules.
 3. Make any additional optional components
 
 
 #### 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).
@@ -173,11 +173,23 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
   Automatically invoked from the ThirdParty `Allwmake`,
   but can be invoked directly to resolve possible build errors.
 
+`makeOPENMPI`
+- Builds [OPENMPI](#parallel) library.
+
+`makePETSC`
+- Only required for [PETSC](#general-packages) support.
+
 `makeMETIS`
 - Builds [METIS](#parallel) decomposition library.
   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.
 
@@ -204,8 +216,8 @@ export GMP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mp
   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
@@ -263,6 +275,29 @@ 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
 
@@ -292,15 +327,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.
@@ -393,6 +419,8 @@ you may have additional hurdles to using the newest versions of clang.
 | [boost][page boost]   | [download][link boost]
 | [CGAL][page CGAL]     | [download][link CGAL]
 | [FFTW][page FFTW]     | [download][link FFTW]
+| [PETSC][page PETSC]   | [download][link PETSC]
+| [HYPRE][page HYPRE]   | [repo][repo HYPRE] or [download][link HYPRE]
 | [ADF/CGNS][page CGNS], ccm | [link ccmio][link ccmio]
 | gperftools            | [repo][repo gperftools] or [download][link gperftools]
 
@@ -401,10 +429,10 @@ 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 [newer][newer scotch]
-| [kahip][page kahip] | [download][link kahip] or [newer][newer kahip]
+| [openmpi][page openmpi] | [download][link openmpi]. ***Some openmpi2/openmpi3 versions exhibit [stability issues](https://github.com/open-mpi/ompi/issues/5375)***
+| [adios][page adios]   | [repo][repo adios] or [github download][link adios]
+| [scotch, ptscotch][page scotch] | [repo][repo scotch] or [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]
 
 
@@ -413,7 +441,7 @@ 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.
 
 
@@ -427,7 +455,8 @@ The minimum CMake requirements for building various components.
 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.3         ParaView-5.6.3
+3.10        ParaView-5.7.0 - ParaView-5.8.0
 3.4.3       llvm-3.9.1
 3.4.3       llvm-4.0.0 - llvm-6.0.0
 3.6         ADIOS2
@@ -447,6 +476,24 @@ 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
@@ -455,8 +502,8 @@ that clang compiler for building the newer llvm/clang version.
 [page mpc]:       http://www.multiprecision.org/
 
 [link gcc]:       http://gcc.gnu.org/releases.html
-[link gmp]:       ftp://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
-[link mpfr]:      ftp://ftp.gnu.org/gnu/mpfr/mpfr-4.0.1.tar.xz
+[link gmp]:       ftp://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.xz
+[link mpfr]:      ftp://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
 [link mpc]:       ftp://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 
 
@@ -475,47 +522,57 @@ 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.1.tar.gz
-[altlink adios]:  http://users.nccs.gov/~pnorbert/adios-1.13.1.tar.gz
+[page adios]:     https://csmd.ornl.gov/software/adios2
+[repo adios]:     https://github.com/ornladios/ADIOS2
+[link adios]:     https://github.com/ornladios/ADIOS2/archive/v2.6.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 scotch]:    https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
-[newer scotch]:   https://gforge.inria.fr/frs/download.php/file/38040/scotch_6.0.7.tar.gz
+[repo scotch]:    https://gitlab.inria.fr/scotch/scotch
+[link scotch61]:  https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[link scotch60_10]:  https://gforge.inria.fr/frs/download.php/file/38350/scotch_6.0.10.tar.gz
+[link scotch]:    https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz
+[older scotch]:   https://gforge.inria.fr/frs/download.php/file/38114/scotch_6.0.8.tar.gz
+[oldest scotch]:  https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.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
-[newer kahip]:    http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.10.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.7.tar.bz2
-[newer openmpi]:  https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.bz2
+[older openmpi]:  https://download.open-mpi.org/release/open-mpi/v1.10/openmpi-1.10.7.tar.bz2
+[link openmpi]:   https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.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
-
+[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/
-[link cmake]:     http://www.cmake.org/files/v3.5/cmake-3.5.2.tar.gz
+[link cmake]:     https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
 
 [page boost]:     http://boost.org
-[link boost]:     https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2
+[link boost]:     https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.bz2
 
 [page CGAL]:      http://cgal.org
-[link CGAL]:      https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9.1/CGAL-4.9.1.tar.xz
+[link CGAL]:      https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.12.2/CGAL-4.12.2.tar.xz
 
 [page FFTW]:      http://www.fftw.org/
 [link FFTW]:      http://www.fftw.org/fftw-3.3.7.tar.gz
 
+[page petsc]:     https://www.mcs.anl.gov/petsc/
+[link petsc]:     https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.14.2.tar.gz
+
+[page hypre]:     https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/
+[repo hypre]:     https://github.com/hypre-space/hypre/
+[link hypre]:     https://github.com/hypre-space/hypre/archive/v2.19.0.tar.gz
+
 [page cgns]:      http://cgns.github.io/
 [link ccmio]:     http://portal.nersc.gov/project/visit/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
 [altlink ccmio]:  http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
@@ -533,7 +590,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
@@ -545,30 +603,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 openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
-
-
 ---
 
-<!-- Standard Footer -->
-## Additional OpenFOAM Links
-
-- [Community AddOns][link AddOns] repository
-- [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-2019 OpenCFD Ltd
+Copyright 2016-2020 OpenCFD Ltd

README.md

@@ -108,30 +108,15 @@ wmake -show-compile-cxx
 
 [download ParaView]: https://www.paraview.org/download/
 
-
 <!-- OpenFOAM -->
 
-[link AddOns]: https://develop.openfoam.com/Community/OpenFOAM-addOns
-[link openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
+[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
-- [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-2019 OpenCFD Ltd

Requirements.md

@@ -2,50 +2,71 @@
 
 For building some particular third-party libraries from source,
 the normal [OpenFOAM System Requirements][link openfoam-require]
-will be insufficient.
+may not be sufficient.
 
 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,
+As duly noted in [BUILD][link third-build] and [README][link third-readme] 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.
+is likely adequate for your needs.
 
 
-**Please help us with keeping the information here up-to-date and accurate.**
+***Please help us with keeping the information here up-to-date and accurate.***
 
 ### Ubuntu
 
-Dependencies:
+The full dependency list for building ParaView can be found from the
+corresponding [debian/control][debian control] file.
+
+A ***quick*** way to get these dependencies on to your system is to
+use the paraview development package:
 ```
-sudo apt-get install qt4-dev-tools libqt4-dev libqt4-opengl-dev freeglut3-dev libqtwebkit-dev  libxt-dev
+sudo apt install paraview-dev
 ```
+Depending on your setup, the following subset may also be enough:
+```
+sudo apt install cmake qt5base-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev
+```
+
 
 ### openSUSE
 
-Dependencies:
+The full dependency list for building ParaView can be found from the
+corresponding [rpm spec][suse spec] file.
 
+A ***quick*** way to get these dependencies on to your system is to
+use the paraview development package:
 ```
-sudo zypper install glu-devel
-sudo zypper install libQtWebKit-devel libqt4-devel qt4-assistant-adp-devel qt4-x11-tools
+sudo zypper install paraview-devel
 ```
 
+Depending on your setup, the following subset may also be enough:
+```
+sudo zypper install Mesa-libEGL-devel
+sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras
+sudo zypper install libXt-devel
+```
+
+
 <!-- Quick links -->
 
 [download ParaView]: https://www.paraview.org/download/
+[debian control]: https://salsa.debian.org/science-team/paraview/-/blob/master/debian/control
+[suse spec]: https://build.opensuse.org/package/view_file/science/paraview/paraview.spec
 
 
 <!-- OpenFOAM -->
 
-[link openfoam-readme]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/README.md
-[link openfoam-config]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Config.md
-[link openfoam-build]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Build.md
-[link openfoam-require]: https://develop.openfoam.com/Development/OpenFOAM-plus/blob/develop/doc/Requirements.md
-[link third-readme]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/README.md
-[link third-build]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/BUILD.md
-[link third-require]: https://develop.openfoam.com/Development/ThirdParty-plus/blob/develop/Requirements.md
+[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
+Copyright 2019-2020 OpenCFD Ltd

SOURCES.txt

@@ -1,4 +1,43 @@
-Short summary of third-party software versions for recent OpenFOAM versions.
+Third-party software versions for recent OpenFOAM versions
+
+OpenFOAM-2012
+---------------
+
+ADIOS-2.6.0        *update*
+CGAL-4.12.2
+ParaView-5.6.3
+boost_1_66_0
+fftw-3.3.7
+openmpi-4.0.3
+scotch_6.0.9
+kahip-2.12
+
+
+OpenFOAM-2006
+---------------
+
+ADIOS-2.4.0
+CGAL-4.12.2        *update*
+ParaView-5.6.3
+boost_1_66_0       *update*
+fftw-3.3.7
+openmpi-4.0.3      *update*
+scotch_6.0.9
+kahip-2.12
+
+
+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
 ---------------
@@ -76,7 +115,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*

etc/makeFiles/kahip/options

@@ -8,6 +8,7 @@ EXE_INC = \
     ${c++LESSWARN} \
     ${COMP_OPENMP} \
     -DNDEBUG -DMODE_NODESEP \
+    -I. \
     -I$(KAHIP_LIB_SRC) \
     -I$(KAHIP_LIB_SRC)/partition \
     -I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement

etc/makeFiles/libccmio/options

@@ -1,7 +1,5 @@
 /* NOTE: make any changes to this file in etc/makeFiles/ */
 
-EXE_INC =
-
+EXE_INC = -I.
 LIB_LIBS =
-
 PROJECT_LIBS =

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

@@ -10,7 +10,7 @@
 # - 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
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -29,7 +29,7 @@ CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
-    -DCOMMON_FILE_COMPRESS_GZ \
+    -UCOMMON_FILE_COMPRESS \
     -DCOMMON_RANDOM_FIXED_SEED \
     -DSCOTCH_DETERMINISTIC \
     -DSCOTCH_RENAME \
@@ -41,7 +41,7 @@ CFLAGS     += -DINTSIZE64
 endif
 
 CLIBFLAGS   =
-LDFLAGS     = $(WM_LDFLAGS) -lz -lm
+LDFLAGS     = $(WM_LDFLAGS) -lm
 
 MAKE        = make
 CP          = cp

etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux-Mingw.shlib

@@ -10,7 +10,7 @@
 # - 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
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -28,12 +28,17 @@ OBJ         = .o
 
 CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
 
+# Flags for including windows MPI information (MSMPI)
+CFLAGS_WINMPI = -I$(MPI_ARCH_PATH)/include \
+    -DMSMPI_NO_SAL -DMSMPI_NO_DEPRECATE_20 \
+    -D_MPICH_DLL_
+
 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
+CCS         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCP         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCD         = gcc $(CFLAGS_WINMPI)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
     -DCOMMON_PTHREAD_FILE \
     -UCOMMON_FILE_COMPRESS \
@@ -48,6 +53,10 @@ ifeq ($(WM_LABEL_SIZE),64)
 CFLAGS     += -DINTSIZE64
 endif
 
+# Non-standard "__stdcall" in MSMPI <mpi.h>
+CCDFLAGS    = $(CFLAGS) -D__stdcall=''
+
+
 CLIBFLAGS   = -shared
 LDFLAGS     =
 

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

@@ -10,7 +10,7 @@
 # - 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
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -29,7 +29,7 @@ CCS        ?= $(CC)
 CCP        ?= mpicc
 CCD         = $(CCP)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
-    -DCOMMON_FILE_COMPRESS_GZ \
+    -UCOMMON_FILE_COMPRESS \
     -DCOMMON_RANDOM_FIXED_SEED \
     -DSCOTCH_DETERMINISTIC \
     -DSCOTCH_RENAME \
@@ -41,7 +41,7 @@ CFLAGS     += -DINTSIZE64
 endif
 
 CLIBFLAGS   = -shared
-LDFLAGS     = -Xlinker --no-as-needed $(WM_LDFLAGS) -lz -lm -lrt
+LDFLAGS     = -Xlinker --no-as-needed $(WM_LDFLAGS) -lm -lrt
 
 MAKE        = make
 CP          = cp

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)

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)

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)

etc/pkgconfigAdjust

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/pkgconfigAdjust
@@ -33,7 +34,7 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 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"
@@ -64,7 +65,7 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) usage   ;;
 
     *)
         pkgconfigAdjust "$1"

etc/pkgconfigPrefix

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/pkgconfigPrefix
@@ -26,12 +27,12 @@
 #
 #     This allows this type of shell command
 #
-#        etc/pkgconfigPrefix $(find platforms -type d -name pkgconfig)
+#        etc/pkgconfigPrefix $(find platforms -name pkgconfig -type d)
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 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"
@@ -61,7 +62,7 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) usage   ;;
 
     *)
         pkgconfigNewPrefix "$1"

etc/relocateQt

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  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) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     etc/relocateQt
@@ -21,7 +21,7 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Run from third-party (parent) directory only
+# Run from third-party directory only
 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"
@@ -56,12 +56,12 @@ while [ "$#" -gt 0 ]
 do
     case "$1" in
     '') ;;      # Ignore empty
-    -h | -help) usage   ;;
+    -h | -help*) usage   ;;
 
     -f | -force)
         optForce=true
         ;;
-    -qt-[1-9]* | [1-9]* | qt-*)
+    -qt-[0-9]* | [0-9]* | qt-*)
         # -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
         qtVERSION="${1%%/}";
         qtVERSION="${qtVERSION##*-}"
@@ -84,6 +84,6 @@ then
     # Create qt.conf and adjust locations to use '${prefix}' internally
     finalizeQt
 fi
-pkgconfigNewPrefix $QT_ARCH_PATH
+pkgconfigNewPrefix "$QT_ARCH_PATH"
 
 # -----------------------------------------------------------------------------

etc/testThirdPartyFunctions

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     testThirdPartyFunctions

etc/tools/ParaViewFunctions

@@ -2,14 +2,14 @@
 # =========                 |
 # \\      /  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) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/ParaViewFunctions
@@ -18,8 +18,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
 #         >>
@@ -38,6 +37,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
 
@@ -85,7 +85,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
 }
 
 
@@ -166,9 +166,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"
@@ -187,7 +195,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" ] || {
@@ -205,7 +213,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
@@ -215,12 +223,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
 
@@ -259,7 +267,7 @@ addMesaSupport()
         return
     fi
 
-    if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
+    if [ -d "$MESA_INCLUDE" ] && [ -f "$MESA_LIBRARY" ]
     then
         addCMakeVariable "VTK_OPENGL_HAS_OSMESA=ON"
         addCMakeVariable "OSMESA_INCLUDE_DIR=$MESA_INCLUDE"
@@ -388,7 +396,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)"
@@ -426,7 +434,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"
@@ -445,7 +453,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
@@ -471,7 +479,7 @@ INFO
     # Non-system installation of QT?
     case "$qtLib" in (/usr/lib | /usr/lib64) unset qtLib ;; esac
 
-    if [ "${qmake%/*}" != /usr/bin -a -d "$qtLib" ]
+    if [ "${qmake%/*}" != /usr/bin ] && [ -d "$qtLib" ]
     then
         /bin/cat<<INFO
 

etc/tools/QtFunctions

@@ -2,14 +2,14 @@
 # =========                 |
 # \\      /  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) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/QtFunction
@@ -35,7 +35,7 @@ createQtConf()
 {
     local confFile="$QT_ARCH_PATH/bin/qt.conf"
 
-    if [ -n "$QT_ARCH_PATH" -a -d "$QT_ARCH_PATH/bin" ]
+    if [ -n "$QT_ARCH_PATH" ] && [ -d "$QT_ARCH_PATH/bin" ]
     then
         /bin/cat << QT_CONF > $confFile
 [Paths]

etc/tools/ThirdPartyFunctions

@@ -2,14 +2,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/ThirdPartyFunctions
@@ -23,6 +23,10 @@
 #     Compiler and flags are managed via the 'wmake -show-c, -show-cflags, ..'
 #     but also with WM_CC, WM_CFLAGS,... env variables
 #
+# Files
+#     Uses OpenFOAM/etc/config.sh/cmake (if it exists) for the
+#     CMAKE_ARCH_PATH that may specify a possible cmake/bin directory.
+#
 #------------------------------------------------------------------------------
 
 # The normal locations for source, build and installation (prefix-dir)
@@ -30,6 +34,9 @@ sourceBASE="$WM_THIRD_PARTY_DIR"
 buildBASE="$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER"
 installBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 
+# Commonly used names
+unset sourceDIR buildDIR prefixDIR binDIR incDIR libDIR
+
 # Synthetic value combining precision and label size (Eg, DPInt32)
 WM_SIZE_OPTIONS="${WM_PRECISION_OPTION}Int${WM_LABEL_SIZE}"
 
@@ -37,7 +44,15 @@ WM_SIZE_OPTIONS="${WM_PRECISION_OPTION}Int${WM_LABEL_SIZE}"
 EXT_SO="$(wmake -show-ext-so 2>/dev/null)"
 if [ -z "$EXT_SO" ]
 then
-    [ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
+    EXT_SO=.so
+    case "$WM_OSTYPE" in
+    *windows)
+        EXT_SO=.dll
+        ;;
+    *)
+        [ Darwin = "$(uname -s 2>/dev/null)" ] && EXT_SO=.dylib
+        ;;
+    esac
 fi
 
 
@@ -54,49 +69,126 @@ then
 fi
 
 unset BUILD_SUFFIX
+
 #------------------------------------------------------------------------------
+# Check for existence of shared library (without .so extension)
+#
+# $1 = The path and library stem
+#
+haveLibso()
+{
+    if [ -z "$1" ]
+    then
+        return 1
+    elif [ -r "$1$EXT_SO" ]
+    then
+        return 0
+    elif [ "$EXT_SO" = .dll ] && [ -r "$1.dll.a" ]
+    then
+        # Including cross-compiling
+        return 0
+    fi
+
+    return 2
+}
+
+
+#------------------------------------------------------------------------------
+# Service routine to strip out OpenFOAM-specific portions from the compiler
+# flags (ie, everything after and including "-DOPENFOAM=...")
+# while retaining '-fPIC'
+#
+# $1 = all flags concatenated as a single string
+#
+stripCompilerFlags()
+{
+    local flags="${1%-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 "$1" in
+        (*-fPIC*)
+            # Add -fPIC back in (was after -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()
 {
+    local option="$1"
     local comp flag
 
     # C compiler and flags
-    comp="$(wmake -show-c 2>/dev/null)" && \
-    flag="$(wmake -show-cflags 2>/dev/null)" || {
+    if ! comp="$(wmake -show-c 2>/dev/null)" \
+    || ! flag="$(wmake -show-cflags 2>/dev/null)"
+    then
         comp="$WM_CC"
         flag="$WM_CFLAGS"
-    }
+    fi
 
     if test -n "$comp" && command -v "$comp" >/dev/null
     then
         export CC="$comp"
         if [ -n "$flag" ]
         then
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags "$flag")"
+                    ;;
+            esac
             export CFLAGS="$flag"
         fi
     fi
 
     # C++ compiler and flags
-    comp="$(wmake -show-cxx 2>/dev/null)" && \
-    flag="$(wmake -show-cxxflags 2>/dev/null)" || {
+    if ! comp="$(wmake -show-cxx 2>/dev/null)" \
+    || ! flag="$(wmake -show-cxxflags 2>/dev/null)"
+    then
         comp="$WM_CXX"
         flag="$WM_CXXFLAGS"
-    }
+    fi
 
     if test -n "$comp" && command -v "$comp" >/dev/null
     then
         export CXX="$comp"
         if [ -n "$flag" ]
         then
+            case "$option" in
+                (basic | minimal | strip)
+                    flag="$(stripCompilerFlags "$flag")"
+                    ;;
+            esac
             export CXXFLAGS="$flag"
         fi
     fi
 }
 
+
 # Export linker settings for CMake/configure
 exportLinker()
 {
@@ -119,6 +211,16 @@ useGcc()
     export CXX=g++
 }
 
+
+# Force use of system gcc/g++ (wmake compilation) without changing the
+# WM_OPTIONS or output directories
+useGccWmake()
+{
+    export WM_COMPILER=Gcc
+    export WM_COMPILER_TYPE=system
+}
+
+
 # Scan arguments for a '-gcc' option, forcing gcc/g++ when found
 useGccFlag()
 {
@@ -166,13 +268,20 @@ whichCXX()
 }
 
 
-# Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
+# Return
+#   <mpicc> by default
+#   <mpifcc> for FJMPI (if possible)
+#   <mpiicc> for INTELMPI (if possible)
+#
 # Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
 # NOTE: could further refine based on "wmake -show-c", but not yet needed
 whichMpicc()
 {
     local comp="$(command -v mpicc)"
     case "$WM_MPLIB" in
+    (FJMPI)
+        comp="$(command -v mpifcc)"     # Fujitsu <mpifcc> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicc)"     # Intel <mpiicc> available?
         ;;
@@ -184,13 +293,20 @@ whichMpicc()
 }
 
 
-# Return <mpicxx> by default or <mpiicpc> if possible for INTELMPI.
+# Return
+#   <mpicxx> by default
+#   <mpiFCC> for FJMPI (if possible)
+#   <mpiicpc> for INTELMPI (if possible)
+#
 # 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
+    (FJMPI)
+        comp="$(command -v mpiFCC)"     # Fujitsu <mpiFCC> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicpc)"    # Intel <mpiicpc> available?
         ;;
@@ -202,24 +318,31 @@ whichMpicxx()
 }
 
 # Require wmkdepend etc when building with wmake
+# before 2020-04-03: wmake/platforms/linux64Gcc
+# after  2020-04-03: platforms/tools/linux64Gcc
 requireWMakeToolchain()
 {
+    local archName="$WM_ARCH$WM_COMPILER"
     local wmDir="${WM_DIR:-$WM_PROJECT_DIR/wmake}"
-    local archDir="$wmDir/platforms/$WM_ARCH$WM_COMPILER"
+    local archDir1="$wmDir/platforms/$archName"
+    local archDir2="$WM_PROJECT_DIR/platforms/tools/$archName"
 
-    if [ -x "$archDir/wmkdepend" ] || [ -x "$archDir/wmkdep" ]
+    if [ -x "$archDir1/wmkdepend" ] || [ -x "$archDir1/wmkdep" ] || \
+       [ -x "$archDir2/wmkdepend" ] || [ -x "$archDir2/wmkdep" ]
     then
         echo "Appear to have {wmkdepend,wmkdep} binary" 1>&2
     else
         echo "Warning: appear to be missing {wmkdepend,wmkdep} binary ... building" 1>&2
         ( cd "$wmDir/src" && make -s )
 
-        [ -x "$archDir/wmkdepend" ] || [ -x "$archDir/wmkdep" ] || {
+        [ -x "$archDir1/wmkdepend" ] || [ -x "$archDir1/wmkdep" ] || \
+        [ -x "$archDir2/wmkdepend" ] || [ -x "$archDir2/wmkdep" ] || {
             exec 1>&2
             echo
             echo "Error: cannot use wmake build for '${0##*/}"
             echo "    Missing {wmkdepend,wmkdep} binary"
-            echo "    Please try run the top-level OpenFOAM Allwmake first"
+            echo "    Please run the top-level OpenFOAM Allwmake first"
+            echo "    or top-level wmake/src/Allmake"
             echo
             exit 1
         }
@@ -227,6 +350,40 @@ requireWMakeToolchain()
 }
 
 
+# Require FOAM_EXT_LIBBIN for some compilations
+requireExtLibBin()
+{
+    [ -n "$FOAM_EXT_LIBBIN" ] || {
+        exec 1>&2
+        echo
+        echo "Error: \$FOAM_EXT_LIBBIN not set for '${0##*/}"
+        echo "    Check your OpenFOAM environment and installation"
+        echo
+        exit 1
+    }
+}
+
+
+# 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' | \
+            uniq
+        fi
+    fi
+}
+
+
 #------------------------------------------------------------------------------
 # Some functions as per OpenFOAM etc/config.sh/functions
 
@@ -342,6 +499,7 @@ _foamIsSystem()
 unset CMAKE_PATH # clear when first loaded
 findCMake()
 {
+    local config="config.sh/cmake"
     local candidate foundExe
 
     if [ -n "$CMAKE_PATH" ]
@@ -350,13 +508,13 @@ findCMake()
         if [ -d "$CMAKE_PATH" ]
         then
             for candidate in \
-                $CMAKE_PATH/cmake \
-                $CMAKE_PATH/bin/cmake \
+                "$CMAKE_PATH"/cmake \
+                "$CMAKE_PATH"/bin/cmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -366,14 +524,14 @@ findCMake()
         if [ -z "$foundExe" ]
         then
             for candidate in \
-                $CMAKE_PATH \
-                $installBASE/$CMAKE_PATH/bin/cmake \
-                $installBASE/cmake-$CMAKE_PATH/bin/cmake \
+                "$CMAKE_PATH" \
+                "$installBASE/$CMAKE_PATH"/bin/cmake \
+                "$installBASE/cmake-$CMAKE_PATH"/bin/cmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -387,26 +545,45 @@ findCMake()
                 foundExe="$(cd ${foundExe%/cmake} 2>/dev/null && pwd)/cmake"
             fi
             echo "Using cmake=$foundExe" 1>&2
-            echo $foundExe
+            echo "$foundExe"
             return 0
         else
             cat << NOT_FOUND 1>&2
 'cmake' not found under specified CMAKE_PATH
     CMAKE_PATH=$CMAKE_PATH
-reverting to using command from path
+reverting to using command from $config or from PATH
 NOT_FOUND
         fi
     fi
 
+    unset cmake_version CMAKE_ARCH_PATH
+    if candidate="$("$WM_PROJECT_DIR"/bin/foamEtcFile "$config" 2>/dev/null)"
+    then
+        . "$candidate"
+
+        for candidate in \
+            "$CMAKE_ARCH_PATH"/bin/cmake \
+            "$installBASE/$cmake_version"/bin/cmake \
+        ;
+        do
+            if [ -f "$candidate" ] && [ -x "$candidate" ]
+            then
+                echo "Using cmake=$candidate" 1>&2
+                echo "$candidate"
+                return 0
+            fi
+        done
+    fi
+
     # Default to use the path, try resolving (so we know what we are using).
     for candidate in cmake
     do
-        foundExe=$(command -v $candidate 2>/dev/null) && break
+        foundExe="$(command -v "$candidate" 2>/dev/null)" && break
     done
-    : ${foundExe:=false}
+    : "${foundExe:=false}"
 
     echo "Using cmake=$foundExe" 1>&2
-    echo $foundExe
+    echo "$foundExe"
 }
 
 
@@ -427,13 +604,13 @@ findQMake()
         if [ -d "$QMAKE_PATH" ]
         then
             for candidate in \
-                $QMAKE_PATH/qmake \
-                $QMAKE_PATH/bin/qmake \
+                "$QMAKE_PATH"/qmake \
+                "$QMAKE_PATH"/bin/qmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -443,14 +620,14 @@ findQMake()
         if [ -z "$foundExe" ]
         then
             for candidate in \
-                $QMAKE_PATH \
-                $installBASE/$QMAKE_PATH/bin/qmake \
-                $installBASE/qt-$QMAKE_PATH/bin/qmake \
+                "$QMAKE_PATH" \
+                "$installBASE/$QMAKE_PATH"/bin/qmake \
+                "$installBASE/qt-$QMAKE_PATH"/bin/qmake \
             ;
             do
-                if [ -f "$candidate" -a -x "$candidate" ]
+                if [ -f "$candidate" ] && [ -x "$candidate" ]
                 then
-                    foundExe=$candidate
+                    foundExe="$candidate"
                     break
                 fi
             done
@@ -464,13 +641,13 @@ findQMake()
                 foundExe="$(cd ${foundExe%/qmake} 2>/dev/null && pwd)/qmake"
             fi
             echo "Using qmake=$foundExe" 1>&2
-            echo $foundExe
+            echo "$foundExe"
             return 0
         else
             cat << NOT_FOUND 1>&2
 'qmake' not found under specified QMAKE_PATH
     QMAKE_PATH=$QMAKE_PATH
-reverting to using command from path
+reverting to using command from PATH
 NOT_FOUND
         fi
     fi
@@ -479,9 +656,9 @@ NOT_FOUND
     # Some systems have qmake-qt5 as well as qmake
     for candidate in qmake-qt5 qmake
     do
-        foundExe=$(command -v $candidate 2>/dev/null) && break
+        foundExe="$(command -v "$candidate" 2>/dev/null)" && break
     done
-    : ${foundExe:=false}
+    : "${foundExe:=false}"
 
     echo "Using qmake=$foundExe" 1>&2
     echo $foundExe
@@ -495,7 +672,7 @@ pkgconfigNewPrefix()
 {
     local dir="${1%%/}"
 
-    if [ -n "$dir" -a -d "$dir" ]
+    if [ -n "$dir" ] && [ -d "$dir" ]
     then
         # Require absolute path, but use logical (not physical) location
         [ "${dir}" != "${dir#/}" ] || dir=$(cd $dir 2>/dev/null && /bin/pwd -L)
@@ -521,7 +698,7 @@ pkgconfigNewPrefix()
         [ -d "$dir/$libdir" ] || continue
         for i in $dir/$libdir/*.pc
         do
-            if [ -f "$i" -a ! -L "$i" ]
+            if [ -f "$i" ] && [ ! -L "$i" ]
             then
                 nfiles="x$nfiles"
                 sed -i~ -e 's@^\(prefix=\).*$@\1'"$dir@" $i
@@ -543,7 +720,7 @@ pkgconfigAdjust()
 {
     local dir="${1%%/}"
 
-    if [ -n "$dir" -a -d "$dir" ]
+    if [ -n "$dir" ] && [ -d "$dir" ]
     then
         # Require absolute path, but use logical (not physical) location
         [ "${dir}" != "${dir#/}" ] || dir=$(cd $dir 2>/dev/null && /bin/pwd -L)
@@ -569,7 +746,7 @@ pkgconfigAdjust()
         [ -d "$dir/$libdir" ] || continue
         for i in $dir/$libdir/*.pc
         do
-            if [ -f "$i" -a ! -L "$i" ]
+            if [ -f "$i" ] && [ ! -L "$i" ]
             then
                 nfiles="x$nfiles"
                 sed -i~ \
@@ -670,7 +847,7 @@ applyPatch()
     if [ -r "$patch" ]
     then
     (
-        cd $dst || exit 1
+        cd "$dst" || exit
         if [ -f "$sentinel" ]
         then
             echo "patch for $pkg was already applied"

etc/tools/vtkFunctions

@@ -2,12 +2,13 @@
 # =========                 |
 # \\      /  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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/tools/vtkFunctions
@@ -65,7 +66,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 +121,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 +177,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 +194,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

makeADIOS

@@ -1,358 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
-#
-# Script
-#     makeADIOS
-#
-# Description
-#     Build script for ADIOS
-#
-# ----------------------------------------------
-# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
-#------------------------------------------------------------------------------
-# Run from third-party directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
-    echo "Error (${0##*/}) : not located in \$WM_THIRD_PARTY_DIR"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-#------------------------------------------------------------------------------
-
-# ADIOS version from OpenFOAM etc/config.sh file:
-_foamConfig ADIOS
-
-adiosPACKAGE=${adios_version:-adios-none}
-
-#------------------------------------------------------------------------------
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: ${0##*/} [OPTION] [adios-VERSION] [-- configure-options]
-options:
-  -gcc          Force use of gcc/g++
-  -cmake PATH   With cmake from the given path
-  -help
-
-* Build ADIOS
-      $adiosPACKAGE
-
-USAGE
-    exit 1
-}
-#------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags 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  ;;
-
-    -cmake)
-        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
-        CMAKE_PATH="${2%%/}"
-        shift
-        ;;
-    ADIOS-[1-9]* | adios-[1-9]* | ADIOS-git* | adios-git*)
-        adiosPACKAGE="${1%%/}"
-        ;;
-
-    *)
-        die "unknown option/argument: '$1'"
-        ;;
-    esac
-    shift
-done
-
-[ -n "$adiosPACKAGE" ] || die "The adios-VERSION was not specified"
-
-# Nothing to build
-if _foamIsNone "$adiosPACKAGE"
-then
-    echo "Using adios-none (skip ThirdParty build of ADIOS)"
-    exit 0
-elif _foamIsSystem "$adiosPACKAGE"
-then
-    echo "Using adios-system"
-    exit 0
-fi
-
-#------------------------------------------------------------------------------
-#
-# Build ADIOS
-#   ADIOS_SOURCE_DIR : location of the original sources
-#   ADIOS_ARCH_PATH  : installation directory
-
-ADIOS_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
-ADIOS_ARCH_PATH=$installBASE/$adiosPACKAGE
-
-: ${FOAM_MPI:=dummy}
-
-echo
-echo ========================================
-echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
-echo
-
-
-#
-# Manual adjustments to adios config
-#
-adjustADIOS()
-{
-    # Rename libraries according to FOAM_MPI
-    (
-        cd $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH || exit 1
-
-        if [ "$FOAM_MPI" != dummy ]
-        then
-            \mv -f libadios.a       libadios_$FOAM_MPI.a
-            \mv -f libadiosread.a   libadiosread_$FOAM_MPI.a
-        fi
-        \mv -f libadios_nompi.a     libadios_dummy.a
-        \mv -f libadiosread_nompi.a libadiosread_dummy.a
-
-        echo
-        echo "ADIOS library renamed to libadios_$FOAM_MPI"
-        echo
-    )
-
-    # We don't need/use XML things
-    \rm -f $ADIOS_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 \
-    ;
-    do
-        [ -f "$i" ] || {
-            echo "    no such file - '$i'"
-            continue
-        }
-        if sed -i -e 's|'"$WM_THIRD_PARTY_DIR"'|$WM_THIRD_PARTY_DIR|g' $i
-        then
-            echo "    '$i'"
-        else
-            echo "    problems with '$i'"
-        fi
-    done
-
-    # Adjust the config flags file:
-    # * Remove references to Fortran libraries (disabled in configure)
-    # * Remove references to deprecated version 1 API
-    # * Cleanup excessive whitespace
-    # * Handle renamed libraries:
-    #   - libadios       -> libadios_$FOAM_MPI
-    #   - libadios_nompi -> libadios_dummy
-    #
-    echo "Adjust library names for ADIOS"
-    for i in \
-        $ADIOS_ARCH_PATH/etc/adios_config.flags \
-    ;
-    do
-        [ -f "$i" ] || {
-            echo "    no such file - '$i'"
-            continue
-        }
-
-        if sed -i \
-            -e '/_FLIB=/d' \
-            -e '/_V1_INC=/d' \
-            -e 's|  *| |g' \
-            -e 's|\(-ladios[a-z]*_\)nompi |\1dummy |g' \
-            $i
-        then
-            echo "    '$i'"
-        else
-            echo "    problems with '$i'"
-        fi
-
-        if [ "$FOAM_MPI" != dummy ]
-        then
-            sed -i -e 's|\(-ladios[a-z]*\) |\1_'"$FOAM_MPI |g" $i || \
-            echo "    problems with '$i'"
-        fi
-    done
-}
-
-#
-# List ADIOS methods/configuration
-#
-listMethods()
-{
-    [ -f $ADIOS_ARCH_PATH/bin/adios_config ] || {
-        echo "Warning: no adios_config"
-        return 1
-    }
-
-    echo "==============="
-
-    # May have problems listing parallel methods (eg, transport key missing)
-    if $ADIOS_ARCH_PATH/bin/adios_config -m >/dev/null 2>&1
-    then
-        $ADIOS_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
-    fi || echo "Warning: could not list configured methods"
-    echo "==============="
-
-}
-
-
-# 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 ]
-then
-    echo "    ADIOS header in $ADIOS_ARCH_PATH/include"
-    ### echo "    ADIOS libs   in $FOAM_EXT_LIBBIN"           # dynamic
-    echo "    ADIOS libs   in $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
-    listMethods
-elif [ -z "$CMAKE_PATH" ]
-then
-    echo "Starting build: $adiosPACKAGE (using configure)"
-    echo
-    (
-        # Configuration options:
-        unset configOpt
-
-        # Add InfiniBand support
-        ibDir=/usr/local/ofed
-        if [ -d "$ibDir" -a "$FOAM_MPI" != dummy ]
-        then
-            configOpt="$configOpt --with-infiniband=$ibDir"
-        fi
-
-        # Transport layers
-        if [ -f /usr/include/bzlib.h ]
-        then
-            configOpt="$configOpt --with-bzip2"
-        fi
-
-        if [ -f /usr/include/zlib.h ]
-        then
-            configOpt="$configOpt --with-zlib"
-        fi
-
-        # Other types of support
-        ## configOpt="$configOpt --with-hdf5=..."
-        ## configOpt="$configOpt --with-lustre=..."
-        ## configOpt="$configOpt --enable-research-transports"
-
-        # Additional configure options
-        if [ "$1" = "--" ]
-        then
-            shift
-            configOpt="$configOpt $@"
-        fi
-
-        # End of configuration options
-        # ----------------------------
-        buildDIR=$buildBASE/$adiosPACKAGE
-
-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        [ -e Makefile ] && make distclean 2>/dev/null
-
-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
-
-        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
-
-        [ -f configure ] || {
-            echo "no configure for $adiosPACKAGE ... trying autogen"
-            ./autogen.sh
-        }
-
-        # May not work properly with FOAM_MPI = dummy
-        if [ "$FOAM_MPI" = dummy ]
-        then
-            configOpt="$configOpt --without-mpi"
-        else
-            CC=mpicc
-            CXX=mpicxx
-        fi
-
-        # Install into lib64/
-        cd $buildDIR && $ADIOS_SOURCE_DIR/configure \
-            --prefix=$ADIOS_ARCH_PATH \
-            --libdir=$ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
-            --disable-fortran \
-            --with-pic \
-            --without-fastbit \
-            $configOpt \
-        && make -j $WM_NCOMPPROCS all \
-        && make install \
-        && echo "Built: $adiosPACKAGE" \
-        && adjustADIOS \
-        && listMethods
-    ) || {
-        echo "Error building: $adiosPACKAGE"
-    }
-else
-    # CMake options often lag the configure ones
-    echo "Starting build: $adiosPACKAGE (using cmake)"
-    echo
-    (
-        buildDIR=$buildBASE/$adiosPACKAGE
-        cd $ADIOS_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        applyPatch $adiosPACKAGE $ADIOS_SOURCE_DIR
-
-        # Remove any existing build folder and recreate
-        rm -rf $ADIOS_ARCH_DIR
-        rm -rf $buildDIR 2>/dev/null
-        mkdir -p $buildDIR
-
-        # May not work properly with FOAM_MPI = dummy
-        if [ "$FOAM_MPI" = dummy ]
-        then
-            configOpt="$configOpt --without-mpi"
-        else
-            CC=mpicc
-            CXX=mpicxx
-        fi
-
-        cmake=$(findCMake)
-
-        # Install into lib64/
-        cd $buildDIR && $cmake \
-            -DCMAKE_INSTALL_PREFIX=$ADIOS_ARCH_PATH \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_FORTRAN=FALSE \
-            ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
-            $ADIOS_SOURCE_DIR \
-        && make -j $WM_NCOMPPROCS all \
-        && make install \
-        && echo "Built: $adiosPACKAGE" \
-        && adjustADIOS \
-        && listMethods
-    ) || {
-        echo "Error building: $adiosPACKAGE"
-    }
-fi
-
-# -----------------------------------------------------------------------------

makeAdios2

@@ -1,16 +1,17 @@
 #!/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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
-#     makeADIOS2
+#     makeAdios2
 #
 # Description
 #     Build script for ADIOS2
@@ -18,8 +19,39 @@
 # ----------------------------------------------
 # 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%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="adios2"
+    libName="libadios2"
+    libName2="libadios2_cxx11_mpi"
+    for lib in \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        "$dir/lib/$libName2$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName2$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
+    exit 2
+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 +59,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 +71,22 @@ usage() {
 
 usage: ${0##*/} [OPTION] [adios-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -cmake PATH   With cmake from the given path
   -help
 
 * Build ADIOS2
-      $adios2PACKAGE
+      $adiosPACKAGE
 
 USAGE
+    showDownloadHint ADIOS2
     exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler true     # Compiler info + flags for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure
+
+unset optForce
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -59,14 +95,16 @@ do
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     -cmake)
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
         CMAKE_PATH="${2%%/}"
         shift
         ;;
-    ADIOS2-[1-9]* | adios2-[1-9]* | ADIOS2-git* | adios2-git*)
-        adios2PACKAGE="${1%%/}"
+    ADIOS2-[0-9]* | ADIOS2-git* | ADIOS-[0-9]* | ADIOS-git* | \
+    adios2-[0-9]* | adios2-git* | adios-[0-9]* | adios-git*)
+        adiosPACKAGE="${1%%/}"
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -75,39 +113,40 @@ 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
 fi
 
+# Known build issues for mingw (various things)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ "$optForce" = true ]
+    then
+        echo "Warning: adios2 - known compilation issues with $WM_COMPILER"
+    else
+        echo "Skipping adios2 - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
 #------------------------------------------------------------------------------
 #
 # Build ADIOS
 #   ADIOS2_SOURCE_DIR : location of the original sources
 #   ADIOS2_ARCH_PATH  : installation directory
 
-ADIOS2_SOURCE_DIR=$sourceBASE/$adios2PACKAGE
-ADIOS2_ARCH_PATH=$installBASE/$adios2PACKAGE
-
-# Some hacked in value, for binding in ADIOS1 as well (for the reader)
-# Don't know if this is still needed
-if [ -n "$ADIOS1_ARCH_PATH" ]
-then
-    ADIOS1_ARCH_PATH=$installBASE/ADIOS-1.13.0
-fi
-if [ -d "$ADIOS1_ARCH_PATH" ]
-then
-    export ADIOS1_ROOT="$ADIOS1_ARCH_PATH"
-fi
-
+ADIOS2_SOURCE_DIR=$sourceBASE/$adiosPACKAGE
+ADIOS2_ARCH_PATH=$installBASE/$adiosPACKAGE
 
 : ${FOAM_MPI:=dummy}
 
@@ -116,26 +155,26 @@ 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 [ -z "$optForce" ] \
+&& [ -f "$ADIOS2_ARCH_PATH/include/adios2.h" ] \
+&& {
+    [ -r "$ADIOS2_ARCH_PATH/lib/libadios2$EXT_SO" ] \
+ || [ -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 already built : $ADIOS2_ARCH_PATH"
 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
@@ -143,10 +182,8 @@ 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
@@ -158,14 +195,15 @@ else
             -DCMAKE_INSTALL_PREFIX=$ADIOS2_ARCH_PATH \
             -DCMAKE_BUILD_TYPE=Release \
             -DADIOS2_USE_Fortran=FALSE \
-            -DADIOS1_USE_STATIC_LIBS=TRUE \
+            -DADIOS2_BUILD_EXAMPLES=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
 

makeCCMIO

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCCMIO
@@ -21,20 +21,13 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# 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
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : \$FOAM_EXT_LIBBIN not set"
-    echo "    Check your OpenFOAM environment and installation"
-    exit 1
-}
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 
@@ -69,6 +62,7 @@ options:
   prior to running this script.
 
 USAGE
+    showDownloadHint CCMIO
     exit 1
 }
 #------------------------------------------------------------------------------
@@ -79,12 +73,12 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -gcc)       useGccWmake ;;
 
     lib|libso)
         targetType="$1"
         ;;
-    libccmio-[1-9]*)
+    libccmio-[0-9]*)
         ccmioPACKAGE="${1%%/}"
         ;;
     *)
@@ -95,6 +89,7 @@ do
 done
 
 requireWMakeToolchain
+requireExtLibBin
 
 #------------------------------------------------------------------------------
 #
@@ -125,8 +120,8 @@ 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$EXT_SO

makeCGAL

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2012-2016 OpenFOAM Foundation
+#     Copyright (C) 2012-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCGAL
@@ -34,8 +34,11 @@
 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$EXT_SO" ]
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+# 2020-08-10: Needs reworking for header-only installations!
+    if [ -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"
@@ -43,8 +46,8 @@ then
         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$EXT_SO" ]
+            if [ -d "$root/include/boost" ] \
+            && [ -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"
@@ -58,7 +61,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
@@ -87,7 +91,8 @@ usage: ${0##*/} [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERS
 options:
   -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)
+  -no-lib       Configure CGAL for headers-only mode (default OpenFOAM >= 2006)
+  -with-lib     Configure CGAL with library
   -toolset=NAME Use named toolset in bootstrap
   -system       Use system versions for boost/gmp/mpfr
   -help
@@ -106,12 +111,15 @@ simply specify a 'system' version. For example,
 Use gmp-none to disable use of gmp/mpfr (eg, not available)
 
 USAGE
+    showDownloadHint BOOST
+    showDownloadHint CGAL
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optHeadersOnly optToolset
+unset optForce optHeadersOnly optToolset
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -119,6 +127,7 @@ do
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     -cmake)
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
@@ -126,7 +135,7 @@ do
         shift
         ;;
     -toolset=*)
-        optToolset="${1*=}"
+        optToolset="${1#*=}"
         ;;
     -sys*)
         gmpPACKAGE="gmp-system"
@@ -137,11 +146,14 @@ do
     -no-lib)
         optHeadersOnly=true
         ;;
-    gmp-[4-9]* | gmp-system | gmp-none)
+    -with-lib)
+        optHeadersOnly=false
+        ;;
+    gmp-[0-9]* | gmp-system | gmp-none)
         gmpPACKAGE="${1%%/}"
         unset GMP_ARCH_PATH
         ;;
-    mpfr-[2-9]* | mpfr-system | mpfr-none)
+    mpfr-[0-9]* | mpfr-system | mpfr-none)
         mpfrPACKAGE="${1%%/}"
         unset MPFR_ARCH_PATH
         ;;
@@ -163,17 +175,36 @@ done
 [ -n "$cgalPACKAGE" ] || die "The cgal-VERSION was not specified"
 
 # Nothing to build
-if _foamIsNone $boostPACKAGE
+if _foamIsNone "$boostPACKAGE"
 then
     echo "Using boost-none (skip ThirdParty build of BOOST/CGAL)"
     exit 0
 fi
-if _foamIsNone $cgalPACKAGE
+if _foamIsNone "$cgalPACKAGE"
 then
     echo "Using cgal-none (skip ThirdParty build of CGAL)"
     exit 0
 fi
 
+
+# For OpenFOAM 1912 and earlier, no predefined default.
+# Force headers-only *after* starting with OpenFOAM-v2006
+if [ -z "$optHeadersOnly" ] && foamVersion=$(wmake -version 2>/dev/null)
+then
+    if [ "${foamVersion:-0}" -gt 1912 ]
+    then
+        optHeadersOnly=true
+    fi
+fi
+
+# Headers-only - might be able to avoid gmp/mpfr?
+## if [ "${optHeadersOnly:-false}" = true ]
+## then
+##     gmpPACKAGE=none
+##     mpfrPACKAGE=none
+##     unset GMP_ARCH_PATH MPFR_ARCH_PATH
+## fi
+
 #------------------------------------------------------------------------------
 #
 # Build Boost
@@ -185,13 +216,13 @@ fi
 #   BOOST_ARCH_PATH  : installation directory
 #   BOOST_SOURCE_DIR : location of the original sources
 
-BOOST_SOURCE_DIR=$sourceBASE/$boostPACKAGE
-: ${BOOST_ARCH_PATH:=$installBASE/$boostPACKAGE}    # Fallback
+BOOST_SOURCE_DIR="$sourceBASE/$boostPACKAGE"
+: "${BOOST_ARCH_PATH:=$installBASE/$boostPACKAGE}"
 
 boostInc="$BOOST_ARCH_PATH/include"
 boostLib="$BOOST_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
 
-if _foamIsSystem $boostPACKAGE
+if _foamIsSystem "$boostPACKAGE"
 then
     echo "Using boost-system (skip ThirdParty build of BOOST)"
 
@@ -199,9 +230,9 @@ then
 
     if [ -d "$boostInc" ]
     then
-        if BOOST_ARCH_PATH=$(cd $BOOST_ARCH_PATH 2>/dev/null && pwd -P)
+        if BOOST_ARCH_PATH=$(cd "$BOOST_ARCH_PATH" 2>/dev/null && pwd -P)
         then
-            boostPACKAGE=${BOOST_ARCH_PATH##*/}
+            boostPACKAGE="${BOOST_ARCH_PATH##*/}"
         else
             echo "ERROR: bad path for BOOST_ARCH_PATH"
             echo "stopping build"
@@ -216,16 +247,17 @@ then
     fi
 
     # Use lib/ when lib64/ does not exist
-    [ ! -d "$boostLib" -a -d "$libdir" ] && boostLib="$libdir"
+    [ -d "$libdir" -a ! -d "$boostLib" ] && boostLib="$libdir"
 
-elif [ -f "$boostInc/boost/version.hpp" ]
+elif [ -z "$optForce" ] \
+  && [ -f "$boostInc/boost/version.hpp" ]
 then
     echo "Using $boostPACKAGE"
 
     libdir="$BOOST_ARCH_PATH/lib"
 
     # Use lib when lib64 does not exist
-    [ ! -d "$boostLib" -a -d "$libdir" ] && boostLib="$libdir"
+    [ -d "$libdir" -a ! -d "$boostLib" ] && boostLib="$libdir"
 
 else
     echo "Starting build: $boostPACKAGE"
@@ -233,14 +265,14 @@ else
     # Absolute path for --libdir
 
     (
+        # Write user-config.jam into source directory
+        cd "$BOOST_SOURCE_DIR" || exit
+        export GIT_DIR="$PWD/.git" # Mask seeing our own git-repo
+
         # Configuration options:
         unset buildOpt
 
-        cd $BOOST_SOURCE_DIR || exit 1
-        export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
-
-        rm -rf $BOOST_ARCH_PATH
-
+        # Compiler-specific adjustments
         case "$WM_COMPILER" in
         (Arm*)
             # Toolset for bootstrap
@@ -266,14 +298,27 @@ else
 
         (*)
             # Toolset for bootstrap and build
-            [ -n "$optToolset" ] || optToolset="$(whichCC)"
+            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
 
+        # End of configuration options
+        # ----------------------------
+
+        rm -rf "$BOOST_ARCH_PATH"
+
         ./bootstrap.sh \
-            --prefix=$BOOST_ARCH_PATH \
-            --libdir=$boostLib \
+            --prefix="$BOOST_ARCH_PATH" \
+            --libdir="$boostLib" \
             --with-libraries=thread \
             --with-libraries=system \
             --with-toolset="$optToolset" \
@@ -285,8 +330,9 @@ else
     }
 fi
 
+
 # Nothing left to build
-if _foamIsSystem $cgalPACKAGE
+if _foamIsSystem "$cgalPACKAGE"
 then
     echo "Using cgal-system (skip ThirdParty build of CGAL)"
     exit 0
@@ -318,28 +364,28 @@ fi
 #   CGAL_BUILD_DIR  : location of the build
 #   CGAL_ARCH_PATH  : installation directory
 
-CGAL_SOURCE_DIR=$sourceBASE/$cgalPACKAGE
-CGAL_BUILD_DIR=$buildBASE/$cgalPACKAGE
-: ${CGAL_ARCH_PATH:=$installBASE/$cgalPACKAGE}      # Fallback
+CGAL_SOURCE_DIR="$sourceBASE/$cgalPACKAGE"
+CGAL_BUILD_DIR="$buildBASE/$cgalPACKAGE"
+: "${CGAL_ARCH_PATH:=$installBASE/$cgalPACKAGE}"
 
 # gmp/mpfr are installed without compiler name
-mpfrBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
+mpfrBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH"
 
 # Enable/disable gmp/mpfr together
-if _foamIsNone $gmpPACKAGE || _foamIsNone $mpfrPACKAGE
+if _foamIsNone "$gmpPACKAGE" || _foamIsNone "$mpfrPACKAGE"
 then
     GMP_ARCH_PATH=none
     MPFR_ARCH_PATH=none
-elif _foamIsSystem $gmpPACKAGE || _foamIsSystem $mpfrPACKAGE
+elif _foamIsSystem "$gmpPACKAGE" || _foamIsSystem "$mpfrPACKAGE"
 then
     # May really be system, but could also by a central installation
     # Ensure everything is accurately recorded. Resolve paths etc.
 
     if [ -d "$GMP_ARCH_PATH" ]
     then
-        if GMP_ARCH_PATH=$(cd $GMP_ARCH_PATH 2>/dev/null && pwd -P)
+        if GMP_ARCH_PATH=$(cd "$GMP_ARCH_PATH" 2>/dev/null && pwd -P)
         then
-            gmpPACKAGE=${GMP_ARCH_PATH##*/}
+            gmpPACKAGE="${GMP_ARCH_PATH##*/}"
         else
             echo "ERROR: bad path for GMP_ARCH_PATH"
             echo "stopping build"
@@ -351,9 +397,9 @@ then
 
     if [ -d "$MPFR_ARCH_PATH" ]
     then
-        if MPFR_ARCH_PATH=$(cd $MPFR_ARCH_PATH 2>/dev/null && pwd -P)
+        if MPFR_ARCH_PATH=$(cd "$MPFR_ARCH_PATH" 2>/dev/null && pwd -P)
         then
-            mpfrPACKAGE=${MPFR_ARCH_PATH##*/}
+            mpfrPACKAGE="${MPFR_ARCH_PATH##*/}"
         else
             echo "ERROR: bad path for MPFR_ARCH_PATH"
             echo "stopping build"
@@ -363,8 +409,8 @@ then
         MPFR_ARCH_PATH=system
     fi
 else
-    GMP_ARCH_PATH=$mpfrBASE/$gmpPACKAGE
-    MPFR_ARCH_PATH=$mpfrBASE/$mpfrPACKAGE
+    GMP_ARCH_PATH="$mpfrBASE/$gmpPACKAGE"
+    MPFR_ARCH_PATH="$mpfrBASE/$mpfrPACKAGE"
 fi
 
 #------------------------------------------------------------------------------
@@ -400,7 +446,7 @@ BOOST_VERSION=$BOOST_VERSION
 
 CGAL_lib=lib$WM_COMPILER_LIB_ARCH
 BOOST_lib=lib$WM_COMPILER_LIB_ARCH
-CGAL_HEADER_ONLY=${optHeadersOnly:-false}
+CGAL_HEADER_ONLY=${optHeadersOnly:-default}
 BUILD_INFO
 }
 
@@ -445,25 +491,25 @@ cgalIsCurrent()
 }
 
 
-if cgalIsCurrent
+if [ -z "$optForce" ] \
+ && cgalIsCurrent
 then
     echo "    ${CGAL_ARCH_PATH##*/} build appears to be up-to-date - skipping"
     echo
     exit 0
-fi
-
+else
 (
     # Remove any existing build folder and recreate
-    if [ -d $CGAL_BUILD_DIR ]
+    if [ -d "$CGAL_BUILD_DIR" ]
     then
         echo "removing old build directory"
         echo "    $CGAL_BUILD_DIR"
-        rm -rf $CGAL_BUILD_DIR
+        rm -rf "$CGAL_BUILD_DIR"
     fi
-    mkdir -p $CGAL_BUILD_DIR
+    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 "----"
@@ -474,7 +520,7 @@ fi
 
 
     # See http://doc.cgal.org/latest/Manual/installation.html
-    if _foamIsSystem $boostPACKAGE
+    if _foamIsSystem "$boostPACKAGE"
     then
         # Tagged as 'system' but could actually point to a central location
         if [ -d "$BOOST_ARCH_PATH/include" ]
@@ -502,10 +548,10 @@ CMAKE_OPTIONS
 )
     fi
 
-    if _foamIsSystem $GMP_ARCH_PATH
+    if _foamIsSystem "$GMP_ARCH_PATH"
     then
         echo "    gmp            : system"
-    elif _foamIsNone $GMP_ARCH_PATH
+    elif _foamIsNone "$GMP_ARCH_PATH"
     then
         echo "    gmp            : disabled"
         configGmp="-DCGAL_DISABLE_GMP=TRUE"  # Also used for mpfr
@@ -533,10 +579,10 @@ CMAKE_OPTIONS
         echo "    system         : gmp (did not find $GMP_ARCH_PATH)"
     fi
 
-    if _foamIsSystem $MPFR_ARCH_PATH
+    if _foamIsSystem "$MPFR_ARCH_PATH"
     then
         echo "    mpfr           : system"
-    elif _foamIsNone $MPFR_ARCH_PATH
+    elif _foamIsNone "$MPFR_ARCH_PATH"
     then
         echo "    mpfr           : disabled"
         configGmp="-DCGAL_DISABLE_GMP=TRUE"  # Also used for mpfr
@@ -568,6 +614,7 @@ CMAKE_OPTIONS
 
     unset cmakeDefs
 
+    # Compiler-specific adjustments
     case "$WM_COMPILER" in
     (Mingw*)
         cmakeDefs="$cmakeDefs -DCMAKE_SYSTEM_NAME=Windows"
@@ -576,6 +623,13 @@ CMAKE_OPTIONS
         ;;
     esac
 
+    # Headers/library decision
+    case "$optHeadersOnly" in
+    (true | false)
+        cmakeDefs="$cmakeDefs -DCGAL_HEADER_ONLY=${optHeadersOnly}"
+        ;;
+    esac
+
     # For CGAL < 4.9, for installation into lib64/, not lib/
     # Name only (not path) for CGAL_INSTALL_LIB_DIR
     echo "----"
@@ -588,7 +642,6 @@ CMAKE_OPTIONS
         -DWITH_CGAL_ImageIO=OFF \
         -DWITH_CGAL_Qt5=OFF \
         $cmakeDefs \
-        ${optHeadersOnly:+-DCGAL_HEADER_ONLY=TRUE} \
         $configBoost $configGmp $configMpfr \
         ${WM_QUIET:+-DCMAKE_RULE_MESSAGES=OFF} \
         $CGAL_SOURCE_DIR \
@@ -616,5 +669,6 @@ CMAKE_OPTIONS
 
     echo "Done CGAL"
 )
+fi
 
 #------------------------------------------------------------------------------

makeCmake

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeCmake
@@ -25,7 +25,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
@@ -44,6 +45,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] cmake-VERSION
 options:
+  -force        Force compilation, even if binary already exists
   -gcc          Force use of gcc/g++
   -link         Create additional symlink as 'cmake-system'
   -help
@@ -52,12 +54,14 @@ options:
       ${cmakePACKAGE:-'unspecified'}
 
 USAGE
+    showDownloadHint CMAKE
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optLink
+unset optForce optLink
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -65,11 +69,10 @@ do
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
+    -link)      optLink=true ;;
 
-    -link)
-        optLink=true
-        ;;
-    cmake-[1-9]*)
+    cmake-[0-9]*)
         cmakePACKAGE="${1%%/}"
         ;;
     *)
@@ -95,7 +98,9 @@ fi
 CMAKE_SOURCE_DIR=$sourceBASE/$cmakePACKAGE
 CMAKE_ARCH_PATH=$installBASE/$cmakePACKAGE
 
-if [ -d "$CMAKE_ARCH_PATH" -a -r "$CMAKE_ARCH_PATH/bin/cmake" ]
+if [ -z "$optForce" ] \
+&& [ -d "$CMAKE_ARCH_PATH" ] \
+&& [ -r "$CMAKE_ARCH_PATH/bin/cmake" ]
 then
     echo "Already built: $cmakePACKAGE"
 else
@@ -103,8 +108,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
@@ -122,10 +127,10 @@ else
     }
 fi
 
-if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ]
+if [ "$optLink" = true ] && [ -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
@@ -133,7 +138,7 @@ then
     then
         exit 2
     fi
-    ln -svf $cmakePACKAGE cmake-system
+    ln -svf "$cmakePACKAGE" cmake-system
 )
 fi
 

makeFFTW

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeFFTW
@@ -26,19 +27,29 @@
 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$EXT_SO" ]
-    then
-        echo "    fftw include: $dir/include"
-        echo "    fftw library: $dir/lib$WM_COMPILER_LIB_ARCH"
-        exit 0
-    else
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="fftw"
+    libName="libfftw3"
+    for lib in \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
+    exit 2
 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
@@ -49,7 +60,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 # FFTW version from OpenFOAM etc/config.sh file:
 _foamConfig FFTW
 
-fftwPACKAGE=${fftw_version:-fftw-system}
+fftwPACKAGE="${fftw_version:-fftw-system}"
 
 #------------------------------------------------------------------------------
 usage() {
@@ -59,6 +70,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [fftw-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -help
 
@@ -66,11 +78,14 @@ options:
       ${fftwPACKAGE:-'unspecified FFTW version'}
 
 USAGE
+    showDownloadHint FFTW
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -79,6 +94,7 @@ do
     --) break;; # Extra configure options (leave on $@ for later detection)
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     fftw-[0-9]* | fftw_[0-9]* | fftw-system )
         fftwPACKAGE="${1%%/}"
@@ -115,12 +131,17 @@ fi
 #   FFTW_SOURCE_DIR : location of the original sources
 #   FFTW_ARCH_PATH  : installation directory
 
-FFTW_SOURCE_DIR=$sourceBASE/$fftwPACKAGE
-FFTW_ARCH_PATH=$installBASE/$fftwPACKAGE
+FFTW_SOURCE_DIR="$sourceBASE/$fftwPACKAGE"
+FFTW_ARCH_PATH="$installBASE/$fftwPACKAGE"
 
-if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+    [ -r "$FFTW_ARCH_PATH/lib/libfftw3$EXT_SO" ] \
+ || [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ] \
+ || [ -r "$FFTW_ARCH_PATH/bin/libfftw3-3$EXT_SO" ]  # Windows
+}
 then
-    echo "Already has FFTW shared library"
+    echo "FFTW already built : $FFTW_ARCH_PATH"
 else
     echo "Starting build: FFTW ($fftwPACKAGE)"
     echo
@@ -129,6 +150,21 @@ else
         # Configuration options:
         unset configOpt
 
+        # Compiler-specific adjustments
+        case "$WM_COMPILER" in
+        (Mingw*)
+            # Cross-compiling
+            # See http://www.fftw.org/install/windows.html
+            configOpt="
+  --host=x86_64-w64-mingw32
+  --with-our-malloc
+  --enable-threads --with-combined-threads
+  --enable-sse2
+  --with-incoming-stack-boundary=2
+"
+            ;;
+        esac
+
         # Additional configure options
         if [ "$1" = "--" ]
         then
@@ -138,20 +174,20 @@ else
 
         # End of configuration options
         # ----------------------------
-        buildDIR=$buildBASE/$fftwPACKAGE
+        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
-        mkdir -p $buildDIR
-        cd $buildDIR
+        rm -rf "$FFTW_ARCH_PATH"
+        rm -rf "$buildDIR"
+        mkdir -p "$buildDIR"
+        cd "$buildDIR"
 
         set -x
-        $FFTW_SOURCE_DIR/configure \
-            --prefix=$FFTW_ARCH_PATH \
-            --libdir=$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        "$FFTW_SOURCE_DIR"/configure \
+            --prefix="$FFTW_ARCH_PATH" \
+            --libdir="$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" \
             --enable-shared --disable-static \
             --disable-fortran \
             $configOpt \
@@ -159,7 +195,7 @@ else
         && make -j $WM_NCOMPPROCS \
         && make install \
         && echo "Built $fftwPACKAGE" \
-        && pkgconfigAdjust $FFTW_ARCH_PATH
+        && pkgconfigAdjust "$FFTW_ARCH_PATH"
     ) || {
         echo "Error building: FFTW"
         exit 1

makeGcc

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  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) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeGcc
@@ -34,7 +34,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,6 +64,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)
@@ -76,9 +78,15 @@ options:
       ${gccPACKAGE:-'unspecified GCC version'}
 
 USAGE
+    showDownloadHint GCC
+    showDownloadHint GMP
+    showDownloadHint MPFR
+    showDownloadHint MPC
     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
@@ -94,6 +102,9 @@ do
         export CXX=clang++
         ;;
 
+    -m32 | -m64)
+        optArch="${1#*m}"
+        ;;
     -multi*)
         optMultilib=enable
         ;;
@@ -109,20 +120,23 @@ do
         mpcPACKAGE="mpc-system"
         unset GMP_ARCH_PATH MPFR_ARCH_PATH
         ;;
-    gmp-[4-9]* | gmp-system)
+    gmp-[0-9]* | gmp-system)
         gmpPACKAGE="${1%%/}"
         unset GMP_ARCH_PATH
         ;;
-    mpfr-[2-9]* | mpfr-system)
+    mpfr-[0-9]* | mpfr-system)
         mpfrPACKAGE="${1%%/}"
         unset MPFR_ARCH_PATH
         ;;
     mpc-[0-9]* | mpc-system)
         mpcPACKAGE="${1%%/}"
         ;;
-    gcc-[4-9]* | gcc-system)
+    gcc-[0-9]* | gcc-system)
         gccPACKAGE="${1%%/}"
         ;;
+    [0-9]*)
+        gccPACKAGE="gcc-${1%%/}"
+        ;;
     *)
         die "unknown option/argument: '$1'"
         ;;
@@ -136,6 +150,7 @@ cat<<SUMMARY
 GCC configuration
 ------------------
     GCC     = $gccPACKAGE
+    ABI     = $optArch
     GMP     = $gmpPACKAGE
     MPFR    = $mpfrPACKAGE
     MPC     = $mpcPACKAGE
@@ -144,17 +159,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
@@ -195,8 +199,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
@@ -204,7 +208,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 \
@@ -234,7 +238,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
@@ -247,8 +251,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
@@ -260,7 +264,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 \
@@ -290,7 +294,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
@@ -303,8 +307,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
@@ -312,7 +316,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 \
@@ -346,7 +350,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
@@ -359,8 +363,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

makeGperftools

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2012 OpenFOAM Foundation
+#     Copyright (C) 2012 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeGperftools
@@ -22,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
@@ -50,6 +51,7 @@ options:
       $gperftoolsPACKAGE
 
 USAGE
+    showDownloadHint GPERFTOOLS
     exit 1
 }
 #------------------------------------------------------------------------------
@@ -102,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

makeHYPRE

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeHYPRE
@@ -19,51 +20,19 @@
 # ----------------------------------------------
 # 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%/}" # <- HYPRE_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libhypre$EXT_SO \
-            $dir/lib/libhypre.a \
-            $dir/lib/libhypre$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    hypre include: $dir/include"
-                echo "    hypre library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
-    exit 2
-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
 }
-[ -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 hypre
 
-hyprePACKAGE=${hypre_version:-hypre-system}
+hyprePACKAGE="${hypre_version:-hypre-system}"
 targetType=libso
 
 #------------------------------------------------------------------------------
@@ -72,8 +41,9 @@ usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION]
+usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -help
 
@@ -81,24 +51,29 @@ options:
       ${hyprePACKAGE:-'unspecified hypre version'}
 
 USAGE
+    showDownloadHint HYPRE
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # 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  ;;
+    -force)     optForce=true ;;
 
     lib|libso)
         targetType="$1"
         ;;
 
-    hypre-[0-9]*)
+    hypre-[0-9]* | hypre-git)
         hyprePACKAGE="${1%%/}"
         unset HYPRE_ARCH_PATH  # Avoid inconsistency
         ;;
@@ -112,11 +87,11 @@ done
 [ -n "$hyprePACKAGE" ] || die "The hypre-VERSION was not specified"
 
 # Nothing to build
-if _foamIsNone $hyprePACKAGE
+if _foamIsNone "$hyprePACKAGE"
 then
     echo "Using hypre-none (skip ThirdParty build of HYPRE)"
     exit 0
-elif _foamIsSystem $hyprePACKAGE
+elif _foamIsSystem "$hyprePACKAGE"
 then
     echo "Using hypre-system"
     exit 0
@@ -129,11 +104,12 @@ fi
 #   HYPRE_ARCH_PATH  : installation directory
 #   HYPRE_SOURCE_DIR : location of the original sources
 
-HYPRE_SOURCE_DIR=$sourceBASE/$hyprePACKAGE
+HYPRE_SOURCE_DIR="$sourceBASE/$hyprePACKAGE"
 : "${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$hyprePACKAGE}"
 
 [ -d "$HYPRE_SOURCE_DIR" ] || {
     echo "Missing sources: '$hyprePACKAGE'"
+    showDownloadHint HYPRE
     exit 1
 }
 
@@ -145,17 +121,24 @@ CXX="$(whichMpicxx)"
 echo "Starting build: $hyprePACKAGE ($targetType)"
 echo
 (
-    # Configuration options:
+    # Configuration options
     unset configOpt
 
-    cd $HYPRE_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    # Additional configure options
+    if [ "$1" = "--" ]
+    then
+        shift
+        configOpt="$configOpt $@"
+    fi
 
-    rm -rf $HYPRE_ARCH_PATH
+    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
 
     ./configure \
-       --prefix=$HYPRE_ARCH_PATH \
+       --prefix="$HYPRE_ARCH_PATH" \
        --disable-fortran \
        --enable-shared \
        $configOpt \

makeKAHIP

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeKAHIP
@@ -26,39 +27,36 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- KAHIP_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libkahip$EXT_SO \
-            $dir/lib/libkahip.a \
-            $dir/lib/libkahip$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    kahip include: $dir/include"
-                echo "    kahip library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="kahip"
+    libName="libkahip"
+    for lib in \
+        "$FOAM_EXT_LIBBIN/$libName$EXT_SO" \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
     exit 2
 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
 }
-[ -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 kahip
@@ -76,15 +74,21 @@ usage()
 Usage: ${0##*/} [OPTION] [lib|libso] [kahip-VERSION]
 options:
   -gcc          Force use of gcc/g++
+  -force        Force build attempt (mingw)
+  -cmake PATH   With cmake from the given path
   -help
 
 * Compile KaHIP
       $kahipPACKAGE
 
 USAGE
+    showDownloadHint KAHIP
     exit 1
 }
 #------------------------------------------------------------------------------
+exportCompiler minimal  # Minimal compiler info for CMake/configure
+
+unset optForce
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -92,13 +96,20 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -gcc)       useGccWmake ;;
+    -force)     optForce=true ;;
+
+    -cmake)
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        CMAKE_PATH="${2%%/}"
+        shift
+        ;;
 
     lib|libso)
         targetType="$1"
         ;;
 
-    kahip-[1-9]* | kahip-git | KaHIP_* |  KaHIP-[1-9]*)
+    kahip-[0-9]* | kahip-git | KaHIP_* |  KaHIP-[0-9]*)
         kahipPACKAGE="${1%%/}"
         unset KAHIP_ARCH_PATH  # Avoid inconsistency
         ;;
@@ -122,7 +133,21 @@ then
     exit 0
 fi
 
+# Known build issues for mingw (uses some non-portable headers)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ "$optForce" = true ]
+    then
+        echo "Warning: kahip - known compilation issues with $WM_COMPILER"
+    else
+        echo "Skipping kahip - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
 requireWMakeToolchain
+requireExtLibBin
 
 #------------------------------------------------------------------------------
 #
@@ -136,7 +161,8 @@ KAHIP_ARCH_PATH=$installBASE/$kahipPACKAGE
 
 [ -d "$KAHIP_SOURCE_DIR" ] || {
     echo "Missing sources: '$kahipPACKAGE'"
-    exit 1
+    showDownloadHint KAHIP
+    exit 2
 }
 
 #
@@ -158,20 +184,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$EXT_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 +230,6 @@ echo
     echo "Error building: kahip"
     exit 1
 }
-
+fi
 
 #------------------------------------------------------------------------------

makeLLVM

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeLLVM
@@ -40,7 +40,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
@@ -72,6 +73,7 @@ options:
       ${llvmPACKAGE:-'unspecified LLVM version'}
 
 USAGE
+    showDownloadHint LLVM
     exit 1
 }
 #------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ do
     llvm-[0-9]* | llvm-svn*)
         llvmPACKAGE="${1%%/}"
         ;;
-    [1-9]*)
+    [0-9]*)
         llvmPACKAGE="llvm-${1%%/}"
         ;;
     *)
@@ -135,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
@@ -146,7 +148,7 @@ then
         set -x
         $LLVM_SOURCE_DIR/configure \
             --prefix=$LLVM_ARCH_PATH \
-            --with-gcc-toolchain=$(which gcc | sed s%/bin/gcc%%) \
+            --with-gcc-toolchain="$(command -v gcc | sed 's%/bin/gcc%%')" \
             --enable-optimized \
             --enable-shared \
         && set +x \
@@ -167,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

makeMETIS

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMETIS
@@ -26,39 +27,36 @@
 if [ "$1" = "-test" ]
 then
     [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
-    dir="${2%/}" # <- METIS_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libmetis$EXT_SO \
-            $dir/lib/libmetis.a \
-            $dir/lib/libmetis$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    metis include: $dir/include"
-                echo "    metis library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+    [ -d "$dir/include" ] || exit 2
+
+    package="metis"
+    libName="libmetis"
+    for lib in \
+        "$FOAM_EXT_LIBBIN/$libName$EXT_SO" \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "    $package include: $dir/include"
+            echo "    $package library: ${lib%/*}"
+            exit 0
+        fi
+    done
     exit 2
 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
 }
-[ -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 metis
@@ -81,6 +79,7 @@ options:
       ${metisPACKAGE:-'unspecified metis version'}
 
 USAGE
+    showDownloadHint METIS
     exit 1
 }
 #------------------------------------------------------------------------------
@@ -122,6 +121,19 @@ then
     exit 0
 fi
 
+# Known build issues for mingw (various things)
+case "$WM_COMPILER" in
+(Mingw*)
+    if :
+    then
+        echo "Skipping metis - known compilation issues with $WM_COMPILER"
+        exit 0
+    fi
+    ;;
+esac
+
+requireExtLibBin
+
 #------------------------------------------------------------------------------
 #
 # Build METIS
@@ -134,7 +146,8 @@ METIS_SOURCE_DIR=$sourceBASE/$metisPACKAGE
 
 [ -d "$METIS_SOURCE_DIR" ] || {
     echo "Missing sources: '$metisPACKAGE'"
-    exit 1
+    showDownloadHint METIS
+    exit 2
 }
 
 #
@@ -164,8 +177,8 @@ 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$EXT_SO

makeMGridGen

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMGridGen
@@ -20,6 +21,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,6 +44,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [mgridgen-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -help
 
@@ -49,12 +52,14 @@ options:
       $mgridgenPACKAGE
 
 USAGE
+    # showDownloadHint GRIDGEN
     exit 1
 }
-
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -62,8 +67,9 @@ do
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
-    mgridgen-[1-9]* | MGridGen-[1-9]* | parmgridgen-[1-9]* | ParMGridGen-[1-9]*)
+    mgridgen-[0-9]* | MGridGen-[0-9]* | parmgridgen-[0-9]* | ParMGridGen-[0-9]*)
         mgridgenPACKAGE="${1%%/}"
         ;;
     *)
@@ -131,15 +137,17 @@ install()
 # Needs future adjustment
 # - for shared library
 # - for mpi-specific library locations
-if [ -f $MGRIDGEN_ARCH_PATH/include/mgridgen.h \
-  -a -r $MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmgrid.a ]
+if [ -z "$optForce" ] \
+&& [ -f "$MGRIDGEN_ARCH_PATH/include/mgridgen.h" ] \
+&& {
+     [ -r "$MGRIDGEN_ARCH_PATH/lib/libmgrid.a" ] \
+  || [ -r "$MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmgrid.a" ]
+}
 then
-    echo "    MGridGen header in $MGRIDGEN_ARCH_PATH/include"
-    echo "    MGridGen libs   in $MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
-    echo
+    echo "    MGridGen already built : $MGRIDGEN_ARCH_PATH"
 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
@@ -164,6 +172,7 @@ else
     && echo "Built: $mgridgenPACKAGE"
 ) || {
     echo "Error building: $mgridgenPACKAGE"
+    exit 1
 }
 fi
 

makeMPICH

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMPICH
@@ -26,23 +27,30 @@
 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
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="mpich"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package shared library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 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,6 +78,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [mpich-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -help
 
@@ -77,11 +86,14 @@ options:
       ${mpiPACKAGE:-'unspecified mpich version'}
 
 USAGE
+    showDownloadHint MPICH
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -90,6 +102,7 @@ do
     --) break;; # Extra configure options (leave on $@ for later detection)
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     mpich*)
         mpiPACKAGE="${1%%/}"
@@ -125,12 +138,20 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi$EXT_SO" ] \
+  || [ -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" ]
+    echo "Already has shared library: $MPI_ARCH_PATH"
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi.a" ] \
+  || [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
-    echo "Already has static library"
+    echo "Already has static library: $MPI_ARCH_PATH"
 else
     echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
     echo
@@ -151,8 +172,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

makeMVAPICH

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2019-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMVAPICH2
@@ -26,23 +27,30 @@
 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
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="mvapich"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 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,6 +78,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [mvapich2-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -help
 
@@ -81,11 +90,14 @@ The additional configure-options could include, for example,
     ${0##*/} -- --disable-mcast
 
 USAGE
+    showDownloadHint MVAPICH
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -94,6 +106,7 @@ do
     --) break;; # Extra configure options (leave on $@ for later detection)
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
     mvapich*)
         mpiPACKAGE="${1%%/}"
@@ -129,12 +142,20 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi$EXT_SO" ] \
+  || [ -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" ]
+    echo "Already has shared library: $MPI_ARCH_PATH"
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi.a" ] \
+  || [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
-    echo "Already has static library"
+    echo "Already has static library: $MPI_ARCH_PATH"
 else
     echo "Starting build: $WM_MPLIB ($mpiPACKAGE)"
     echo
@@ -155,8 +176,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

makeMesa

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeMesa
@@ -26,7 +27,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
@@ -57,6 +59,7 @@ options:
       ${mesaPACKAGE:-'unspecified MESA version'}
 
 USAGE
+    showDownloadHint MESA
     exit 1
 }
 #------------------------------------------------------------------------------
@@ -209,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

makeOPENMPI

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2017-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeOPENMPI
@@ -26,23 +27,30 @@
 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 openmpi shared library (${dir##*/})"
-        exit 0
-    elif [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
-    then
-        echo "    Have openmpi static library (${dir##*/})"
-        exit 0
-    else
-        echo "No openmpi libraries found: ${dir:-not-specified}"
-        exit 2
-    fi
+    dir="${2%/}" # <- *_ARCH_PATH
+
+    package="openmpi"
+    libName="libmpi"
+    for lib in \
+        "$dir/lib/$libName.a" \
+        "$dir/lib/$libName$EXT_SO" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName.a" \
+        "$dir/lib$WM_COMPILER_LIB_ARCH/$libName$EXT_SO" \
+        ;
+    do
+        if [ -r "$lib" ]
+        then
+            echo "Have $package library (${dir##*/})"
+            exit 0
+        fi
+    done
+    echo "No $package libraries found: ${dir:-not-specified}"
+    exit 2
 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,6 +78,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [openmpi-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
   -memcheck     Configure with --enable-memcheck (requires valgrind.h)
   -threaded     Configure with --enable-mpi-thread-multiple
@@ -80,12 +89,13 @@ options:
       ${mpiPACKAGE:-'unspecified openmpi version'}
 
 USAGE
+    showDownloadHint OPENMPI
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
-unset optMemchecker optThreaded
+unset optForce optMemchecker optThreaded
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -95,6 +105,7 @@ do
     --) break;; # Extra configure options (leave on $@ for later detection)
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
     -memcheck*) optMemchecker=true ;;
     -thread*)   optThreaded=enable ;;
     -no-thread*) optThreaded=disable ;;
@@ -133,10 +144,18 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE
 
-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi$EXT_SO" ] \
+  || [ -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" ]
+elif [ -z "$optForce" ] \
+&& {
+     [ -r "$MPI_ARCH_PATH/lib/libmpi.a" ] \
+  || [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]
+}
 then
     echo "Already has static library: $MPI_ARCH_PATH"
 else
@@ -171,8 +190,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

makePETSC

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2018-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makePETSC
@@ -19,88 +20,89 @@
 # ----------------------------------------------
 # 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%/}" # <- PETSC_ARCH_PATH
-    if [ -d "$dir/include" ]
-    then
-        for lib in \
-            $FOAM_EXT_LIBBIN/libpetsc$EXT_SO \
-            $dir/lib/libpetsc.a \
-            $dir/lib/libpetsc$EXT_SO \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc$EXT_SO \
-            ;
-        do
-            if [ -r "$lib" ]
-            then
-                echo "    petsc include: $dir/include"
-                echo "    petsc library: ${lib%/*}"
-                exit 0
-            fi
-        done
-    fi
-    exit 2
-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
 }
-[ -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 petsc
 
-petscPACKAGE=${petsc_version:-petsc-system}
+petscPACKAGE="${petsc_version:-petsc-system}"
 targetType=libso
 
+unset hyprePACKAGE
+unset HYPRE_ARCH_PATH   # Avoid inconsistency
+
 #------------------------------------------------------------------------------
 usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] [lib|libso] [PETSC-VERSION]
+usage: ${0##*/} [OPTION] [lib|libso] [HYPRE-VERSION] [PETSC-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if include/library already exists
   -gcc          Force use of gcc/g++
+  -inplace      Build/install inplace (expert option)
+  -debug        Build with debugging enabled
+  -hypre=URL    Specify hypre download location
+  -no-hypre     Disable automatic hypre download/detection
   -help
 
 * build PETSC with
       ${petscPACKAGE:-'unspecified petsc version'}
 
 USAGE
+    showDownloadHint PETSC
+
+    echo
+    echo "Many people who have downloaded PETSC have also downloaded HYPRE :"
+    showDownloadHint HYPRE
+
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler          # Compiler info for CMake/configure
 
+unset optDebug optForce optInplace optHypre
+
 # 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  ;;
+    -force)     optForce=true ;;
+    -inplace)   optInplace=true ;;
+    -debug)     optDebug=true ;;
 
-    lib|libso)
-        targetType="$1"
+    lib|libso)  targetType="$1" ;;
+
+    -hypre=*)
+        optHypre="${1#*=}"      # URL for download
+        unset hyprePACKAGE HYPRE_ARCH_PATH
         ;;
 
-    petsc-[0-9]*)
+    -no-hypre)
+        optHypre=false
+        unset hyprePACKAGE HYPRE_ARCH_PATH
+        ;;
+
+    hypre-[0-9]* | hypre-git)
+        hyprePACKAGE="${1%%/}"
+        unset optHypre
+        unset HYPRE_ARCH_PATH   # Avoid inconsistency
+        ;;
+    petsc-[0-9]* | petsc-git)
         petscPACKAGE="${1%%/}"
-        unset PETSC_ARCH_PATH  # Avoid inconsistency
+        unset PETSC_ARCH_PATH   # Avoid inconsistency
         ;;
     *)
         die "unknown option/argument: '$1'"
@@ -112,16 +114,28 @@ done
 [ -n "$petscPACKAGE" ] || die "The petsc-VERSION was not specified"
 
 # Nothing to build
-if _foamIsNone $petscPACKAGE
+if _foamIsNone "$petscPACKAGE"
 then
     echo "Using petsc-none (skip ThirdParty build of PETSC)"
     exit 0
-elif _foamIsSystem $petscPACKAGE
+elif _foamIsSystem "$petscPACKAGE"
 then
     echo "Using petsc-system"
     exit 0
 fi
 
+#------------------------------------------------------------------------------
+# Integrations
+
+# Clunky
+if [ -z "$optHypre" ] && [ -n "$hyprePACKAGE" ] \
+&& ! _foamIsNone "$hyprePACKAGE"
+then
+    echo "Using $hyprePACKAGE"
+    : "${HYPRE_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$hyprePACKAGE}"
+fi
+
+
 #------------------------------------------------------------------------------
 #
 # Build PETSC
@@ -129,27 +143,62 @@ fi
 #   PETSC_ARCH_PATH  : installation directory
 #   PETSC_SOURCE_DIR : location of the original sources
 
-PETSC_SOURCE_DIR=$sourceBASE/$petscPACKAGE
+PETSC_SOURCE_DIR="$sourceBASE/$petscPACKAGE"
 : "${PETSC_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$petscPACKAGE}"
 
 [ -d "$PETSC_SOURCE_DIR" ] || {
     echo "Missing sources: '$petscPACKAGE'"
-    exit 1
+    showDownloadHint PETSC
+    exit 2
 }
 
 
+# PETSC arch - same root as WM_OPTIONS (eg, DPInt32)
+archOpt="$WM_SIZE_OPTIONS"
+
+if [ -n "$optInplace" ]
+then
+    unset installPrefix
+    # No install stage requires
+    makeInstall() { true; }
+else
+
+    # Regular installation location
+    installPrefix="$PETSC_ARCH_PATH"
+
+    makeInstall() {
+        make PETSC_DIR="$PETSC_SOURCE_DIR" PETSC_ARCH="$archOpt" install
+    }
+fi
+
 echo "Starting build: $petscPACKAGE ($targetType)"
+if [ "$WM_PRECISION_OPTION" = SP ]
+then
+    optHypre=false  # No single-precision hypre
+    echo "No single-precision hypre"
+fi
+if [ -d "$PETSC_SOURCE_DIR/$archOpt/externalpackages" ]
+then
+    echo "Removing old $archOpt/externalpackages"
+    rm -rf "$PETSC_SOURCE_DIR/$archOpt/externalpackages"
+fi
 echo
 (
-    # PETSC arch - same root as WM_OPTIONS (eg, DPInt32)
-    archOpt="$WM_SIZE_OPTIONS"
-
-    # Configuration options:
+    # Configuration options
     configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)"
 
+    if [ "$optDebug" = true ]
+    then
+        configOpt="$configOpt --with-debugging=1"
+    else
+        # A reasonable assumption for optimization
+        configOpt="$configOpt --with-debugging=0"
+        configOpt="$configOpt --COPTFLAGS=-O3 --CXXOPTFLAGS=-O3"
+    fi
+
     if [ "$targetType" = libso ]
     then
-        configOpt="--with-shared-libraries"
+        configOpt="$configOpt --with-shared-libraries"
     fi
 
     if [ "$WM_LABEL_SIZE" = 64 ]
@@ -166,25 +215,61 @@ echo
         configOpt="$configOpt --with-precision=double"
     fi
 
-    cd $PETSC_SOURCE_DIR || exit 1
-    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
+    case "$optHypre" in
+    false)
+        configOpt="$configOpt --with-hypre=0"
+        ;;
+    ftp:* | git:* | http:* | https:*)
+        configOpt="$configOpt --download-hypre=$optHypre"
+        ;;
+    *)
+        # This is a really clunky way to use ThirdParty hypre
+        if [ -f "$HYPRE_ARCH_PATH/include/HYPRE.h" ]
+        then
+            echo "Has installed hypre: $hyprePACKAGE"
+            configOpt="$configOpt --with-hypre-dir=$HYPRE_ARCH_PATH"
+        else
+            configOpt="$configOpt --download-hypre"
+        fi
+    ;;
+    esac
 
-    rm -rf $PETSC_ARCH_PATH
+    # Additional configure options
+    if [ "$1" = "--" ]
+    then
+        shift
+        configOpt="$configOpt $@"
+    fi
 
+    # We export compiler settings (above) but actually use the
+    # --with-cc and --with-cxx. So ignore these environment variables.
+
+    unset CC CXX
+    unset CFLAGS CXXFLAGS
+
+    cd "$PETSC_SOURCE_DIR" || exit
+    unset GIT_DIR # No special git-repo handling
+
+    rm -rf "$PETSC_ARCH_PATH"
+    # No clean here, if we have multiple arch in the same directory
+
+    echo
+    set -x
     ./configure \
-       --prefix=$PETSC_ARCH_PATH \
-       --with-petsc-arch=$archOpt \
+        ${installPrefix:+--prefix="$installPrefix"} \
+       --PETSC_DIR="$PETSC_SOURCE_DIR" \
+       --with-petsc-arch="$archOpt" \
        --with-clanguage=C \
-       --with-scalapack=0 \
-       --with-superlu_dist=0 \
-       --with-suitesparse=0 \
-       --download-f2cblaslapack=1 \
+       --with-fc=0 \
+       --with-x=0 \
        $configOpt \
+     && set +x \
      && echo "Configured: petsc" \
-     && make PETSC_DIR=$PETSC_SOURCE_DIR PETSC_ARCH="$archOpt" all \
+     && make ${WM_NCOMPPROCS:+-j $WM_NCOMPPROCS} \
+            PETSC_DIR="$PETSC_SOURCE_DIR" PETSC_ARCH="$archOpt" all \
      && echo "Built: petsc" \
-     && make PETSC_DIR=$PETSC_SOURCE_DIR PETSC_ARCH="$archOpt" install
-     && echo "Installed: petsc"
+     && makeInstall \
+     && echo "Installed: petsc - may require etc/pkgconfigPrefix to relocate"
 ) || {
     echo "Error building: petsc"
     exit 1

makeParaView

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeParaView
@@ -27,7 +27,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
@@ -82,7 +83,8 @@ 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})
@@ -124,10 +126,11 @@ For example,
 Or change the \$WM_PROJECT_DIR/etc/config.sh/paraview settings.
 
 USAGE
+    showDownloadHint PARAVIEW
     exit 1
 }
 #------------------------------------------------------------------------------
-exportCompiler          # Compiler info for CMake/configure
+exportCompiler minimal  # Minimal compiler info for CMake/configure
 
 # Various building stages
 unset runPATCH runCONFIG runMAKE runINSTALL
@@ -234,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"
@@ -265,7 +274,7 @@ do
     -no-qt)
         withQT=false
         ;;
-    -qt-[1-9]*)
+    -qt-[0-9]*)
         withQT=true
         QMAKE_PATH="$installBASE/${1##-}"
         ;;
@@ -319,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}
@@ -367,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}

makeQt

@@ -3,14 +3,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#                           | Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2011 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeQt
@@ -22,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
@@ -37,17 +38,21 @@ usage() {
 
 usage: ${0##*/} [OPTION] [qt-VERSION] [-- configure-options]
 options:
+  -force        Force compilation, even if it already exists
   -gcc          Force use of gcc/g++
   -help
 
 * build $qtTYPE, version ${qtVERSION:-undefined}
 
 USAGE
+    showDownloadHint QT
     exit 1
 }
 #------------------------------------------------------------------------------
 exportCompiler true     # Compiler info + flags for CMake/configure
 
+unset optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -56,8 +61,9 @@ do
     --) break;; # Extra configure options (leave on $@ for later detection)
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
-    -qt-[1-9]* | [1-9]* | qt-*)
+    -qt-[0-9]* | [0-9]* | qt-*)
         # -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
         qtVERSION="${1%%/}";
         qtVERSION="${qtVERSION##*-}"
@@ -93,7 +99,10 @@ echo
 echo ========================================
 echo "Build Qt $qtPACKAGE"
 echo
-if [ -d "$QT_ARCH_PATH" -a -r "$QT_ARCH_PATH/bin/qmake" ]
+
+if [ -z "$optForce" ] \
+&& [ -d "$QT_ARCH_PATH" ] \
+&& [ -r "$QT_ARCH_PATH/bin/qmake" ]
 then
     echo "Already built: Qt-$qtVERSION"
 else
@@ -133,8 +142,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
@@ -147,7 +156,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 \

makeSCOTCH

@@ -3,35 +3,30 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2019-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeSCOTCH
 #
 # Description
-#     Build the SCOTCH and PTSCOTCH libraries
+#     Build the SCOTCH and PTSCOTCH libraries, optionally build binaries
 #
 # ----------------------------------------------
 # 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
 }
-[ -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
@@ -50,18 +45,25 @@ usage()
 
 Usage: ${0##*/} [OPTION] [libso] [scotch-VERSION]
 options:
+  -force        Force compilation, even if include/library already exists
+                Also force build attempt of pt-scotch (mingw)
   -gcc          Force use of gcc/g++
+  -bin          Create scotch binaries as well (experimental)
+  -no-bin       Suppress creation of scotch binaries (default)
   -no-mpi       Suppress build of pt-scotch
   -help
 
 * Compile SCOTCH
-      $kahipPACKAGE
+      $scotchPACKAGE
 
 USAGE
+    showDownloadHint SCOTCH
     exit 1
 }
 #------------------------------------------------------------------------------
 
+unset optBinaries optForce
+
 # Parse options
 while [ "$#" -gt 0 ]
 do
@@ -69,11 +71,13 @@ do
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
     -gcc)       useGcc  ;;
+    -force)     optForce=true ;;
 
-    -no-mpi)
-        unset withMPI
-        ;;
-    scotch-[1-9]* | scotch-git | scotch_* |  scotch-[1-9]*)
+    -bin)       optBinaries=true ;;
+    -no-bin)    unset optBinaries ;;
+    -no-mpi)    unset withMPI ;;
+
+    scotch-[0-9]* | scotch-git | scotch_* )
         scotchPACKAGE="${1%%/}"
         unset SCOTCH_ARCH_PATH  # Avoid inconsistency
         ;;
@@ -87,16 +91,18 @@ done
 [ -n "$scotchPACKAGE" ] || die "The scotch-VERSION was not specified"
 
 # Nothing to build
-if _foamIsNone $scotchPACKAGE
+if _foamIsNone "$scotchPACKAGE"
 then
     echo "Using scotch-none (skip ThirdParty build of SCOTCH)"
     exit 0
-elif _foamIsSystem $scotchPACKAGE
+elif _foamIsSystem "$scotchPACKAGE"
 then
     echo "Using scotch-system"
     exit 0
 fi
 
+requireExtLibBin
+
 #------------------------------------------------------------------------------
 
 # Needs generalizing, but works fairly well
@@ -120,12 +126,13 @@ makefileInc="../../$scotchMakefile"
 #   SCOTCH_ARCH_PATH  : installation directory
 #   SCOTCH_SOURCE_DIR : location of the original sources
 
-SCOTCH_SOURCE_DIR=$sourceBASE/$scotchPACKAGE
+SCOTCH_SOURCE_DIR="$sourceBASE/$scotchPACKAGE"
 : "${SCOTCH_ARCH_PATH:=$installBASE$WM_SIZE_OPTIONS/$scotchPACKAGE}"
 
-[ -d "$SCOTCH_SOURCE_DIR" ] || {
+[ -d "$SCOTCH_SOURCE_DIR/src" ] || {
     echo "Missing sources: '$scotchPACKAGE'"
-    exit 1
+    showDownloadHint SCOTCH
+    exit 2
 }
 
 echo
@@ -133,12 +140,19 @@ echo ========================================
 echo "scotch decomposition ($scotchPACKAGE)"
 echo "    Makefile.inc  : ${makefileInc##*/}"
 
+# (serial) scotch
+prefixDIR="$SCOTCH_ARCH_PATH"
+binDIR="$prefixDIR"/bin
+incDIR="$prefixDIR"/include
+libDIR="$FOAM_EXT_LIBBIN"
+
 # Test installation. May or may not have libscotcherrexit.so
-if [ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] \
-&& [ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_SO" ]
+if [ -z "$optForce" ] \
+&& [ -f "$incDIR"/scotch.h ] \
+&& haveLibso "$libDIR"/libscotch
 then
-    echo "    scotch include: $SCOTCH_ARCH_PATH/include"
-    echo "    scotch library: $FOAM_EXT_LIBBIN"
+    echo "    scotch include: $incDIR"
+    echo "    scotch library: $libDIR"
 elif [ -d "$SCOTCH_SOURCE_DIR" ]
 then
 (
@@ -153,24 +167,20 @@ then
         exit 1
     }
 
-    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
+    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
+    mkdir -p "$binDIR" 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
+        ln -s "$makefileInc" Makefile.inc
     fi
     [ -f Makefile.inc ] || {
         echo " Error: scotch needs an appropriate Makefile.inc"
@@ -183,16 +193,25 @@ then
     # Consistency for Intel-MPI and non-icc compilers
     [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
 
+    # The make targets
+    make_targets="libscotch"
+    if [ "$optBinaries" = true ]
+    then
+        make_targets="$make_targets scotch"
+    fi
+
     make realclean 2>/dev/null  # Extra safety
-    make -j $WM_NCOMPPROCS libscotch \
+    make -j $WM_NCOMPPROCS $make_targets \
      && make \
-        prefix=$prefixDIR \
-        includedir=$incDIR \
-        libdir=$libDIR \
+        prefix="$prefixDIR" \
+        bindir="$binDIR" \
+        libdir="$libDIR" \
+        includedir="$incDIR" \
         install
 
-    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    rmdir "$binDIR" 2>/dev/null || true         # Remove empty bin/
+    rmdir "${binDIR%/*}" 2>/dev/null || true    # ... and empty parent
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues SCOTCH
 else
     warnNotFound SCOTCH
@@ -201,31 +220,53 @@ fi
 
 # Build ptscotch when MPI (ThirdParty or system) is available
 
-[ "${withMPI}" = true ] || {
+if [ "${withMPI}" != true ]
+then
     # Report that the above tests failed and pass-through the failure
     echo "Skipping pt-scotch (no mpi)"
     exit 0
-}
+fi
+
+# Known build issues for mingw (MS-MPI source code annotations)
+case "$WM_COMPILER" in
+(Mingw*)
+    if [ -z "$optForce" ]
+    then
+        echo "Skipping pt-scotch - known compilation issues with $WM_COMPILER"
+        exit 0
+    else
+        echo "Warning: pt-scotch - known compilation issues with $WM_COMPILER"
+    fi
+    ;;
+esac
 
-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 1
-}
-
-if [ -f "$SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h" ] && \
-   [ -r "$FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch$EXT_SO" ]
+# (reuse prefix/include/lib dirs set above)
+if [ -f "$incDIR"/scotch.h ] \
+&& haveLibso "$libDIR"/libscotch
 then
-    echo "    ptscotch include: $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
-    echo "    ptscotch library: $FOAM_EXT_LIBBIN/$FOAM_MPI"
+    echo
+    echo ========================================
+    echo "pt-scotch decomposition ($scotchPACKAGE with $FOAM_MPI)"
+else
+    # Report that the above tests failed and pass-through the failure
+    echo "Skipping pt-scotch - no <scotch.h> found"
+    exit 2
+fi
+
+# (parallel) pt-scotch
+prefixDIR="$SCOTCH_ARCH_PATH"
+binDIR="$prefixDIR/bin/$FOAM_MPI"
+incDIR="$prefixDIR/include/$FOAM_MPI"
+libDIR="$FOAM_EXT_LIBBIN/$FOAM_MPI"
+
+if [ -z "$optForce" ] \
+&& [ -f "$incDIR"/ptscotch.h ] \
+&& haveLibso "$libDIR"/libptscotch
+then
+    echo "    ptscotch include: $incDIR"
+    echo "    ptscotch library: $libDIR"
 else
 (
     # Older versions ok, but scotch-6.0.5a cannot build in parallel.
@@ -238,22 +279,18 @@ else
         exit 1
     }
 
-    cd $SCOTCH_SOURCE_DIR/src || exit 1
-    export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
+    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
+    mkdir -p "$binDIR" 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
+        ln -s "$makefileInc" Makefile.inc
     fi
     [ -f Makefile.inc ] || {
         echo " Error: ptscotch needs an appropriate Makefile.inc"
@@ -266,16 +303,25 @@ else
     # Consistency for Intel-MPI and non-icc compilers
     [ -n "$I_MPI_CC" ] || export I_MPI_CC="$(whichCC)"
 
+    # The make targets. No simple means of handling mpi-specific binaries
+    make_targets="libptscotch"
+    if [ "$optBinaries" = true ]
+    then
+        make_targets="$make_targets ptscotch"
+    fi
+
     make realclean 2>/dev/null  # Extra safety
-    make -j $WM_NCOMPPROCS libptscotch \
+    make -j $WM_NCOMPPROCS $make_targets \
      && make \
-        prefix=$prefixDIR \
-        includedir=$incDIR \
-        libdir=$libDIR \
+        prefix="$prefixDIR" \
+        bindir="$binDIR" \
+        libdir="$libDIR" \
+        includedir="$incDIR" \
         install
 
-    rmdir "$SCOTCH_ARCH_PATH/bin" 2> /dev/null || true  # Superfluous bin?
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    rmdir "$binDIR" 2>/dev/null || true         # Remove empty bin/
+    rmdir "${binDIR%/*}" 2>/dev/null || true    # ... and empty parent
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues PTSCOTCH
 fi
 

makeVTK

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
+#   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     makeVTK
@@ -27,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
@@ -100,10 +102,11 @@ For finer control, the build stages can be selected or deselected individually:
   ->  \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/VTK-$VTK_VERSION$BUILD_SUFFIX
 
 USAGE
+    # showDownloadHint VTK
     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}

minCmake

@@ -3,12 +3,13 @@
 # =========                 |
 # \\      /  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-2020 OpenCFD Ltd.
+#------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     minCmake
@@ -20,7 +21,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
@@ -81,6 +83,6 @@ do
 done \
     | sort -n -k 1 \
     | xargs printf "    %-10s  %s\n"
-    # Use 4 leading spaces for easier pasting as Markdown
+    # 4 leading spaces for easy pasting as Markdown
 
 #------------------------------------------------------------------------------