CONFIG: update versions

|       v2306       |       v2312       |   comment     |
|-------------------|-------------------|---------------|
| ADIOS2-2.8.3      | ADIOS2-2.9.2      | updates       |
| ParaView-v5.11.1  | ParaView-v5.11.2  | bugfix        |

Allwmake

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2020 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -48,7 +48,10 @@ echo Build MPI libraries if required
 echo "    $MPI_ARCH_PATH"
 case "$WM_MPLIB" in
 (OPENMPI | MPICH)
-    ./make"$WM_MPLIB" -test "$MPI_ARCH_PATH" || ./make"$WM_MPLIB"
+    if ! ./make"$WM_MPLIB" -test "$MPI_ARCH_PATH"
+    then
+        ./make"$WM_MPLIB"
+    fi
     ;;
 esac
 

BUILD.md

@@ -588,6 +588,12 @@ easier to use `grep` and find the relevant pages and links.
 [link zlib]:      https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.xz
 
 
+<!-- profilint -->
+
+[link extrae]:     https://github.com/bsc-performance-tools/extrae/archive/refs/tags/4.0.6.tar.gz
+[link libunwind]:  https://github.com/libunwind/libunwind/releases/download/v1.7.2/libunwind-1.7.2.tar.gz
+[link papi]:       http://icl.utk.edu/projects/papi/downloads/papi-7.0.1.tar.gz
+
 <!-- Visualization -->
 
 [page ParaView]:  http://www.paraview.org/
@@ -597,7 +603,8 @@ easier to use `grep` and find the relevant pages and links.
 [link ParaView58]: http://www.paraview.org/files/v5.8/ParaView-v5.8.1.tar.xz
 [link ParaView59]: http://www.paraview.org/files/v5.9/ParaView-v5.9.1.tar.xz
 [link ParaView510]: http://www.paraview.org/files/v5.10/ParaView-v5.10.1.tar.xz
-[link ParaView]:   http://www.paraview.org/files/v5.11/ParaView-v5.11.1.tar.xz
+[link ParaView511]: http://www.paraview.org/files/v5.11/ParaView-v5.11.1.tar.xz
+[link ParaView]:   http://www.paraview.org/files/v5.11/ParaView-v5.11.2.tar.xz
 
 [page mesa]:  http://mesa3d.org/
 [link mesa]:  ftp://ftp.freedesktop.org/pub/mesa/mesa-17.1.1.tar.xz

SOURCES.md

@@ -1,5 +1,17 @@
 Third-party software (shipped) versions according to OpenFOAM version
 
+# OpenFOAM-2312
+
+- ADIOS2-2.9.2       *update*
+- CGAL-4.14.3
+- ParaView-v5.11.2   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.15
+
+
 # OpenFOAM-2306
 
 - ADIOS2-2.8.3

etc/tools/CMakeFunctions

@@ -0,0 +1,57 @@
+#---------------------------------*- sh -*-------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+# File
+#     etc/tools/CMakeFunction
+#
+# Description
+#     CMake make/install helper functions
+#
+#------------------------------------------------------------------------------
+
+# Variables referenced by the functions. Initialization at the end of the file.
+unset CMAKE_VARIABLES
+unset withVERBOSE
+BUILD_TYPE=Release  # The cmake build type
+
+#------------------------------------------------------------------------------
+
+#
+# Set CMake cache variables.
+# Automatically adds -D prefix it needed
+#
+addCMakeVariable()
+{
+    local i
+    for i
+    do
+        case "$i" in
+        ('') ;;  # empty
+        (-*) CMAKE_VARIABLES="${CMAKE_VARIABLES} ${i}" ;;
+        (*)  CMAKE_VARIABLES="${CMAKE_VARIABLES} -D${i}" ;;
+        esac
+    done
+}
+
+#
+# Verbose makefiles
+#
+addVerbosity()
+{
+    if [ "${withVERBOSE:=false}" = true ]
+    then
+        addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
+    fi
+}
+
+
+#------------------------------------------------------------------------------

etc/tools/ParaViewFunctions

@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -16,6 +16,7 @@
 #
 # Description
 #     ParaView make/install helper functions
+#     To be loaded *after* etc/tools/CMakeFunctions
 #
 # Note
 #     Obtaining paths via 'python-config' may not always resolve properly:
@@ -132,23 +133,8 @@ setParaViewVersion()
 
 #------------------------------------------------------------------------------
 
-#
-# Set CMake cache variables.
-# Automatically adds -D prefix it needed
-#
-addCMakeVariable()
-{
-    local i
-    for i
-    do
-        case "$i" in
-        ('') ;;  # empty
-        (-*) CMAKE_VARIABLES="${CMAKE_VARIABLES} ${i}" ;;
-        (*)  CMAKE_VARIABLES="${CMAKE_VARIABLES} -D${i}" ;;
-        esac
-    done
-}
-
+# addCMakeVariable : defined in etc/tools/CMakeFunctions
+# addVerbosity : defined in etc/tools/CMakeFunctions
 
 #
 # General settings (version-dependent)
@@ -165,18 +151,6 @@ addGeneral()
 }
 
 
-#
-# Verbose makefiles
-#
-addVerbosity()
-{
-    if [ "${withVERBOSE:=false}" = true ]
-    then
-        addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
-    fi
-}
-
-
 #
 # MPI support for PARAVIEW
 #

etc/tools/vtkFunctions

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -15,7 +15,7 @@
 #
 # Description
 #     VTK (library) make/install helper functions.
-#     To be loaded *after* etc/tools/ParaViewFunctions
+#     To be loaded *after* etc/tools/CMakeFunctions, ParaViewFunctions
 #
 #------------------------------------------------------------------------------
 

makeAdios2

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2021 OpenCFD Ltd.
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -59,6 +59,7 @@ then
     }
 fi
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
 #------------------------------------------------------------------------------
 # Obtain version from OpenFOAM etc/config.sh file:
 _foamConfig adios2
@@ -82,6 +83,7 @@ options:
   -gcc              Force use of gcc/g++
   -cmake PATH       With cmake from the given path
   -mpi-home PATH    With hint for MPI_HOME
+  -DNAME=VALUE      add cmake variable
   -list             List available unpacked source versions
   -help             Display usage help
 
@@ -124,6 +126,9 @@ do
     adios2-[0-9]* | adios2-git* | adios-[0-9]* | adios-git*)
         PACKAGE="${1%%/}"
         ;;
+    -D[A-Z]*=* | [A-Z]*=*)  # cmake variables
+        addCMakeVariable "$1"
+        ;;
     *)
         die "unknown option/argument: '$1'"
         ;;

makeParaView

@@ -36,6 +36,7 @@ then
     }
 fi
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ParaViewFunctions
 #------------------------------------------------------------------------------
 

makeVTK

@@ -6,7 +6,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -37,6 +37,7 @@ then
     }
 fi
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ThirdPartyFunctions
+. "${WM_THIRD_PARTY_DIR:?}"/etc/tools/CMakeFunctions
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/ParaViewFunctions
 . "${WM_THIRD_PARTY_DIR:?}"/etc/tools/vtkFunctions
 #------------------------------------------------------------------------------