Merge branch 'nextRelease' of ssh://git.code.sf.net/p/foam-extend/foam-extend-4.0 into nextRelease

2019-04-19 11:22:56 +02:00 · 2019-04-19 11:22:56 +02:00 · cf061271af
commit cf061271af
parent 31b6f1d86c 6a466c4378
13890 changed files with 265594 additions and 215234 deletions
--- a/.gitignore
+++ b/.gitignore
@ -93,6 +93,7 @@ PlyParser_FoamFileParser_parsetab.py
 *.tar
 *.tgz
 *.gtgz
 *.xz
 # ignore the persistent .build tag in the main directory
 /.build
@ -127,4 +128,17 @@ src/lduSolvers/amg/amgPolicy/aamgPolicy.H
 # vagrant stuff
 vagrantSandbox/.vagrant/
 # Various intermediate files and directories generated CMAKE
 CMakeFiles/
 build/
 Makefile
 CMakeCache.txt
 cmake_install.cmake
 install_manifest.txt
 timestamp
 # new target folders - just for the moment
 bin
 lib
 # end-of-file
--- a/Allwmake.mingw
+++ b/Allwmake.mingw
@ -2,7 +2,7 @@
 #----------------------------------*-sh-*--------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
-#  \\    /   O peration     | Version:     4.0
+#  \\    /   O peration     | Version:     4.1
 #   \\  /    A nd           | Web:         http://www.foam-extend.org
 #    \\/     M anipulation  | For copyright notice see file Copyright
 #------------------------------------------------------------------------------
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,10 +1,10 @@
-# /*-------------------------------------------------------------------------*\
+# --------------------------------------------------------------------------
-#   =========                 |
+#   ========                 |
-#   \\      /  F ield         | foam-extend: Open Source CFD
+#   \      /  F ield         | foam-extend: Open Source CFD
-#    \\    /   O peration     | Version:     4.1
+#    \    /   O peration     | Version:     4.1
-#     \\  /    A nd           | Web:         http://www.foam-extend.org
+#     \  /    A nd           | Web:         http://www.foam-extend.org
-#      \\/     M anipulation  | For copyright notice see file Copyright
+#      \/     M anipulation  | For copyright notice see file Copyright
-# -----------------------------------------------------------------------------
+# --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
@ -22,381 +22,27 @@
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
-#     CMakeLists.txt file for implementing a test harness for the compilation
+#     CMakeLists.txt file for libraries and applications
 #     and test of foam-extend-4.1 using Kitware CTest/CMake/CDash
 #
 #     The results will be submitted to the CDash server identified by the file
 #     CTestConfig.cmake
 #
 # Author
-#     Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
-# \*-------------------------------------------------------------------------*/
+# --------------------------------------------------------------------------
 cmake_minimum_required (VERSION 2.8)
-PROJECT(foam-extend-4.1)
+project(foam-extend-4.1 C CXX)
-#-----------------------------------------------------------------------------
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # Utility functions
 #
 # GetHostName(var)
 #
 # Set the variable named ${var} to the host hostname
 #
 function(GetHostName var)
    set( thisHostName "unknown")
-    if(CMAKE_HOST_WIN32)
+option(BUILD_WITH_CMAKE "Build using cmake" ON)
-        execute_process(
+option(RUN_TESTS "Run test loop" OFF)
            COMMAND         hostname
            OUTPUT_VARIABLE thisHostname
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )
    else()
        execute_process(
            COMMAND         hostname -f
            OUTPUT_VARIABLE thisHostname
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )
    endif()
-    set(${var} ${thisHostname} PARENT_SCOPE)
+if(BUILD_WITH_CMAKE)
-endfunction()
+    include(compileFOAM)
 endif(BUILD_WITH_CMAKE)
-#
+if(RUN_TESTS)
-# GetGitStatus(status ecode)
+    include(testFOAM)
-#
+endif(RUN_TESTS)
 # Get the git status for the local git repository of the source code
 # The variable named ${status} will get the git status
 # The variable named ${ecode} will get the command error code
 #
 function(GetGitStatus _status _ecode)
    set( git_status "unknown")
    set( git_ecode "1")
    execute_process(
      COMMAND           git status
      WORKING_DIRECTORY ${FOAM_ROOT}
      OUTPUT_VARIABLE   git_status
      RESULT_VARIABLE   git_ecode
      ERROR_QUIET
    )
    set(${_status} ${git_status} PARENT_SCOPE)
    set(${_ecode} ${git_ecode} PARENT_SCOPE)
 endfunction()
 #
 # GetGitBranchName(var)
 #
 # Set the variable named ${var} to the git branch name of the source code
 #
 function(GetGitBranchName var)
    set( retValue "unknown")
    execute_process(
        COMMAND         git branch --no-color
        WORKING_DIRECTORY ${FOAM_ROOT}
        OUTPUT_VARIABLE listOfGitBranches
    )
    # Create list of strings
    string(REPLACE "\n" ";" listOfGitBranches ${listOfGitBranches})
    # Iterate over list, find the string beginning with "* "
    foreach(branch ${listOfGitBranches})
        string(REGEX MATCH "\\* .*$" matchString ${branch})
        string(LENGTH "${matchString}" lengthMatchString)
        if(lengthMatchString GREATER 0)
            # We have  match. Cleanup and set retValue
            string(REPLACE "* " "" retValue ${matchString})
        endif()
    endforeach()
    set(${var} ${retValue} PARENT_SCOPE)
 endfunction()
 #
 # GetGitRevNumber(var)
 #
 # Set the variable named ${var} to the git revision number of the source code
 #
 function(GetGitRevNumber var)
    set( retValue "unknown")
    execute_process(
    COMMAND         git rev-parse --short=12 HEAD
        WORKING_DIRECTORY ${FOAM_ROOT}
        OUTPUT_VARIABLE git_rev_number
    )
    # Minimal check that we do have a valid string
    string(LENGTH "${git_rev_number}" lengthString)
    if(lengthString GREATER 0)
        set(retValue ${git_rev_number})
    endif()
    set(${var} ${retValue} PARENT_SCOPE)
 endfunction()
 # CleanUpStringForCDash(var)
 #
 # Cleanup the variable named ${value} for characters not supported
 # for CDash identifiers. Return the modified value in retVar
 #
 function(CleanUpStringForCDash value retVar)
    string(REPLACE "/" "_" value "${value}")
    string(REPLACE " " "_" value ${value})
    set(${retVar} ${value} PARENT_SCOPE)
 endfunction()
 #-----------------------------------------------------------------------------
 #
 #
 # Initialization of CTest specific variables
 #
 ## Run ctest in parallel if environment variable WM_NCOMPPROCS is set
 IF (NOT $ENV{WM_NCOMPPROCS} STREQUAL "")
    # Will run ctest in parallel over $WM_NCOMPPROCS processors
    set(CMAKE_CTEST_COMMAND ${CMAKE_CTEST_COMMAND} --parallel $ENV{WM_NCOMPPROCS})
    MESSAGE("Running tests in parallel using $ENV{WM_NCOMPPROCS} processors")
 ENDIF ()
 # Initialize the site name
 IF (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
    # We can override the site name with the environment variable
    # $CDASH_SUBMIT_LOCAL_HOST_ID
    SET(
          SITENAME $ENV{CDASH_SUBMIT_LOCAL_HOST_ID}
          CACHE STRING "Name of the local site"
    )
 ELSE ()
    # Grab the hostname FQN; will be used for the sitename
    GetHostName(SITENAME)
 ENDIF()
 MESSAGE("Initializing the name of this local site to:  ${SITENAME}")
 SET(
    SITE ${SITENAME}
    CACHE STRING "Name of the local site"
 )
 #Grab the FOAM installation directory.
 SET(
    FOAM_ROOT $ENV{WM_PROJECT_DIR}
    CACHE INTERNAL  "FOAM root directory."
 )
 # Construct the build name.
 # No need to add $WM_PROJECT_VERSION to the name of the build,
 # the test harness name should have taken care of that.
 SET(
    BUILDNAME $ENV{WM_OPTIONS}
    CACHE STRING "Build ID"
 )
 # We allow overriding the git branch and revision information with some
 # user-supplied information using the CDASH_SCM_INFO environment variable.
 #
 # Mercurial or other SCM users should be using this environment variable
 # in order to provide branch and revision information for the buildname.
 #
 # Git users should use this environment variable in order to provide
 # additionnal information instead of just the branch and revision number.
 #
 # Otherwise, the buildname will be appended with the following information:
 # -git-branch=the_git_branch_name-git-rev=the_git_revision_number
 SET(
    BUILDNAME_SCM_INFO $ENV{CDASH_SCM_INFO}
    CACHE STRING "SCM info for CDash buildname"
 )
 # Find out the version of the compiler being used.
 # Add this information to the buildname
 # This is for gcc or icc because they both support the -dumpversion option
 EXEC_PROGRAM($ENV{WM_CC}
  ARGS -dumpversion
  OUTPUT_VARIABLE COMPILER_VERSION
 )
 SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
 #
 # We will support more compilers eventually.
 #
 # Timeout for running every single test: 4 hours: 4 x 3600 seconds
 #SET(
 #    DART_TESTING_TIMEOUT 14400
 #    CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test."
 #)
 # Timeout for running all this: 20 minutes : 1200 seconds (for debug)
 SET(
    DART_TESTING_TIMEOUT 1200
    CACHE STRING "Maximum time allowed (20 minutes) before CTest will kill the test."
 )
 SET(
    CMAKE_VERBOSE_MAKEFILE TRUE
 )
 # Update section
 #-----------------------------------------------------------------------------
 set (UPDATE_TYPE git)
 #
 # Using GIT as SCM
 #
 find_package(Git)
 if(NOT BUILDNAME_SCM_INFO STREQUAL "")
  SET(BUILDNAME "${BUILDNAME}-${BUILDNAME_SCM_INFO}")
 elseif(GIT_FOUND)
    message("The git command was found: ${GIT_EXECUTABLE}")
    # Check if the source code is under a valid git repository
    GetGitStatus(GIT_STATUS GIT_ECODE)
    if(NOT GIT_ECODE)
        # We have a valid git repository.
        # Grab the branch and revision info. Add to the build name
        GetGitBranchName(GIT_BRANCH_NAME)
        message("Git branch: ${GIT_BRANCH_NAME}")
        GetGitRevNumber(GIT_REV_NUMBER)
        message("Git revision: ${GIT_REV_NUMBER}")
        SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
        SET(BUILDNAME "${BUILDNAME}-git-rev=${GIT_REV_NUMBER}")
    else()
        execute_process(
          COMMAND           hg id
          WORKING_DIRECTORY ${FOAM_ROOT}
          OUTPUT_VARIABLE   HG_STATUS
          RESULT_VARIABLE   HG_ECODE
          ERROR_QUIET
          )
        if(NOT HG_ECODE)
          # We have a valid git repository. Grab the branch and revision info.
          # Add to the build name
          message("No git-branch. Mercurial?")
          EXEC_PROGRAM(hg
            ARGS id --bookmarks
            OUTPUT_VARIABLE GIT_BRANCH_NAME
            )
          EXEC_PROGRAM(hg
            ARGS id --id
            OUTPUT_VARIABLE GIT_REV_NUMBER
            )
          EXEC_PROGRAM(hg
            ARGS log --template='git_{gitnode|short}' -l 1
            OUTPUT_VARIABLE GIT_REAL_REV_NUMBER
            )
          string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
          string(REPLACE "+" ":modified" GIT_REV_NUMBER ${GIT_REV_NUMBER})
          SET(GIT_REV_NUMBER "${GIT_REV_NUMBER}_${GIT_REAL_REV_NUMBER}")
          message("Git branch (mercurial): ${GIT_BRANCH_NAME} Revision: ${GIT_REV_NUMBER}")
          SET(BUILDNAME "${BUILDNAME}-hg-branch=${GIT_BRANCH_NAME}")
          SET(BUILDNAME "${BUILDNAME}-hg-rev=${GIT_REV_NUMBER}")
        else()
          # Not a git or mercurial repository: no branch nor revision information available
          SET(BUILDNAME "${BUILDNAME}-git-branch=unknown")
          SET(BUILDNAME "${BUILDNAME}-git-rev=unknown")
        endif()
    endif()
 else()
    # Git is not available: no branch nor revision information supplied
    SET(BUILDNAME "${BUILDNAME}-git-branch=unknown")
    SET(BUILDNAME "${BUILDNAME}-git-rev=unknown")
 endif()
 # Some last minute cleanup
 # Seems like no '/' or ' 'are allowed in the BUILDNAME or in the SITE name
 CleanUpStringForCDash(${BUILDNAME} BUILDNAME)
 CleanUpStringForCDash(${SITE} SITE)
 message("Build name: ${BUILDNAME}")
 message("Site name: ${SITE}")
 #
 # Build section
 #-----------------------------------------------------------------------------
 # Compile FOAM, libs and apps
 add_custom_target (foam-extend-$ENV{WM_PROJECT_VERSION} ALL
  ${FOAM_ROOT}/Allwmake
 )
 set_property(
  TARGET          foam-extend-$ENV{WM_PROJECT_VERSION}
  PROPERTY LABELS foam-extend-$ENV{WM_PROJECT_VERSION}
 )
 # Compile the FOAM unit tests located under applications/test
 # This part will not be compiled and run by default.
 # This would be a good candidate for a sub-project
 add_custom_target (foam-extend-$ENV{WM_PROJECT_VERSION}_unitTests
  wmake all ${FOAM_ROOT}/applications/test
 )
 # Test section
 #-----------------------------------------------------------------------------
 #Enable testing and dashboard
 ENABLE_TESTING()
 INCLUDE(CTest)
 SET (CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE})
 SET(
    CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000
    CACHE INTERNAL "Max number of errors"
 )
 SET(
    CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1000
    CACHE INTERNAL "Max number of warnings"
 )
 IF(BUILD_TESTING)
    # Modify this variable if you want the full length test case simulations
    # Beware, this might take a long time to execute.
    # Otherwise, the default behaviour is to run each tutorial for 1 "timestep"
    #SET(RUN_FROM_ONE_TIMESTEP 0)
    SET(RUN_FROM_ONE_TIMESTEP 1)
    IF(RUN_FROM_ONE_TIMESTEP)
        SET(testIdSuffix "_oneTimeStep")
    ENDIF(RUN_FROM_ONE_TIMESTEP)
    # FOAM will run against this test suite:
    # Add the suite of FOAM tutorials
    #
    INCLUDE($ENV{FOAM_TEST_HARNESS_DIR}/CMakeFiles/FOAM_Tutorials.cmake)
    IF(RUN_FROM_ONE_TIMESTEP)
        # Modify the cases controlDict file in order to run for only one time step
        MESSAGE("${testRunTimeDirectory}: Modifying the controlDict files for running only one time step in directory: ${TEST_CASE_DIR}")
        if(CMAKE_HOST_WIN32)
          # Need to supply a bash shell to run the script under Windows
          EXECUTE_PROCESS(
            COMMAND bash -c "$ENV{FOAM_TEST_HARNESS_DIR}/scripts/prepareCasesForOneTimeStep.sh ${TEST_CASE_DIR}"
            WORKING_DIRECTORY .
          )
        else()
          EXECUTE_PROCESS(
            COMMAND $ENV{FOAM_TEST_HARNESS_DIR}/scripts/prepareCasesForOneTimeStep.sh ${TEST_CASE_DIR}
            WORKING_DIRECTORY .
          )
        endif()
    ENDIF(RUN_FROM_ONE_TIMESTEP)
 ENDIF(BUILD_TESTING)
 # That's it.
 #
