From cd853a62704156d9fa7cf8479193bc55910a589b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 31 May 2021 20:22:06 +0200 Subject: [PATCH] DOC: update requirements and version information --- BUILD.md | 22 +++++++++--------- Requirements.md | 13 ++++++----- SOURCES.txt | 13 +++++++++++ etc/patches/scotch_6.1.0 | 48 ++++++++++++++++++++++++++++++++++++++++ makePETSC | 11 +++++++-- 5 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 etc/patches/scotch_6.1.0 diff --git a/BUILD.md b/BUILD.md index c56666b..a645874 100644 --- a/BUILD.md +++ b/BUILD.md @@ -441,7 +441,7 @@ you may have additional hurdles to using the newest versions of clang. | Name | Location |-----------------------|------------------------ | [MESA][page mesa] | [download][link mesa] or [older 13][link mesa13], [older 11][link mesa11] -| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56], [paraview-55][link ParaView55] or [binaries][download ParaView] +| [ParaView][page ParaView] | [download][link ParaView] or older [paraview-56][link ParaView56] or [binaries][download ParaView] | [Qt][page Qt] | [QT5][link Qt5] for ParaView-5.3.0 and later, or the [older qt-56][link Qt56] for older systems. @@ -530,9 +530,9 @@ easier to use `grep` and find the relevant pages and links. [page scotch]: https://www.labri.fr/perso/pelegrin/scotch/ [repo scotch]: https://gitlab.inria.fr/scotch/scotch -[link scotch61]: https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz +[link scotch]: https://gforge.inria.fr/frs/download.php/file/38352/scotch_6.1.0.tar.gz [link scotch60_10]: https://gforge.inria.fr/frs/download.php/file/38350/scotch_6.0.10.tar.gz -[link scotch]: https://gforge.inria.fr/frs/download.php/file/38187/scotch_6.0.9.tar.gz +[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 @@ -548,10 +548,10 @@ easier to use `grep` and find the relevant pages and links. [link openmpi]: https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.tar.bz2 [page mpich]: http://www.mpich.org/ -[link mpich]: http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz +[link mpich]: http://www.mpich.org/static/downloads/3.4.2/mpich-3.4.2.tar.gz [page mvpapich]: http://mvapich.cse.ohio-state.edu/ -[link mvpapich]: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.tar.gz +[link mvpapich]: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.6.tar.gz [page cmake]: http://www.cmake.org/ @@ -567,7 +567,7 @@ easier to use `grep` and find the relevant pages and links. [link FFTW]: http://www.fftw.org/fftw-3.3.7.tar.gz [page petsc]: https://www.mcs.anl.gov/petsc/ -[link petsc]: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.14.2.tar.gz +[link petsc]: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.15.0.tar.gz [page hypre]: https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/ [repo hypre]: https://github.com/hypre-space/hypre/ @@ -589,9 +589,11 @@ easier to use `grep` and find the relevant pages and links. [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.gz -[link ParaView56]: http://www.paraview.org/files/v5.6/ParaView-v5.6.3.tar.gz -[link ParaView]: http://www.paraview.org/files/v5.7/ParaView-v5.7.0.tar.gz +[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 ParaView]: http://www.paraview.org/files/v5.9/ParaView-v5.9.1.tar.xz [page mesa]: http://mesa3d.org/ [link mesa]: ftp://ftp.freedesktop.org/pub/mesa/mesa-17.1.1.tar.xz @@ -605,4 +607,4 @@ easier to use `grep` and find the relevant pages and links. --- -Copyright 2016-2020 OpenCFD Ltd +Copyright 2016-2021 OpenCFD Ltd diff --git a/Requirements.md b/Requirements.md index bcd6213..c719ded 100644 --- a/Requirements.md +++ b/Requirements.md @@ -11,7 +11,7 @@ any third-party compilation. For general functionality, the paraview version distributed with the operating system or a [binary package][download ParaView] -is likely adequate for your needs. +is likely [fully adequate for your needs][FAQ ParaView]. ***Please help us with keeping the information here up-to-date and accurate.*** @@ -28,11 +28,11 @@ sudo apt install paraview-dev ``` Depending on your setup, the following subset may also be enough: ``` -sudo apt install cmake qt5base-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev +sudo apt install cmake qtbase5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libqt5x11extras5-dev libxt-dev ``` -### openSUSE +### openSUSE (eg, Leap-15.2) The full dependency list for building ParaView can be found from the corresponding [rpm spec][suse spec] file. @@ -46,8 +46,8 @@ sudo zypper install paraview-devel Depending on your setup, the following subset may also be enough: ``` sudo zypper install Mesa-libEGL-devel -sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras -sudo zypper install libXt-devel +sudo zypper install libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qttools-devel libqt5-qtx11extras-devel +sudo zypper install libxcb-devel libXt-devel ``` @@ -56,6 +56,7 @@ sudo zypper install libXt-devel [download ParaView]: https://www.paraview.org/download/ [debian control]: https://salsa.debian.org/science-team/paraview/-/blob/master/debian/control [suse spec]: https://build.opensuse.org/package/view_file/science/paraview/paraview.spec +[FAQ ParaView]: https://discourse.paraview.org/t/i-want-to-visualize-my-openfoam-simulation-results-with-paraview-but-im-confused-which-version-should-i-use @@ -69,4 +70,4 @@ sudo zypper install libXt-devel [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md --- -Copyright 2019-2020 OpenCFD Ltd +Copyright 2019-2021 OpenCFD Ltd diff --git a/SOURCES.txt b/SOURCES.txt index af1eb59..a71306c 100644 --- a/SOURCES.txt +++ b/SOURCES.txt @@ -1,5 +1,18 @@ Third-party software versions for recent OpenFOAM versions +OpenFOAM-2106 +--------------- + +ADIOS-2.6.0 +CGAL-4.12.2 +ParaView-5.9.1 *update* +boost_1_66_0 +fftw-3.3.7 +openmpi-4.0.3 +scotch_6.1.0 *update* +kahip-2.12 + + OpenFOAM-2012 --------------- diff --git a/etc/patches/scotch_6.1.0 b/etc/patches/scotch_6.1.0 new file mode 100644 index 0000000..4ff5aa2 --- /dev/null +++ b/etc/patches/scotch_6.1.0 @@ -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) diff --git a/makePETSC b/makePETSC index 0c66281..4992a88 100755 --- a/makePETSC +++ b/makePETSC @@ -6,7 +6,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2020 OpenCFD Ltd. +# Copyright (C) 2018-2021 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -185,7 +185,14 @@ fi echo ( # Configuration options - configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)" + + # Compiler or MPI (but not both) + # if [ -d "$MPI_ARCH_PATH" ] + # then + # configOpt="--with-mpi-dir=$MPI_ARCH_PATH" + # else + configOpt="--with-cc=$(whichMpicc) --with-cxx=$(whichMpicxx)" + # fi if [ "$optDebug" = true ] then