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

@@ -431,7 +431,7 @@ you may have additional hurdles to using the newest versions of clang.
 |-----------------------|------------------------
 | [openmpi][page openmpi] | [download][link openmpi]. ***Some openmpi2/openmpi3 versions exhibit [stability issues](https://github.com/open-mpi/ompi/issues/5375)***
 | [adios][page adios]   | [repo][repo adios] or [github download][link adios]
-| [scotch, ptscotch][page scotch] | [repo][repo scotch] or [download][link scotch] or [older][older scotch] or [even older][oldest scotch]
+| [scotch, ptscotch][page scotch] | [repo][repo scotch] or [download][link scotch] or [older][older scotch]
 | [kahip][page kahip] | [download][link kahip] or [older][older kahip]
 | [metis][page metis] | [download][link metis]
 
@@ -452,14 +452,16 @@ The minimum CMake requirements for building various components.
 2.8         llvm-3.4.2
 2.8.11      CGAL-4.9
 2.8.11      CGAL-4.11
+3.1         CGAL-4.12 -> CGAL-4.14.3
 2.8.12.2    llvm-3.7.0
 2.8.12.2    llvm-3.8.0
 2.8.4       cmake-3.6.0
 3.3         ParaView-5.6.3
 3.10        ParaView-5.7.0 - ParaView-5.8.0
+3.12 - 3.16 ParaView-5.9.0 - ParaView-5.10.1
 3.4.3       llvm-3.9.1
 3.4.3       llvm-4.0.0 - llvm-6.0.0
-3.6         ADIOS2
+3.12        ADIOS2
 ```
 
 ### GCC Minimum Requirements <a name="min-gcc"></a>
@@ -524,21 +526,23 @@ easier to use `grep` and find the relevant pages and links.
 <!-- parallel -->
 [page adios]:     https://csmd.ornl.gov/software/adios2
 [repo adios]:     https://github.com/ornladios/ADIOS2
-[link adios]:     https://github.com/ornladios/ADIOS2/archive/v2.7.1.tar.gz
+[link adios]:     https://github.com/ornladios/ADIOS2/archive/v2.8.3.tar.gz
 
 [page zfp]:       http://computation.llnl.gov/projects/floating-point-compression/zfp-versions
 
 [page scotch]:    https://www.labri.fr/perso/pelegrin/scotch/
 [repo scotch]:    https://gitlab.inria.fr/scotch/scotch
-[link scotch]:    https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[link scotch]:    https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.3/scotch-v6.1.3.tar.gz
 [link scotch60_10]:  https://gforge.inria.fr/frs/download.php/file/38350/scotch_6.0.10.tar.gz
 [link scotch60_9]:   https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz
-[older scotch]:   https://gforge.inria.fr/frs/download.php/file/38114/scotch_6.0.8.tar.gz
-[oldest scotch]:  https://gforge.inria.fr/frs/download.php/file/37622/scotch_6.0.6.tar.gz
+[link scotch61_0]:   https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[link scotch61_3]:   https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.3/scotch-v6.1.3.tar.gz
+[older scotch]:   https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz
+[newer scotch]:   https://gitlab.inria.fr/scotch/scotch/-/archive/v7.0.1/scotch-v7.0.1.tar.gz
 
 [page kahip]:     http://algo2.iti.kit.edu/documents/kahip/
-[older kahip]:    http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.12.tar.gz
-[link kahip]:     https://github.com/KaHIP/KaHIP/archive/v3.14.tar.gz
+[older kahip]:    https://github.com/KaHIP/KaHIP/archive/v3.14.tar.gz
+[link kahip]:     https://github.com/KaHIP/KaHIP/archive/v3.15.tar.gz
 
 [page metis]:     http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 [link metis]:     http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
@@ -567,15 +571,15 @@ easier to use `grep` and find the relevant pages and links.
 [link FFTW]:      http://www.fftw.org/fftw-3.3.10.tar.gz
 
 [page petsc]:     https://www.mcs.anl.gov/petsc/
-[link petsc]:     https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.16.2.tar.gz
+[link petsc]:     https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.19.2.tar.gz
 
 [page hypre]:     https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/
 [repo hypre]:     https://github.com/hypre-space/hypre/
-[link hypre]:     https://github.com/hypre-space/hypre/archive/v2.23.0.tar.gz
+[link hypre]:     https://github.com/hypre-space/hypre/archive/v2.28.0.tar.gz
 
 [page cgns]:      http://cgns.github.io/
 [link ccmio]:     http://portal.nersc.gov/project/visit/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
-[altlink ccmio]:  http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz (check usage conditions)
+[altlink ccmio]:  https://sourceforge.net/projects/foam-extend/files/ThirdParty/libccmio-2.6.1.tar.gz (check usage conditions)
 
 [repo gperftools]: https://github.com/gperftools/gperftools
 [link gperftools]: https://github.com/gperftools/gperftools/releases/download/gperftools-2.5/gperftools-2.5.tar.gz
@@ -584,17 +588,23 @@ 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/
 [download ParaView]: https://www.paraview.org/download/
-[link ParaView54]: http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz
-[link ParaView55]: http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.xz
 [link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.xz
 [link ParaView57]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.xz
 [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 ParaView]:   http://www.paraview.org/files/v5.10/ParaView-v5.10.0.tar.xz
+[link ParaView510]: http://www.paraview.org/files/v5.10/ParaView-v5.10.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
@@ -608,4 +618,4 @@ easier to use `grep` and find the relevant pages and links.
 
 ---
 
-Copyright 2016-2021 OpenCFD Ltd
+Copyright 2016-2023 OpenCFD Ltd

Requirements.md

@@ -32,7 +32,7 @@ sudo apt install cmake qtbase5-dev qttools5-dev qttools5-dev-tools libqt5opengl5
 ```
 
 
-### openSUSE (eg, Leap-15.2)
+### openSUSE (eg, Leap-15.3)
 
 The full dependency list for building ParaView can be found from the
 corresponding [rpm spec][suse spec] file.
@@ -50,6 +50,19 @@ sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel
 sudo zypper install libxcb-devel libXt-devel
 ```
 
+For building paraview with ffmpeg support (components: avformat
+avcodec avutil swscale), the packman repository may be required, with a
+variety of additional packages:
+```
+sudo zypper install ffmpeg-3
+sudo zypper install ffmpeg-3-libavcodec-devel
+sudo zypper install ffmpeg-3-libavformat-devel
+sudo zypper install ffmpeg-3-libavresample-devel
+sudo zypper install ffmpeg-3-libavutil-devel
+sudo zypper install ffmpeg-3-libswresample-devel
+sudo zypper install ffmpeg-3-libswscale-devel
+```
+
 
 <!-- Quick links -->
 
@@ -70,4 +83,4 @@ sudo zypper install libxcb-devel libXt-devel
 [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md
 
 ---
-Copyright 2019-2021 OpenCFD Ltd
+Copyright 2019-2022 OpenCFD Ltd

SOURCES.md

@@ -1,5 +1,53 @@
 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
+- CGAL-4.14.3
+- ParaView-v5.11.1   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.15         *update*
+
+
+# OpenFOAM-2212
+
+- ADIOS2-2.8.3       *new*
+- CGAL-4.14.3
+- ParaView-v5.11.0   *new*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.14
+
+
+# OpenFOAM-2206
+
+- ADIOS2-2.7.1
+- CGAL-4.14.3
+- ParaView-v5.10.1   *update*
+- boost_1_74_0
+- fftw-3.3.10
+- openmpi-4.1.2
+- scotch_6.1.0
+- kahip-3.14
+
+
 # OpenFOAM-2112
 
 - ADIOS2-2.7.1       *new*

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

@@ -60,7 +60,9 @@ MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
 
-LEX         = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
-YACC        = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

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

@@ -26,7 +26,8 @@ OBJ         = .o
 # Separate the cross-compilation flags from regular CFLAGS to ensure that
 # system gcc does not use them for the scotch build toolchain
 
-CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
+# cross-compile broken for scotch-v7
+CFLAGS_CROSS = -DCOMMON_STUB_FORK -DCOMMON_WINDOWS
 
 # Flags for including windows MPI information (MSMPI)
 CFLAGS_WINMPI = -I$(MPI_ARCH_PATH)/include \
@@ -76,7 +77,9 @@ MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
 
-LEX         = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
-YACC        = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

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

@@ -60,7 +60,9 @@ MKDIR       = mkdir
 MV          = mv
 RANLIB      = echo
 
-LEX         = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
-YACC        = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+FLEX        = flex "-Pscotchyy$(SCOTCH_NAME_SUFFIX)" -olex.yy.c
+BISON       = bison "-pscotchyy$(SCOTCH_NAME_SUFFIX)" -y -b y
+LEX         = $(FLEX)
+YACC        = $(BISON)
 
 #------------------------------------------------------------------------------

etc/patches/scotch-v7.0.1

@@ -0,0 +1,48 @@
+--- scotch_6.0.6/src/libscotch/Makefile.orig	2019-04-29 14:59:53.957103493 +0200
++++ scotch_6.0.6/src/libscotch/Makefile	2019-04-29 18:50:42.560080675 +0200
+@@ -51,6 +51,12 @@
+ 
+ .PHONY				:	ptscotch	scotch	ptinstall	install	clean	realclean
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	libscotch$(LIB) scotch.h
++
++endif
++
+ scotch				:
+ 					$(MAKE) CC="$(CCS)" CCD="$(CCS)"	\
+ 					scotch.h				\
+@@ -438,6 +444,11 @@
+ 			wgraph_part_zr$(OBJ)  			\
+ 			wgraph_store$(OBJ)
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++## Add into libscotch instead of having a separate library
++LIBSCOTCHDEPS += library_error_exit$(OBJ)
++endif
++
+ ##
+ ##  Todo list.
+ ##
+--- scotch_6.0.6/src/Makefile.orig	2018-07-14 17:24:49.000000000 +0200
++++ scotch_6.0.6/src/Makefile	2019-04-29 18:39:16.365132864 +0200
+@@ -89,9 +89,18 @@
+ $(mandir)/man1			:	$(mandir)
+ 					-$(MKDIR) $(mandir)/man1
+ 
++ifeq ($(WM_OSTYPE),MSwindows)
++
++libscotch			:	required
++					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) libscotch && $(MAKE) install)
++
++else
++
+ libscotch			:	required
+ 					(cd libscotch ;      $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 
++endif
++
+ scotch				:	libscotch
+ 					(cd scotch ;         $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install)
+ 					(cd libscotchmetis ; $(MAKE)                                                                scotch && $(MAKE) install)

etc/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'"
         ;;

makeCGAL

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2012-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -472,7 +472,7 @@ fi
 
 CGAL_SOURCE="$(findSourceDir "$CGAL_PACKAGE")"
 CGAL_PACKAGE="$(basename "$CGAL_PACKAGE")"
-CGAL_PREFIX="$installBASE$WM_SIZE_OPTIONS/$CGAL_PACKAGE"
+CGAL_PREFIX="$installBASE/$CGAL_PACKAGE"
 
 # Override as per config file (if any)
 [ -n "$CGAL_ARCH_PATH" ] && CGAL_PREFIX="$CGAL_ARCH_PATH"

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
 #------------------------------------------------------------------------------
 

makeParaView.example

@@ -3,6 +3,8 @@
 # - mpi (0 = no upper-limit on processes)
 # - mesa
 # - python (required for Catalyst)
+# - has VTK_PYTHON_OPTIONAL_LINK=OFF to avoid
+#       undefined symbol: PyExc_ValueError
 #
 # NOTE: must modify etc/config.*/paraview to use this particular version
 # and combination, or use chaining as per etc/config.*/example/paraview
@@ -18,6 +20,8 @@ set -x
     -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
     -python \
     -suffix mesa-mpi-py \
+    -DPARAVIEW_ENABLE_FFMPEG=ON \
+    -DVTK_PYTHON_OPTIONAL_LINK=OFF \
     "$@"
 
 #------------------------------------------------------------------------------

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
 #------------------------------------------------------------------------------

minCmake

@@ -68,7 +68,7 @@ $(
     for dir in sources/*
     do
         [ -d "$dir" ] || continue
-        ## echo "search <$dir>" 1>&2
+        echo "search <$dir>" 1>&2
         depth=1
         # Is sources/pkg/pkg-version ?
         if [ "$(echo "$dir" | sed -e 's#.*/[a-z][a-z]*##' | wc -w)" = 0 ]