--- a/2
+++ b/2
@ -2,7 +2,7 @@ The OpenFOAM-Extend Project
 Web site: http://www.extend-project.de/
-The goal of the OpenFOAM -Extend Project is to open the OpenFOAM CFD toolbox
+The goal of the FOAM-Extend Project is to open the OpenFOAM CFD toolbox
 to community contributed extensions in the spirit of the Open Source
 development model.
--- a/Macros/tensorOperator.sty
+++ b/Macros/tensorOperator.sty
@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------
 % =========                 |
 % \\      /  F ield         | foam-extend: Open Source CFD
-%  \\    /   O peration     | Version:     4.0
+%  \\    /   O peration     | Version:     4.1
 %   \\  /    A nd           | Web:         http://www.foam-extend.org
 %    \\/     M anipulation  | For copyright notice see file Copyright
 %------------------------------------------------------------------------------
--- a/ThirdParty/AllClean.stage1
+++ b/ThirdParty/AllClean.stage1
@ -66,11 +66,6 @@ uninstallPackage mpc-0.8.2 $1
 uninstallPackage mpc-1.0.1 $1
 # gcc
 uninstallPackage gcc-4.4.5 $1
 uninstallPackage gcc-4.5.1 $1
 uninstallPackage gcc-4.6.4 $1
 uninstallPackage gcc-4.7.4 $1
 uninstallPackage gcc-4.8.4 $1
 uninstallPackage gcc-4.9.2 $1
 #LLVM
@ -90,14 +85,7 @@ uninstallPackage bison-2.7   $1
 uninstallPackage flex-2.5.35 $1
 # cmake
-uninstallPackage cmake-2.8.3  $1
+uninstallPackage cmake-3.11.4  $1
 uninstallPackage cmake-2.8.5  $1
 uninstallPackage cmake-2.8.6  $1
 uninstallPackage cmake-2.8.8  $1
 uninstallPackage cmake-2.8.11 $1
 uninstallPackage cmake-2.8.12 $1
 uninstallPackage cmake-3.2.2  $1
 uninstallPackage cmake-3.3.2  $1
 echo
@ -107,5 +95,3 @@ echo ========================================
 echo
 # ----------------------------------------------------------------- end-of-file
--- a/ThirdParty/AllClean.stage2
+++ b/ThirdParty/AllClean.stage2
@ -56,6 +56,8 @@ uninstallPackage openmpi-1.4.3 $1
 uninstallPackage openmpi-1.5 $1
 uninstallPackage openmpi-1.6.5 $1
 uninstallPackage openmpi-1.8.4 $1
 uninstallPackage openmpi-3.1.0 $1
 uninstallPackage openmpi-4.0.0 $1
 echo
 echo ========================================
@ -64,5 +66,3 @@ echo ========================================
 echo
 # ----------------------------------------------------------------- end-of-file
--- a/ThirdParty/AllMake.stage1
+++ b/ThirdParty/AllMake.stage1
@ -61,62 +61,6 @@ echo Starting ThirdParty AllMake: Stage1
 echo ========================================
 echo
 # Gcc 4.4.5 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_445" ] && {
    echo "Building gmp-5.0.1 mpfr-3.0.1 gcc-4.4.5"
    ( rpm_make -p gmp-5.0.1   -s gmp-5.0.1.spec  -u http://ftpmirror.gnu.org/gmp/gmp-5.0.1.tar.gz                  )
    ( rpm_make -p mpfr-3.0.1  -s mpfr-3.0.1.spec -u http://ftpmirror.gnu.org/mpfr/mpfr-3.0.1.tar.gz                )
    ( rpm_make -p gcc-4.4.5   -s gcc-4.4.5.spec  -u http://ftpmirror.gnu.org/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz        )
 }
 # Gcc 4.5.1 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_451" ] && {
    echo "Building gmp-5.0.1 mpfr-3.0.1 mpc-0.8.2 gcc-4.5.1"
    ( rpm_make -p gmp-5.0.1  -s gmp-5.0.1.spec  -u http://ftpmirror.gnu.org/gmp/gmp-5.0.1.tar.gz                  )
    ( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u http://ftpmirror.gnu.org/mpfr/mpfr-3.0.1.tar.gz                )
    ( rpm_make -p mpc-0.8.2  -s mpc-0.8.2.spec  -u http://www.multiprecision.org/downloads/mpc-0.8.2.tar.gz )
    ( rpm_make -p gcc-4.5.1  -s gcc-4.5.1.spec  -u http://ftpmirror.gnu.org/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz        )
 }
 # Gcc 4.6.3 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_463" ] && {
    echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
    ( rpm_make -p gmp-5.0.5  -s gmp-5.0.5.spec  -u http://ftpmirror.gnu.org/gmp/gmp-5.0.5.tar.bz2                 )
    ( rpm_make -p mpfr-3.1.0 -s mpfr-3.1.0.spec -u http://ftpmirror.gnu.org/mpfr/mpfr-3.1.0.tar.gz                )
    ( rpm_make -p mpc-0.9    -s mpc-0.9.spec    -u http://www.multiprecision.org/downloads/mpc-0.9.tar.gz   )
    ( rpm_make -p gcc-4.6.3  -s gcc-4.6.3.spec  -u http://ftpmirror.gnu.org/gcc/gcc-4.6.3/gcc-4.6.3.tar.gz        )
 }
 # Gcc 4.7.4 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_474" ] && {
    echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
    ( rpm_make -p gmp-5.1.2  -s gmp-5.1.2.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2                 )
    ( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz                )
    ( rpm_make -p mpc-1.0.1  -s mpc-1.0.1.spec  -u http://www.multiprecision.org/downloads/mpc-1.0.1.tar.gz   )
    ( rpm_make -p gcc-4.7.4  -s gcc-4.7.4.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz        )
 }
 # Gcc 4.7.4 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_474" ] && {
    echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
    ( rpm_make -p gmp-5.1.2  -s gmp-5.1.2.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2                 )
    ( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz                )
    ( rpm_make -p mpc-1.0.1  -s mpc-1.0.1.spec  -u http://www.multiprecision.org/downloads/mpc-1.0.1.tar.gz   )
    ( rpm_make -p gcc-4.7.4  -s gcc-4.7.4.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz        )
 }
 # Gcc 4.8.4 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_484" ] && {
    echo "Building gcc-4.8.4"
    ( rpm_make -p gcc-4.8.4  -s gcc-4.8.4.spec  -u http://ftpmirror.gnu.org/gcc/gcc-4.8.4/gcc-4.8.4.tar.gz      )
 }
 # Gcc 4.9.2 and companion libraries
 #
 [ ! -z "$WM_THIRD_PARTY_USE_GCC_492" ] && {
@ -161,25 +105,11 @@ echo
    ( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u https://github.com/westes/flex/archive/flex-2-5-35.tar.gz )
 }
-# cmake 2.8.12
+# cmake 3.11.4
 #
-[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_2812" ] && {
+[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_3114" ] && {
-    echo "Building cmake 2.8.12"
+    echo "Building cmake 3.11.4"
-    ( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz        )
+    ( rpm_make -p cmake-3.11.4 -s cmake-3.11.4.spec -u http://www.cmake.org/files/v3.11/cmake-3.11.4.tar.gz        )
 }
 # cmake 3.2.2
 #
 [ ! -z "$WM_THIRD_PARTY_USE_CMAKE_322" ] && {
    echo "Building cmake 3.2.2"
    ( rpm_make -p cmake-3.2.2 -s cmake-3.2.2.spec -u http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz        )
 }
 # cmake 3.3.2
 #
 [ ! -z "$WM_THIRD_PARTY_USE_CMAKE_332" ] && {
    echo "Building cmake 3.3.2"
    ( rpm_make -p cmake-3.3.2 -s cmake-3.3.2.spec -u http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz        )
 }
 echo ========================================
@ -188,5 +118,3 @@ echo ========================================
 echo
 # ----------------------------------------------------------------- end-of-file
--- a/ThirdParty/AllMake.stage2
+++ b/ThirdParty/AllMake.stage2
@ -104,6 +104,23 @@ then
 	( rpm_make -p openmpi-1.8.8 -s openmpi-1.8.8.spec  -u https://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.gz \
          -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs"')
    }
    # openmpi 3.1.1
    #
    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_311" ] && {
 	echo "Building openmpi 3.1.1"
 	( rpm_make -p openmpi-3.1.1 -s openmpi-3.1.1.spec  -u https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.1.tar.gz \
          -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_311_ConfigureAdditionalArgs"')
    }
    # openmpi 4.0.0
    #
    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_400" ] && {
 	echo "Building openmpi 4.0.0"
 	( rpm_make -p openmpi-4.0.0 -s openmpi-4.0.0.spec  -u https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.0.tar.gz \
          -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_400_ConfigureAdditionalArgs"')
    }
    # mvipich2-2.2
    #
    [ ! -z "$WM_THIRD_PARTY_USE_MVAPICH2_22" ] && {
@ -121,5 +138,3 @@ echo ========================================
 echo
 # ----------------------------------------------------------------- end-of-file
--- a/ThirdParty/AllMake.stage3
+++ b/ThirdParty/AllMake.stage3
@ -108,6 +108,13 @@ then
 	echo "Building Mesquite 2.1.2"
 	( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.1.2.tar.gz )
    }
    # Mesquite 2.3.0
    #
    [ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_230" ] && {
 	echo "Building Mesquite 2.3.0"
 	( rpm_make -p mesquite-2.3.0 -s mesquite-2.3.0.spec -u https://software.sandia.gov/mesquite/mesquite-2.3.0.tar.gz )
 	# ( rpm_make -p mesquite-2.3.0 -s mesquite-2.3.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.3.0.tar.gz )
    }
 else
    echo "Using system installed Mesquite"
    echo ""
@ -183,6 +190,18 @@ then
 	echo "Building PyFoam 0.6.4"
 	( rpm_make -p PyFoam-0.6.4 -s PyFoam-0.6.4.spec  -u http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz -n PyFoam-0.6.4-1.noarch -a noarch)
    }
    # PyFoam 0.6.6
    #
    [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_066" ] && {
 	echo "Building PyFoam 0.6.6"
 	( rpm_make -p PyFoam-0.6.6 -s PyFoam-0.6.6.spec  -u https://openfoamwiki.net/images/a/af/PyFoam-0.6.6.tar.gz -n PyFoam-0.6.6-1.noarch -a noarch)
    }
    # PyFoam 0.6.9
    #
    [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_069" ] && {
 	echo "Building PyFoam 0.6.9"
 	( rpm_make -p PyFoam-0.6.9 -s PyFoam-0.6.9.spec  -u https://files.pythonhosted.org/packages/78/f5/8f65b66c8ac0e5415f785809e182dd0f0dc562a42094e1a86bd22c7d7ece/PyFoam-0.6.9.tar.gz -n PyFoam-0.6.9-1.noarch -a noarch)
    }
 else
    echo "Using system installed PyFoam"
    echo ""
@ -191,6 +210,13 @@ fi
 # hwloc
 if [ -z "$HWLOC_SYSTEM" ]
 then
    # hwloc 2.0.1
    #
    [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_201" ] && {
 	echo "Building hwloc 2.0.1"
    ( rpm_make -p hwloc-2.0.1 -s hwloc-2.0.1.spec  -u http://www.open-mpi.org/software/hwloc/v2.0/downloads/hwloc-2.0.1.tar.gz )
 	# ( rpm_make -p hwloc-2.0.1 -s hwloc-2.0.1.spec  -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-2.0.1.tar.gz )
    }
    # hwloc 1.10.1
    #
    [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && {
--- a/ThirdParty/AllMake.stage4
+++ b/ThirdParty/AllMake.stage4
@ -71,6 +71,12 @@ then
    echo "Building Qt 5.8.0"
    ( rpm_make -p qt-everywhere-opensource-src-5.8.0 -s qt-everywhere-opensource-src-5.8.0.spec -u http://download.qt.io/archive/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.gz )
    }
    # Qt 5.11.1
    #
    [ ! -z "$WM_THIRD_PARTY_USE_QT_5111" ] && {
    echo "Building Qt 5.11.1"
    ( rpm_make -p qt-everywhere-src-5.11.1 -s qt-everywhere-src-5.11.1.spec -u http://download.qt.io/archive/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz )
    }
 else
    echo "Using system installed QT"
    echo ""
@ -124,6 +130,14 @@ then
        -f --define='_qmakePath $QT_BIN_DIR/qmake'
            )
        }
        # ParaView 5.5.2
        #
        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_552" ] && {
            echo "Building ParaView 5.5.2"
            ( rpm_make -p ParaView-5.5.2 -s ParaView-5.5.2.spec -u http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz \
        -f --define='_qmakePath $QT_BIN_DIR/qmake'
            )
        }
    else
        echo "WARNING: "
        echo "WARNING: Skipping the installation of ParaView-4.x.x."
@ -172,5 +186,3 @@ echo ========================================
 echo
 # ----------------------------------------------------------------- end-of-file
--- a/ThirdParty/AllMake.stage5
+++ b/ThirdParty/AllMake.stage5
@ -62,7 +62,7 @@ echo
 # which is also replicated under the Breeder_2.0 section of the Subversion repository
 #
-SWAK_RELEASE_VERSION=0.4.0
+SWAK_RELEASE_VERSION=0.4.2
 if [ -z "$SWAK4FOAM_SYSTEM" ]
 then
@ -78,16 +78,22 @@ then
        then
            echo "Using Mercurial/hg to download the source code for swak4Foam"
            (
-                cd ./rpmBuild/BUILD;
+                cd ./rpmBuild/BUILD
-                hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION;
+                hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION
-                cd swak4Foam-$SWAK_RELEASE_VERSION;
+                cd swak4Foam-$SWAK_RELEASE_VERSION
-                hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
+                #hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
                # We use dev-branch temporarily
                hg checkout compile_foamExtend4.1
            )
        else
            echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository"
            command -v svn >/dev/null
            if [ $? -eq 0 ];
            then
                # Disabled temporarily
                echo "Subversion/svn is currently not supported"
                exit -1
                echo "Using Subversion/svn to download the source code for swak4Foam"
                (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
            else
--- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit
+++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit
@ -0,0 +1,38 @@
 --- orig/ParMGridGen-1.0/mgridgen.h	2019-01-15 13:32:54.247812378 +0100
 +++ ParMGridGen-1.0/mgridgen.h	2019-01-15 13:35:03.972952464 +0100
@@ -1,4 +1,4 @@
 -typedef int idxtype;
 +typedef long int idxtype;
 typedef double realtype;
 --- orig/ParMGridGen-1.0/parmgridgen.h	2019-01-15 13:32:54.251812414 +0100
 +++ ParMGridGen-1.0/parmgridgen.h	2019-01-15 13:42:14.344335223 +0100
@@ -1,4 +1,4 @@
 -typedef int idxtype;
 +typedef long int idxtype;
 typedef double realtype;
 void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *,
 --- orig/ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h	2019-01-15 13:32:54.247812378 +0100
 +++ ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h	2019-01-15 13:44:17.605231500 +0100
@@ -15,7 +15,7 @@
 /* Indexes are as long as integers for now */
 #ifdef IDXTYPE_INT
 -typedef int idxtype;
 +typedef long int idxtype;
 #define IDX_DATATYPE	MPI_INT
 #else
 typedef short idxtype;
 --- orig/ParMGridGen-1.0/MGridGen/IMlib/IMlib.h	2019-01-15 13:32:54.251812414 +0100
 +++ ParMGridGen-1.0/MGridGen/IMlib/IMlib.h	2019-01-15 13:52:11.504522970 +0100
@@ -16,7 +16,7 @@
 /* Indexes are as long as integers for now */
 #ifdef IDXTYPE_INT
 -typedef int idxtype;
 +typedef long int idxtype;
 #else
 typedef short idxtype;
 #endif
--- a/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit
+++ b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit
@ -0,0 +1,11 @@
 --- orig/parmetis-4.0.3/metis/include/metis.h	2019-01-15 12:40:31.050842343 +0100
 +++ parmetis-4.0.3/metis/include/metis.h	2019-01-15 12:43:01.883662756 +0100
@@ -30,7 +30,7 @@
  GCC does provides these definitions in stdint.h, but it may require some
  modifications on other architectures.
 --------------------------------------------------------------------------*/
 -#define IDXTYPEWIDTH 32
 +#define IDXTYPEWIDTH 64
 /*--------------------------------------------------------------------------
--- a/ThirdParty/rpmBuild/SOURCES/ParaView-5.5.2.patch
+++ b/ThirdParty/rpmBuild/SOURCES/ParaView-5.5.2.patch
@ -0,0 +1,122 @@
 # From https://gitlab.kitware.com/bob.obara/paraview/commit/931c779dde8460fe32aa8a3d19956b175b96e4f9.patch
 diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
 index 3ba019c26b177f2cd93d19f01a0b3a280aaf6ac2..ce38396f6844e7628d4d225d165f2ac4f6598f19 100644
 --- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
 +++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
@@ -34,6 +34,7 @@
 #include "vtkSMProperty.h"
 #include "vtkSMSourceProxy.h"
 +#include <QAction>
 #include <QPushButton>
 #include <QtDebug>
 diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
 index 0395185e0ab17a544233e9add78cc926ae19f2cd..88b56745eb0d58e5a6b2f2d2cacd62e66c230901 100644
 --- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
 +++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QDebug>
 #include <QKeyEvent>
 #include <QPointer>
 +#include <QStyle>
 #include <QVBoxLayout>
 class pqColorMapEditor::pqInternals
 diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
 index 908e4598e025fab059a7b6b4097ceddf9cffef6a..820361a2b34abc0af6e4f317d7f77c6a954f7129 100644
 --- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
 +++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkSMUncheckedPropertyHelper.h"
 #include <QGridLayout>
 +#include <QStyle>
 class pqDoubleRangeSliderPropertyWidget::pqInternals
 {
 diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
 index c297dc3d9e7acab31d5fe326a6207fb326893e73..501633f63a1facae26371e9ea75eccdab582a6cc 100644
 --- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
 +++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QPushButton>
 #include <QSet>
 #include <QShortcut>
 +#include <QStyle>
 //-----------------------------------------------------------------------------
 pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
 diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
 index 6774c2e48e61e6e8278da02075a47b0ecabcd396..e85e614f042143700f938cc855ef486f9f8be2d7 100644
 --- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
 +++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkSMPropertyHelper.h"
 #include "vtkSMSourceProxy.h"
 +#include <QHeaderView>
 #include <QLineF>
 #include <QPainter>
 #include <QVariant>
 diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
 index 55d31464474eff2f965d959f99dd2db0b5c185bf..93cd995d92e1bbe361857bb9e88d710463da9914 100644
 --- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
 +++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkPiecewiseFunction.h"
 #include <QString>
 +#include <QDoubleValidator>
 +
 class pqTransferFunctionWidgetPropertyDialog::pqInternals
 {
 public:
 diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
 index 6d2865431ef930a13a9fa0796474dbfb126fc4ac..8d2c4b61cd1038836feb610437f6539dcc6e00bd 100644
 --- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
 +++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkSMProxy.h"
 #include <QIntValidator>
 +#include <QStyle>
 class pqViewResolutionPropertyWidget::pqInternals
 {
 diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
 index 8a67b10095ee037ad3ee1179b342c72d62d11db9..86db3de01c7dccb0727148e709616d9f4c7debe6 100644
 --- a/Qt/Components/pqChangeInputDialog.cxx
 +++ b/Qt/Components/pqChangeInputDialog.cxx
@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkSMProxy.h"
 #include "vtkSmartPointer.h"
 +#include <QHeaderView>
 #include <QItemSelectionModel>
 #include <QLineEdit>
 #include <QRadioButton>
 diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
 index 3d6d9dde19f3860c3f0af54f088e4f3b28d1f7b9..eea2e37680126ced46921749c4e70b1295680032 100644
 --- a/Qt/Components/pqCinemaTrackSelection.cxx
 +++ b/Qt/Components/pqCinemaTrackSelection.cxx
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ========================================================================*/
 #include <QDebug>
 +#include <QHeaderView>
 #include "vtkPVArrayInformation.h"
 #include "vtkPVDataInformation.h"
 diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
 index 3d01fd0a96deda60a5c946820b10c54992a6c9fb..bc1a0149360a1d4ae2caa8622ac76f2176608109 100644
 --- a/Qt/Python/pqPythonShell.cxx
 +++ b/Qt/Python/pqPythonShell.cxx
@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vtkStringOutputWindow.h"
 #include "vtkWeakPointer.h"
 +#include <QAbstractItemView>
 #include <QApplication>
 #include <QCursor>
 #include <QFile>
--- a/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit
+++ b/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit
@ -0,0 +1,11 @@
 --- orig/metis-5.1.0/include/metis.h	2019-01-15 12:40:31.050842343 +0100
 +++ metis-5.1.0/include/metis.h	2019-01-15 12:43:01.883662756 +0100
@@ -30,7 +30,7 @@
  GCC does provides these definitions in stdint.h, but it may require some
  modifications on other architectures.
 --------------------------------------------------------------------------*/
 -#define IDXTYPEWIDTH 32
 +#define IDXTYPEWIDTH 64
 /*--------------------------------------------------------------------------
--- a/ThirdParty/rpmBuild/SOURCES/openmpi-3.1.1.patch
+++ b/ThirdParty/rpmBuild/SOURCES/openmpi-3.1.1.patch
@ -0,0 +1,28 @@
 --- openmpi-3.1.1_orig/ompi/include/mpi.h.in	2018-06-29 20:38:13.000000000 +0430
 +++ openmpi-3.1.1/ompi/include/mpi.h.in		2019-01-30 22:03:31.021316632 +0330
@@ -307,7 +307,11 @@
  * when building OMPI).
  */
 #if !OMPI_BUILDING
 +#if defined(c_plusplus) || defined(__cplusplus)
 +#define OMPI_PREDEFINED_GLOBAL(type, global) (static_cast<type> (static_cast<void *> (&(global))))
 +#else
 #define OMPI_PREDEFINED_GLOBAL(type, global) ((type) ((void *) &(global)))
 +#endif
 #else
 #define OMPI_PREDEFINED_GLOBAL(type, global) ((type) &(global))
 #endif
@@ -753,8 +757,13 @@
  */
 #define MPI_INFO_ENV OMPI_PREDEFINED_GLOBAL(MPI_Info, ompi_mpi_info_env)
 +#if defined(c_plusplus) || defined(__cplusplus)
 +#define MPI_STATUS_IGNORE (static_cast<MPI_Status *> (0))
 +#define MPI_STATUSES_IGNORE (static_cast<MPI_Status *> (0))
 +#else
 #define MPI_STATUS_IGNORE ((MPI_Status *) 0)
 #define MPI_STATUSES_IGNORE ((MPI_Status *) 0)
 +#endif
 /*
  * Special MPI_T handles
--- a/ThirdParty/rpmBuild/SOURCES/openmpi-4.0.0.patch
+++ b/ThirdParty/rpmBuild/SOURCES/openmpi-4.0.0.patch
@ -0,0 +1,28 @@
 --- openmpi-4.0.0_orig/ompi/include/mpi.h.in	2018-11-12 23:50:53.000000000 +0330
 +++ openmpi-4.0.0/ompi/include/mpi.h.in		2019-01-30 22:04:14.433503290 +0330
@@ -325,7 +325,11 @@
  * when building OMPI).
  */
 #if !OMPI_BUILDING
 +#if defined(c_plusplus) || defined(__cplusplus)
 +#define OMPI_PREDEFINED_GLOBAL(type, global) (static_cast<type> (static_cast<void *> (&(global))))
 +#else
 #define OMPI_PREDEFINED_GLOBAL(type, global) ((type) ((void *) &(global)))
 +#endif
 #else
 #define OMPI_PREDEFINED_GLOBAL(type, global) ((type) &(global))
 #endif
@@ -765,8 +769,13 @@
  */
 #define MPI_INFO_ENV OMPI_PREDEFINED_GLOBAL(MPI_Info, ompi_mpi_info_env)
 +#if defined(c_plusplus) || defined(__cplusplus)
 +#define MPI_STATUS_IGNORE (static_cast<MPI_Status *> (0))
 +#define MPI_STATUSES_IGNORE (static_cast<MPI_Status *> (0))
 +#else
 #define MPI_STATUS_IGNORE ((MPI_Status *) 0)
 #define MPI_STATUSES_IGNORE ((MPI_Status *) 0)
 +#endif
 /*
  * Special MPI_T handles
--- a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
+++ b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
@ -27,14 +27,15 @@ diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib sc
 diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
 --- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2014-08-05 08:56:17.000000000 -0400
 +++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2015-06-21 00:26:43.072992194 -0400
-@@ -8,10 +8,10 @@
+@@ -8,10 +8,11 @@
 CAT		= cat
 CCS		= gcc
 CCP		= mpicc
 -CCD		= gcc
 -CFLAGS		= -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
 +CCD		= mpicc -I$(MPI_HOME)/include
-+CFLAGS		= -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
+INTSIZE		=
 +CFLAGS		= -O3 $(INTSIZE) -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
 CLIBFLAGS	= -shared -fPIC
 -LDFLAGS		= -lz -lm -pthread
 +LDFLAGS		= -lz -lm -pthread -lrt
--- a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit
+++ b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit
@ -0,0 +1,12 @@
 diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
 --- orig/scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2019-01-15 11:26:39.142915259 +0100
 +++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib	2019-01-15 11:26:58.871041175 +0100
@@ -9,7 +9,7 @@
 CCS		= gcc
 CCP		= mpicc
 CCD		= mpicc -I$(MPI_HOME)/include
 -INTSIZE		=
 +INTSIZE		= -DINTSIZE64
 CFLAGS		= -O3 $(INTSIZE) -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
 CLIBFLAGS	= -shared -fPIC
 LDFLAGS		= -lz -lm -pthread -lrt
--- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
@ -78,6 +78,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:                 ParMGridGen-1.0.patch_darwin
 Patch1:                 ParMGridGen-1.0.patch
 Patch2:                 ParMGridGen-1.0.patch_64Bit
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -93,6 +94,10 @@ Patch1:                 ParMGridGen-1.0.patch
 %patch1 -p1
 %endif
 if [ "$WM_LABEL_SIZE" = "64" ]; then
 %patch2 -p1
 fi
 %build
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
--- a/ThirdParty/rpmBuild/SPECS/ParaView-5.5.2.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-5.5.2.spec
@ -0,0 +1,295 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for ParaView-5.5.2
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Authors:
 #     Martin Beaudoin, (2018)
 #     Andreas Feymark, Chalmers University of Technology, (2013)
 #     Pascal Beckstein, HZDR, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # Turning off the Fascist build policy
 # Useful for debugging the install section
 %define _unpackaged_files_terminate_build 0
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		ParaView
 %define release		%{_WM_OPTIONS}
 %define version 	5.5.2
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		ParaView
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:                    http://www.paraview.org/files/v5.5/
 Source: 		%url/%{name}-v%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:                 ParaView-5.5.2.patch
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 #--------------------------------------------------------------------------
 #
 # Here, we define default compiling options for cmake
 #
 # One can override the option on the commande line : --define='MACRO EXPR'
 #
 %{!?_withVerbose:     %define _withVerbose     false}
 %{!?_withMesa:        %define _withMesa        false}
 %{!?_withMPI:         %define _withMPI         false}
 %{!?_withPython:      %define _withPython      false}
 %{!?_withQt:          %define _withQt          true}
 %{!?_qmakePath:       %define _qmakePath       Undefined}
 %{!?_mesaIncludePath: %define _mesaIncludePath Undefined}
 %{!?_mesaLibPath:     %define _mesaLibPath     Undefined}
 %{!?_pythonLibPath:   %define _pythonLibPath   Undefined}
 #--------------------------------------------------------------------------
 %description
 %{summary}
 %prep
 %setup -q -n %{name}-v%{version}
 %patch0 -p1
 %build
 #
 # set CMake cache variables
 #
    addCMakeVariable()
    {
        while [ -n "$1" ]
        do
            CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
            shift
        done
   }
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    set +x
    echo ""
    echo "Compilation options:"
    echo "     _withVerbose     : %{_withVerbose}"
    echo "     _withMesa        : %{_withMesa}"
    echo "     _withMPI         : %{_withMPI}"
    echo "     _withPython      : %{_withPython}"
    echo "     _withQt          : %{_withQt}"
    echo "     _qmakePath       : %{_qmakePath}"
    echo "     _mesaIncludePath : %{_mesaIncludePath}"
    echo "     _mesaLibPath     : %{_mesaLibPath}"
    echo "     _pythonLibPath   : %{_pythonLibPath}"
    echo ""
    set -x
    # start with these general settings
    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON
    addCMakeVariable  CMAKE_BUILD_TYPE:STRING=Release
    addCMakeVariable  BUILD_TESTING:BOOL=OFF
    # We build with Python. This is ust too useful
    addCMakeVariable  PARAVIEW_ENABLE_PYTHON:BOOL=ON
    # include development files in "make install"
    addCMakeVariable  PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
 %ifos darwin
    # Additional installation rules for Mac OSX
    addCMakeVariable  PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-v%{version}-source/Applications/ParaView-4.4.0_extra_install_Darwin.cmake
    # We activate the new Unix-style installation for Mac OS X
    addCMakeVariable PARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
    # Recent version of Mac OSX (Yosemite) cannot compile ParaView with the gcc compiler
    # Using clang instead
    CC=clang
    CXX=clang++
 %endif
    # Add the value of _qmakePath for QT_QMAKE_EXECUTABLE
    addCMakeVariable  QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath}
    echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
    mkdir -p ./buildObj
    cd ./buildObj
    cmake \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_installPrefix} \
        $CMAKE_VARIABLES \
 	..
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    # On OpenSUSE, rpmbuild, will choke when detecting unreferenced symlinks
    # created during installation.
    # Qt version 4.8.0 will generate some unreferenced symlinks when
    # ParaView is compiled and installed. By enabling the following
    # environment variable, the command brp-symlink will still complain
    # about missing link targets, but it won't stop rpmbuild from generating
    # the final rpm.
    # For all other Unix distros, this is a no-op.
    export NO_BRP_STALE_LINK_ERROR=yes
    cd buildObj
    make install DESTDIR=$RPM_BUILD_ROOT
 %ifos darwin
    # Cleaning up some strange install side effect from option
    # PARAVIEW_DO_UNIX_STYLE_INSTALLS
    # Need to revisit this section eventually.
    if [ -d "$RPM_BUILD_ROOT/$RPM_BUILD_ROOT" ]; then
        mv $RPM_BUILD_ROOT/$RPM_BUILD_ROOT/%{_installPrefix}/bin/* $RPM_BUILD_ROOT/%{_installPrefix}/bin
    fi
 %endif
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin
 export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib
 export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-5.5
 export PARAVIEW_VERSION=%{version}
 # NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
 #     Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
 #     specified directory to see if a given library is a paraview plugin.
 #     In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
 #     startup of paraview or even make paraview crash on startup.
 export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview-5.5_plugins
 [ -d \$PARAVIEW_LIB_DIR/paraview-5.5 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-5.5
 # Enable access to the package applications if present
 [ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
 # Additional binary path if running on Mac OS X
 [ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
 setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
 setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-5.5
 setenv PARAVIEW_VERSION %{version}
 # NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
 #     Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
 #     specified directory to see if a given library is a paraview plugin.
 #     In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
 #     startup of paraview or even make paraview crash on startup.
 setenv PV_PLUGIN_PATH \$FOAM_LIBBIN/paraview-5.5_plugins
 if ( -e \$PARAVIEW_BIN_DIR ) then
    _foamAddPath \$PARAVIEW_BIN_DIR
 endif
 if ( -e \$PARAVIEW_LIB_DIR/paraview-5.5 ) then
    _foamAddLib \$PARAVIEW_LIB_DIR/paraview-5.5
 endif
 # Additional binary path if running on Mac OS X
 if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then
    _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec
+++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec
@ -0,0 +1,205 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for PyFoam-0.6.6
 #
 # Description
 #     RPM spec file for PyFoam version 0.6.6
 #
 # Author:
 #     Martin Beaudoin (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		PyFoam
 %define release		1
 %define version 	0.6.6
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		PyFoam
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 BuildArch:              noarch
 URL:                    https://openfoamwiki.net/images/a/af/PyFoam-0.6.6.tar.gz
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/noarch
 %description
 %{summary}
 %prep
 %setup -q -n PyFoam-%{version}
 %build
    # Make the shebang line portable
    python setup.py build --executable "/usr/bin/env python"
 %install
    %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} |  awk -F \. {'print $1 "." $2'})
 	# Temporary settings for the installation
    mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages
    export PYTHONPATH=$RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages:$PYTHONPATH
    python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 # Enable access to the package applications if present
 [ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 if ! \$?PYTHONPATH then
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
 else
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 endif
 if ( -e \$PYFOAM_DIR/bin ) then
    _foamAddPath \$PYFOAM_DIR/bin
 endif
 if \$?PYFOAM_SITE_DIR then
    if ( -e \$PYFOAM_SITE_DIR/bin ) then
        _foamAddPath \$PYFOAM_SITE_DIR/bin
    endif
 endif
 DOT_CSH_EOF
 cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
 # In this version of the configuration script, the paths are hardcoded,
 # which makes it easier to load PyFoam without the foam-extend environment
 # variables
 #
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 # Enable access to the package applications if present
 [ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
 DOT_HARDCODED_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
 # In this version of the configuration script, the paths are hardcoded,
 # which makes it easier to load PyFoam without the foam-extend environment
 # variables
 #
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 if ! \$?PYTHONPATH then
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
 else
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 endif
 if ( -e \$PYFOAM_DIR/bin ) then
     _foamAddPath \$PYFOAM_DIR/bin
 endif
 if \$?PYFOAM_SITE_DIR then
    if ( -e \$PYFOAM_SITE_DIR/bin ) then
        _foamAddPath \$PYFOAM_SITE_DIR/bin
    endif
 endif
 DOT_HARDCODED_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec
+++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec
@ -0,0 +1,205 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for PyFoam-0.6.9
 #
 # Description
 #     RPM spec file for PyFoam version 0.6.9
 #
 # Author:
 #     Martin Beaudoin (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		PyFoam
 %define release		1
 %define version 	0.6.9
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		PyFoam
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 BuildArch:              noarch
 URL:                    https://files.pythonhosted.org/packages/78/f5/8f65b66c8ac0e5415f785809e182dd0f0dc562a42094e1a86bd22c7d7ece/PyFoam-0.6.9.tar.gz
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/noarch
 %description
 %{summary}
 %prep
 %setup -q -n PyFoam-%{version}
 %build
    # Make the shebang line portable
    python setup.py build --executable "/usr/bin/env python"
 %install
    %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} |  awk -F \. {'print $1 "." $2'})
 	# Temporary settings for the installation
    mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages
    export PYTHONPATH=$RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages:$PYTHONPATH
    python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 # Enable access to the package applications if present
 [ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 if ! \$?PYTHONPATH then
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
 else
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 endif
 if ( -e \$PYFOAM_DIR/bin ) then
    _foamAddPath \$PYFOAM_DIR/bin
 endif
 if \$?PYFOAM_SITE_DIR then
    if ( -e \$PYFOAM_SITE_DIR/bin ) then
        _foamAddPath \$PYFOAM_SITE_DIR/bin
    endif
 endif
 DOT_CSH_EOF
 cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
 # In this version of the configuration script, the paths are hardcoded,
 # which makes it easier to load PyFoam without the foam-extend environment
 # variables
 #
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 # Enable access to the package applications if present
 [ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
 DOT_HARDCODED_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
 # In this version of the configuration script, the paths are hardcoded,
 # which makes it easier to load PyFoam without the foam-extend environment
 # variables
 #
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
 if ! \$?PYTHONPATH then
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
 else
    setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
 endif
 if ( -e \$PYFOAM_DIR/bin ) then
     _foamAddPath \$PYFOAM_DIR/bin
 endif
 if \$?PYFOAM_SITE_DIR then
    if ( -e \$PYFOAM_SITE_DIR/bin ) then
        _foamAddPath \$PYFOAM_SITE_DIR/bin
    endif
 endif
 DOT_HARDCODED_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/cmake-3.11.4.spec
+++ b/ThirdParty/rpmBuild/SPECS/cmake-3.11.4.spec
@ -0,0 +1,166 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for cmake-3.11.4
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin, (2018)
 #     Pascal Beckstein, HZDR, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		cmake
 %define release		%{_WM_OPTIONS}
 %define version 	3.11.4
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		cmake
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:                    http://www.cmake.org/files/v3.3/
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 %description
 %{summary}
 %prep
 %setup -q
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 %ifos darwin
    # For Mac OSX:
    # The configuration of cmake will be using the environment variable MACOSX_DEPLOYMENT_TARGET.
    # This variable was initialized using 'sw_vers -productVersion' in etc/bashrc.
    # We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
    v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
    export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
    echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}"
    # Recent version of Mac OSX (Yosemite) cannot compile cmake when gcc is the compiler
    # Using clang instead
    CC=clang
    CXX=clang++
 %endif
    ./configure     \
        --prefix=%{_installPrefix}
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export CMAKE_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
 # Enable access to the runtime package applications
 [ -d \$CMAKE_BIN_DIR ] && _foamAddPath \$CMAKE_BIN_DIR
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv CMAKE_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv CMAKE_BIN_DIR \$CMAKE_DIR/bin
 if ( -e \$CMAKE_BIN_DIR ) then
    _foamAddPath \$CMAKE_BIN_DIR
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/hwloc-2.0.1.spec
@ -0,0 +1,149 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for hwloc-2.0.1
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		hwloc
 %define release		%{_WM_OPTIONS}
 %define version 	2.0.1
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		hwloc
 License: 		the New BSD license
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:            http://www.open-mpi.org/software/hwloc/v2.0/downloads/hwloc-2.0.1.tar.gz
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 %description
 %{summary}
 %prep
 %setup -q
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    ./configure     \
        --prefix=%{_installPrefix}
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export HWLOC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export HWLOC_BIN_DIR=\$HWLOC_DIR/bin
 # Enable access to the runtime package applications
 [ -d \$HWLOC_BIN_DIR ] && _foamAddPath \$HWLOC_BIN_DIR
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv HWLOC_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv HWLOC_BIN_DIR \$HWLOC_DIR/bin
 if ( -e \$HWLOC_BIN_DIR ) then
    _foamAddPath \$HWLOC_BIN_DIR
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec
@ -0,0 +1,175 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for mesquite-2.3.0
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin (2018)
 #
 # Contributor:
 #     Philippose Rajan : patch0 for gcc 4.6.x
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		mesquite
 %define release		%{_WM_OPTIONS}
 %define version 	2.3.0
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		mesquite
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:            https://software.sandia.gov/mesquite
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 %description
 %{summary}
 %prep
 %setup -q
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_FC" ]         &&  export FC="$WM_FC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_FCFLAGS" ]    &&  export FCFLAGS="$WM_FCFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    ./configure     \
    --prefix=%{_installPrefix}     \
    --libdir=%{_installPrefix}/lib \
 	--enable-release               \
 	--disable-debug-assertions     \
 	--enable-shared                \
 	--without-cppunit              \
 	--enable-trap-fpe              \
 	--disable-function-timers
    # Remove the file include/Mesquite_all_headers.hpp
    # This file will be regenerated during the compilation process
    [ -e include/Mesquite_all_headers.hpp ] && rm -f include/Mesquite_all_headers.hpp
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -mtune=native -fPIC"
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export MESQUITE_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export MESQUITE_BIN_DIR=\$MESQUITE_DIR/bin
 export MESQUITE_LIB_DIR=\$MESQUITE_DIR/lib
 export MESQUITE_INCLUDE_DIR=\$MESQUITE_DIR/include
 # Enable access to the package runtime applications and libraries
 [ -d \$MESQUITE_BIN_DIR ] && _foamAddPath \$MESQUITE_BIN_DIR
 [ -d \$MESQUITE_LIB_DIR ] && _foamAddLib  \$MESQUITE_LIB_DIR
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv MESQUITE_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv MESQUITE_BIN_DIR \$MESQUITE_DIR/bin
 setenv MESQUITE_LIB_DIR \$MESQUITE_DIR/lib
 setenv MESQUITE_INCLUDE_DIR \$MESQUITE_DIR/include
 if ( -e \$MESQUITE_BIN_DIR ) then
    _foamAddPath \$MESQUITE_BIN_DIR
 endif
 if ( -e \$MESQUITE_LIB_DIR ) then
    _foamAddLib \$MESQUITE_LIB_DIR
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec
@ -77,6 +77,7 @@ Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         metis-5.1.0_patch_gcc
 Patch1:         metis-5.1.0_patch_64Bit
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -90,6 +91,10 @@ Patch0:         metis-5.1.0_patch_gcc
 %patch0 -p1
 %endif
 if [ "$WM_LABEL_SIZE" = "64" ]; then
 %patch1 -p1
 fi
 %build
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
--- a/ThirdParty/rpmBuild/SPECS/openmpi-3.1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/openmpi-3.1.0.spec
@ -0,0 +1,264 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for openmpi-3.1.0
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		openmpi
 %define release		%{_WM_OPTIONS}
 %define version 	3.1.0
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		openmpi
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:                    http://www.open-mpi.org/software/ompi/v1.8/downloads
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 #--------------------------------------------------------------------------
 #
 # Here, we define default compiling options for openmpi
 #
 # One can override the option on the commande line : --define='MACRO EXPR'
 #
 %{!?_configureAdditionalArgs: %define _configureAdditionalArgs Undefined}
 %description
 %{summary}
 %prep
 %setup -q
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    set +x
    echo ""
    echo "Compilation options:"
    echo "     _configureAdditionalArgs : %{_configureAdditionalArgs}"
    echo ""
    set -x
    unset mpiWith
    # Enable GridEngine if it appears to be in use
    # If you don't want any integration with SGE, simply unset the SGE
    # environment variable
    if [ -n "$SGE_ROOT" ]
    then
        mpiWith="$mpiWith --with-sge"
    else
        mpiWith="$mpiWith --without-sge"
 	mpiWith="$mpiWith --enable-mca-no-build=ras-gridengine,pls-gridengine"
    fi
    # Infiniband support
    # Adjust according to your local paths
    # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ]
    # then
    #     mpiWith="$mpiWith --with-openib=/usr/local/ofed"
    #     mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64"
    # fi
    ./configure \
        --prefix=%{_installPrefix}  \
        --exec_prefix=%{_installPrefix}  \
        --enable-mpirun-prefix-by-default \
        --enable-orterun-prefix-by-default \
        --enable-shared \
        --enable-mpi-cxx \
        --disable-static \
 		--disable-mpi-fortran \
        --without-slurm \
 	`echo %{?_configureAdditionalArgs}`
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export OPENMPI_BIN_DIR=\$OPENMPI_DIR/bin
 export OPENMPI_LIB_DIR=\$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 [ -d \$OPENMPI_BIN_DIR ] && _foamAddPath \$OPENMPI_BIN_DIR
 [ -d \$OPENMPI_LIB_DIR ] && _foamAddLib  \$OPENMPI_LIB_DIR
 export MPI_HOME=\$OPENMPI_DIR
 export MPI_ARCH_PATH=\$MPI_HOME
 export OPAL_PREFIX=\$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
 export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
 export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 export PINC=\$OPENMPI_COMPILE_FLAGS
 export PLIBS=\$OPENMPI_LINK_FLAGS
 if [ "\$FOAM_VERBOSE" -a "\$PS1" ]
 then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 fi
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv OPENMPI_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv OPENMPI_BIN_DIR \$OPENMPI_DIR/bin
 setenv OPENMPI_LIB_DIR \$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 if ( -e \$OPENMPI_BIN_DIR ) then
    _foamAddPath \$OPENMPI_BIN_DIR
 endif
 if ( -e \$OPENMPI_LIB_DIR ) then
    _foamAddLib \$OPENMPI_LIB_DIR
 endif
 setenv MPI_HOME \$OPENMPI_DIR
 setenv MPI_ARCH_PATH \$MPI_HOME
 setenv OPAL_PREFIX \$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
 setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
 setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 setenv PINC "\$OPENMPI_COMPILE_FLAGS"
 setenv PLIBS "\$OPENMPI_LINK_FLAGS"
 if (\$?FOAM_VERBOSE && \$?prompt) then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/openmpi-3.1.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/openmpi-3.1.1.spec
@ -0,0 +1,267 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for openmpi-3.1.1
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		openmpi
 %define release		%{_WM_OPTIONS}
 %define version 	3.1.1
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		openmpi
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:                    http://www.open-mpi.org/software/ompi/v3.0/downloads
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:                 openmpi-3.1.1.patch
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 #--------------------------------------------------------------------------
 #
 # Here, we define default compiling options for openmpi
 #
 # One can override the option on the commande line : --define='MACRO EXPR'
 #
 %{!?_configureAdditionalArgs: %define _configureAdditionalArgs Undefined}
 %description
 %{summary}
 %prep
 %setup -q
 %patch0 -p1
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    set +x
    echo ""
    echo "Compilation options:"
    echo "     _configureAdditionalArgs : %{_configureAdditionalArgs}"
    echo ""
    set -x
    unset mpiWith
    # Enable GridEngine if it appears to be in use
    # If you don't want any integration with SGE, simply unset the SGE
    # environment variable
    if [ -n "$SGE_ROOT" ]
    then
        mpiWith="$mpiWith --with-sge"
    else
        mpiWith="$mpiWith --without-sge"
 	mpiWith="$mpiWith --enable-mca-no-build=ras-gridengine,pls-gridengine"
    fi
    # Infiniband support
    # Adjust according to your local paths
    # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ]
    # then
    #     mpiWith="$mpiWith --with-openib=/usr/local/ofed"
    #     mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64"
    # fi
    ./configure \
        --prefix=%{_installPrefix}  \
        --exec_prefix=%{_installPrefix}  \
        --enable-mpirun-prefix-by-default \
        --enable-orterun-prefix-by-default \
        --enable-shared \
        --enable-mpi-cxx \
        --disable-static \
 		--disable-mpi-fortran \
        --without-slurm \
 	`echo %{?_configureAdditionalArgs}`
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export OPENMPI_BIN_DIR=\$OPENMPI_DIR/bin
 export OPENMPI_LIB_DIR=\$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 [ -d \$OPENMPI_BIN_DIR ] && _foamAddPath \$OPENMPI_BIN_DIR
 [ -d \$OPENMPI_LIB_DIR ] && _foamAddLib  \$OPENMPI_LIB_DIR
 export MPI_HOME=\$OPENMPI_DIR
 export MPI_ARCH_PATH=\$MPI_HOME
 export OPAL_PREFIX=\$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
 export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
 export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 export PINC=\$OPENMPI_COMPILE_FLAGS
 export PLIBS=\$OPENMPI_LINK_FLAGS
 if [ "\$FOAM_VERBOSE" -a "\$PS1" ]
 then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 fi
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv OPENMPI_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv OPENMPI_BIN_DIR \$OPENMPI_DIR/bin
 setenv OPENMPI_LIB_DIR \$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 if ( -e \$OPENMPI_BIN_DIR ) then
    _foamAddPath \$OPENMPI_BIN_DIR
 endif
 if ( -e \$OPENMPI_LIB_DIR ) then
    _foamAddLib \$OPENMPI_LIB_DIR
 endif
 setenv MPI_HOME \$OPENMPI_DIR
 setenv MPI_ARCH_PATH \$MPI_HOME
 setenv OPAL_PREFIX \$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
 setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
 setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 setenv PINC "\$OPENMPI_COMPILE_FLAGS"
 setenv PLIBS "\$OPENMPI_LINK_FLAGS"
 if (\$?FOAM_VERBOSE && \$?prompt) then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/openmpi-4.0.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/openmpi-4.0.0.spec
@ -0,0 +1,267 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for openmpi-4.0.0
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		openmpi
 %define release		%{_WM_OPTIONS}
 %define version 	4.0.0
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 BuildRoot:	        %{buildroot}
 Summary: 		openmpi
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:                    http://www.open-mpi.org/software/ompi/v4.0/downloads
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:                 openmpi-4.0.0.patch
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 #--------------------------------------------------------------------------
 #
 # Here, we define default compiling options for openmpi
 #
 # One can override the option on the commande line : --define='MACRO EXPR'
 #
 %{!?_configureAdditionalArgs: %define _configureAdditionalArgs Undefined}
 %description
 %{summary}
 %prep
 %setup -q
 %patch0 -p1
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    set +x
    echo ""
    echo "Compilation options:"
    echo "     _configureAdditionalArgs : %{_configureAdditionalArgs}"
    echo ""
    set -x
    unset mpiWith
    # Enable GridEngine if it appears to be in use
    # If you don't want any integration with SGE, simply unset the SGE
    # environment variable
    if [ -n "$SGE_ROOT" ]
    then
        mpiWith="$mpiWith --with-sge"
    else
        mpiWith="$mpiWith --without-sge"
 	mpiWith="$mpiWith --enable-mca-no-build=ras-gridengine,pls-gridengine"
    fi
    # Infiniband support
    # Adjust according to your local paths
    # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ]
    # then
    #     mpiWith="$mpiWith --with-openib=/usr/local/ofed"
    #     mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64"
    # fi
    ./configure \
        --prefix=%{_installPrefix}  \
        --exec_prefix=%{_installPrefix}  \
        --enable-mpirun-prefix-by-default \
        --enable-orterun-prefix-by-default \
        --enable-shared \
        --enable-mpi-cxx \
        --disable-static \
 		--disable-mpi-fortran \
        --without-slurm \
 	`echo %{?_configureAdditionalArgs}`
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    make -j $WM_NCOMPPROCS
 %install
    make install DESTDIR=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export OPENMPI_BIN_DIR=\$OPENMPI_DIR/bin
 export OPENMPI_LIB_DIR=\$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 [ -d \$OPENMPI_BIN_DIR ] && _foamAddPath \$OPENMPI_BIN_DIR
 [ -d \$OPENMPI_LIB_DIR ] && _foamAddLib  \$OPENMPI_LIB_DIR
 export MPI_HOME=\$OPENMPI_DIR
 export MPI_ARCH_PATH=\$MPI_HOME
 export OPAL_PREFIX=\$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
 export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
 export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 export PINC=\$OPENMPI_COMPILE_FLAGS
 export PLIBS=\$OPENMPI_LINK_FLAGS
 if [ "\$FOAM_VERBOSE" -a "\$PS1" ]
 then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 fi
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv OPENMPI_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv OPENMPI_BIN_DIR \$OPENMPI_DIR/bin
 setenv OPENMPI_LIB_DIR \$OPENMPI_DIR/lib
 # Enable access to the package runtime applications and libraries
 if ( -e \$OPENMPI_BIN_DIR ) then
    _foamAddPath \$OPENMPI_BIN_DIR
 endif
 if ( -e \$OPENMPI_LIB_DIR ) then
    _foamAddLib \$OPENMPI_LIB_DIR
 endif
 setenv MPI_HOME \$OPENMPI_DIR
 setenv MPI_ARCH_PATH \$MPI_HOME
 setenv OPAL_PREFIX \$MPI_ARCH_PATH
 # We initialize the rest of the environment using mpicc --showme:
 setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
 setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
 setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
 # Set the foam-extend compilation flags
 setenv PINC "\$OPENMPI_COMPILE_FLAGS"
 setenv PLIBS "\$OPENMPI_LINK_FLAGS"
 if (\$?FOAM_VERBOSE && \$?prompt) then
    echo "  Environment variables defined for OpenMPI:"
    echo "    OPENMPI_BIN_DIR       : \$OPENMPI_BIN_DIR"
    echo "    OPENMPI_LIB_DIR       : \$OPENMPI_LIB_DIR"
    echo "    OPENMPI_INCLUDE_DIR   : \$OPENMPI_INCLUDE_DIR"
    echo "    OPENMPI_COMPILE_FLAGS : \$OPENMPI_COMPILE_FLAGS"
    echo "    OPENMPI_LINK_FLAGS    : \$OPENMPI_LINK_FLAGS"
    echo ""
    echo "    MPI_HOME              : \$MPI_HOME"
    echo "    MPI_ARCH_PATH         : \$MPI_ARCH_PATH"
    echo "    MPIRUN_OPTIONS        : \$MPIRUN_OPTIONS"
    echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
    echo "    PINC                  : \$PINC"
    echo "    PLIBS                 : \$PLIBS"
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec
+++ b/ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec
@ -78,6 +78,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         ParMetis-3.1.1.patch_darwin
 Patch1:         ParMetis-3.1.1.patch
 Patch2:         ParMetis-3.1.1.patch_64Bit
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -93,6 +94,10 @@ Patch1:         ParMetis-3.1.1.patch
 #patch1 -p1
 %endif
 if [ "$WM_LABEL_SIZE" = "64" ]; then
 %patch2 -p1
 fi
 %build
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
--- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-src-5.11.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-src-5.11.1.spec
@ -0,0 +1,198 @@
 #------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
 #     RPM spec file for qt-everywhere-src-5.11.1
 #
 # Description
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
 #     Martin Beaudoin, (2018)
 #
 #------------------------------------------------------------------------------
 # We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
 %{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
 %{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
 # Disable the generation of debuginfo packages
 %define debug_package %{nil}
 # The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
 %define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
 %define _tmppath	%{_topdir}/tmp
 # Will install the package directly $WM_THIRD_PARTY_DIR
 #   Some comments about package relocation:
 #   By using this prefix for the Prefix:  parameter in this file, you will make this
 #   package relocatable.
 #
 #   This is fine, as long as your software is itself relocatable.
 #
 #   Simply take note that libraries built with libtool are not relocatable because the
 #   prefix we specify will be hard-coded in the library .la files.
 #   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
 #
 #   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
 #   not be able to reutilize this RPM, even though it is relocatable. You will need to
 #   regenerate the RPM.
 #
 %define _prefix         %{_WM_THIRD_PARTY_DIR}
 %define name		qt-everywhere-src
 %define release		%{_WM_OPTIONS}
 %define version 	5.11.1
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 %define _unpackaged_files_terminate_build  0
 %define _missing_doc_files_terminate_build 0
 BuildRoot:	        %{buildroot}
 Summary: 		qt-everywhere-src
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
 URL:            http://download.qt.io/archive/qt/5.11/5.11.1/single
 Source: 		%url/%{name}-%{version}.tar.xz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 %description
 %{summary}
 %prep
 %setup -q
 %build
    # export WM settings in a form that GNU configure recognizes
    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
    # The configure options are taken from the QT5 configuration
    # of the ParaView-Superbuild
    ./configure              \
 	-opensource          \
 	-confirm-license     \
        -release             \
 	-skip qtconnectivity \
 	-skip qtgamepad      \
 	-skip qtlocation     \
 	-skip qtmultimedia   \
 	-skip qtsensors      \
 	-skip qtserialport   \
 	-skip qtwayland      \
 	-skip qtwebchannel   \
 	-skip qtwebengine    \
 	-skip qtwebsockets   \
 	-nomake examples     \
 	-nomake tests        \
 	-no-dbus             \
 	-qt-libjpeg          \
 	-qt-pcre             \
 	-system-zlib         \
 	-no-openssl          \
 	-skip qtsvg          \
 	-qt-xcb              \
 	-system-libpng       \
 	-fontconfig          \
        -prefix %{_installPrefix}
    # Explicitely specify LD_LIBRARY_PATH so it can find QT own libraries
    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/lib
    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
    # On a computer with limited memory, say less than 4 GB, you may need to compile 
    # with only one parallel job to avoid running out of memory. 
    # So make sure to adjust $WM_NCOMPPROCS accordingly
    make -j $WM_NCOMPPROCS
 %install
    # Makefiles generated by qmake do not to support the DESTDIR= option
    # We need to use the INSTALL_ROOT= option instead
    # Somehow, we need to clean up for the RPM to install properly
    rm -rf %{_installPrefix}
    make install INSTALL_ROOT=$RPM_BUILD_ROOT
    # Creation of foam-extend specific .csh and .sh files"
    echo ""
    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
    echo ""
    #
    # Generate package specific .sh file for foam-extend
    #
 mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
 cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export QT_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export QT_BIN_DIR=\$QT_DIR/bin
 export QT_LIB_DIR=\$QT_DIR/lib
 # Enable access to the runtime package applications
 [ -d \$QT_BIN_DIR ] && _foamAddPath \$QT_BIN_DIR
 [ -d \$QT_LIB_DIR ] && _foamAddLib  \$QT_LIB_DIR
 DOT_SH_EOF
    #
    # Generate package specific .csh file for foam-extend
    #
 cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
 # Load %{name}-%{version} libraries and binaries if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv QT_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv QT_BIN_DIR \$QT_DIR/bin
 setenv QT_LIB_DIR \$QT_DIR/lib
 if ( -e \$QT_BIN_DIR ) then
    _foamAddPath \$QT_BIN_DIR
 endif
 if ( -e \$QT_LIB_DIR ) then
    _foamAddLib \$QT_LIB_DIR
 endif
 DOT_CSH_EOF
    #finally, generate a .tgz file for systems where using rpm for installing packages
    # as a non-root user might be a problem.
    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
 %clean
 rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %{_installPrefix}
--- a/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
+++ b/ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
@ -77,6 +77,7 @@ Prefix: 		%{_prefix}
 Group: 			Development/Tools
 Patch0:         scotch-6.0.4_patch_0
 Patch1:         scotch-6.0.4_patch_darwin
 Patch2:         scotch-6.0.4_patch_64Bit
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -92,6 +93,10 @@ Patch1:         scotch-6.0.4_patch_darwin
 %patch0 -p1
 %endif
 if [ "$WM_LABEL_SIZE" = "64" ]; then
 %patch2 -p1
 fi
 %build
    # export WM settings in a form that GNU configure recognizes
   # [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
--- a/ThirdParty/tools/makeThirdPartyFunctionsForRPM
+++ b/ThirdParty/tools/makeThirdPartyFunctionsForRPM
@ -123,7 +123,13 @@ rpm_make()
            if [ ! -e "SOURCES/$packageTarBall" ]; then
 				echo "Download $packageTarBall from : $_PACKAGE_URL"
 				#( cd SOURCES; wget --no-check-certificate $_PACKAGE_URL )
-		( cd SOURCES; curl -L -k -O $_PACKAGE_URL )
+
 				( cd SOURCES; curl --connect-timeout 60 \
 								   --max-time 3600 \
 								   --retry 6 \
 								   --retry-delay 10 \
 								   --retry-max-time 60 \
 								   -L -k -O $_PACKAGE_URL )
            fi
 	fi
@ -284,22 +290,42 @@ uninstallPackage()
    pkg="$1";
    echo "Removing ${pkg}"
-    [ -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm ] && \
+    if [[ -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}-$WM_OPTIONS.$architecture.rpm ]]; then
-      rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm || \
+		rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}-$WM_OPTIONS.$architecture.rpm
 	else
 		echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm"
-    [ -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz ] && \
+	fi
-      rm -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz || \
+
 	if [[ -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz ]]; then
 		rm -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz
 	else
 		echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz"
-    [ -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz ] && \
+	fi
-      rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz || \
+
    if [[ -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz ]]; then
 		rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz
 	else
 		echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz"
-    [ -d $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* ] && \
+	fi
-      rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* || \
+
 	foundDir=false
 	for dir_ in $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*
 	do
 		if [[ -d "$dir_" ]]; then
 			rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*
 			foundDir=true
 		fi
 	done
 	if [ "$foundDir" = false ] ; then
 		echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*"
-    if [ "$2" = "alsoPackage" ]; then
+	fi
-      [ -d $WM_THIRD_PARTY_DIR/packages/$pkg ] && \
+
-        rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg || \
+    if [[ "$2" = "alsoPackage" ]]; then
      if [[ -d $WM_THIRD_PARTY_DIR/packages/$pkg ]]; then
          rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg
 	  else
          echo "Not found: $WM_THIRD_PARTY_DIR/packages/$pkg"
 		  fi
    else
        echo "Add option alsoPackage to remove the installed files."
    fi
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@ -0,0 +1,34 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 add_subdirectory(utilities)
 add_subdirectory(solvers)
--- a/applications/solvers/CMakeLists.txt
+++ b/applications/solvers/CMakeLists.txt
@ -0,0 +1,54 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 add_subdirectory(engine)
 add_subdirectory(solidMechanics)
 add_subdirectory(multiphase)
 add_subdirectory(lagrangian)
 add_subdirectory(financial)
 add_subdirectory(discreteMethods)
 add_subdirectory(coupled)
 add_subdirectory(compressible)
 add_subdirectory(multiSolver)
 add_subdirectory(incompressible)
 add_subdirectory(equationReaderDemo)
 add_subdirectory(heatTransfer)
 add_subdirectory(electromagnetics)
 add_subdirectory(combustion)
 add_subdirectory(finiteArea)
 add_subdirectory(DNS)
 add_subdirectory(basic)
 add_subdirectory(immersedBoundary)
 add_subdirectory(surfaceTracking)
 add_subdirectory(viscoelastic)
 add_subdirectory(overset)
--- a/applications/solvers/DNS/CMakeLists.txt
+++ b/applications/solvers/DNS/CMakeLists.txt
@ -0,0 +1,33 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 add_subdirectory(dnsFoam)
--- a/applications/solvers/DNS/dnsFoam/CMakeLists.txt
+++ b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  dnsFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(dnsFoam
  DEPENDS randomProcesses
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/CMakeLists.txt
+++ b/applications/solvers/basic/CMakeLists.txt
@ -0,0 +1,38 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 add_subdirectory(laplacianFoam)
 add_subdirectory(scalarTransportFoam)
 add_subdirectory(potentialFoam)
 add_subdirectory(PODSolver)
 add_subdirectory(potentialDyMFoam)
 add_subdirectory(sixDOFSolver)
--- a/applications/solvers/basic/PODSolver/CMakeLists.txt
+++ b/applications/solvers/basic/PODSolver/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  PODSolver.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(PODSolver
  DEPENDS POD
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/PODSolver/PODSolver.C
+++ b/applications/solvers/basic/PODSolver/PODSolver.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/laplacianFoam/CMakeLists.txt
+++ b/applications/solvers/basic/laplacianFoam/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  laplacianFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(laplacianFoam
  DEPENDS finiteVolume
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt
+++ b/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  potentialDyMFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(potentialDyMFoam
  DEPENDS dynamicFvMesh
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
+++ b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/potentialFoam/CMakeLists.txt
+++ b/applications/solvers/basic/potentialFoam/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  potentialFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(potentialFoam
  DEPENDS finiteVolume
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
+++ b/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  scalarTransportFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(scalarTransportFoam
  DEPENDS finiteVolume
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/basic/sixDOFSolver/CMakeLists.txt
+++ b/applications/solvers/basic/sixDOFSolver/CMakeLists.txt
@ -0,0 +1,46 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  sixDOFSolver.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(sixDOFSolver
  DEPENDS meshTools ODE
  SOURCES ${SOURCES}
 )
--- a/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C
+++ b/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/CMakeLists.txt
+++ b/applications/solvers/combustion/CMakeLists.txt
@ -0,0 +1,41 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 add_subdirectory(coldEngineFoam)
 add_subdirectory(dieselEngineFoam)
 add_subdirectory(XiFoam)
 add_subdirectory(PDRFoam)
 add_subdirectory(fireFoam)
 add_subdirectory(engineFoam)
 add_subdirectory(reactingFoam)
 add_subdirectory(dieselFoam)
 add_subdirectory(rhoReactingFoam)
--- a/applications/solvers/combustion/PDRFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
@ -0,0 +1,76 @@
 # --------------------------------------------------------------------------
 #   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
 #      \/     M anipulation  | For copyright notice see file Copyright
 # --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
 #     Free Software Foundation, either version 3 of the License, or (at your
 #     option) any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #     General Public License for more details.
 #
 #     You should have received a copy of the GNU General Public License
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
 #     CMakeLists.txt file for libraries and applications
 #
 # Author
 #     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
 # --------------------------------------------------------------------------
 list(APPEND SOURCES
  XiModels/XiModel/XiModel.C
  XiModels/XiModel/newXiModel.C
  XiModels/fixed/fixed.C
  XiModels/algebraic/algebraic.C
  XiModels/transport/transport.C
  XiModels/XiEqModels/XiEqModel/XiEqModel.C
  XiModels/XiEqModels/XiEqModel/newXiEqModel.C
  XiModels/XiEqModels/Gulder/Gulder.C
  XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
  XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
  XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
  XiModels/XiGModels/XiGModel/XiGModel.C
  XiModels/XiGModels/XiGModel/newXiGModel.C
  XiModels/XiGModels/KTS/KTS.C
  XiModels/XiGModels/instabilityG/instabilityG.C
  PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
  PDRModels/dragModels/PDRDragModel/PDRDragModel.C
  PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
  PDRModels/dragModels/basic/basic.C
  PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
  PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
  laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
  PDRFoam.C
 )
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
  cmake_minimum_required(VERSION 2.8)
  find_package(FOAM REQUIRED)
 endif()
 add_foam_executable(PDRFoam
  DEPENDS engine compressibleRASModels laminarFlameSpeedModels dynamicFvMesh
  SOURCES ${SOURCES}
 )
 target_include_directories(PDRFoam PUBLIC
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiModel>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiEqModels/XiEqModel>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiGModels/XiGModel>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PDRModels/dragModels/PDRDragModel>
  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/laminarFlameSpeed/SCOPE>
 )
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/StCourantNo.H
+++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/rhoEqn.H
+++ b/applications/solvers/combustion/PDRFoam/rhoEqn.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/applications/solvers/combustion/PDRFoam/setDeltaT.H
+++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H
@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
  =========                 |
  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     4.0
+   \\    /   O peration     | Version:     4.1
    \\  /    A nd           | Web:         http://www.foam-extend.org
     \\/     M anipulation  | For copyright notice see file Copyright
 -------------------------------------------------------------------------------
--- a/Show more
+++ b/Show more