From 6ad25ef29393f5e685577a6212b7d06316e186cf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Dec 2022 14:47:18 +0100
Subject: [PATCH] CONFIG: set API level to 2212 (pre-release state)
- README updated to v2212
---
.gitlab/issue_templates/bug.md | 2 +-
META-INFO/api-info | 4 ++--
README.md | 14 ++++++------
doc/BuildIssues.md | 2 +-
doc/Requirements.md | 42 ++++++++++++++++++----------------
wmake/rules/General/general | 2 +-
6 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index 448debd7458..e8a7b2014e7 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -49,7 +49,7 @@
<!--
Providing details of your set-up can help us identify any issues, e.g.
- OpenFOAM version : v2206|v2112|v2106|v2012|v2006 etc
+ OpenFOAM version : v2212|v2206|v2112|v2106|v2012 etc
Operating system : ubuntu|openSUSE|centos etc
Hardware info : any info that may help?
Compiler : gcc|intel|clang etc
diff --git a/META-INFO/api-info b/META-INFO/api-info
index 166e573ce1a..8f3112d5eaa 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
-api=2208
-patch=220907
+api=2212
+patch=0
diff --git a/README.md b/README.md
index 89394eaeaad..0fbab6f54f3 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.
If OpenFOAM has already been compiled on your system, simply source
the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2206 version:
+For example, for the OpenFOAM-v2212 version:
```
-source /installation/path/OpenFOAM-v2206/etc/bashrc
+source /installation/path/OpenFOAM-v2212/etc/bashrc
```
## Compiling OpenFOAM
@@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
to the OpenFOAM directory. For example,
```
/path/parent
-|-- OpenFOAM-v2206
-\-- ThirdParty-v2206
+|-- OpenFOAM-v2212
+\-- ThirdParty-v2212
```
There are, however, many cases where this simple convention is inadequate:
@@ -136,7 +136,7 @@ There are, however, many cases where this simple convention is inadequate:
operating system or cluster installation provides it)
* When we have changed the OpenFOAM directory name to some arbitrary
- directory name, e.g. openfoam-sandbox2206, etc..
+ directory name, e.g. openfoam-sandbox2212, etc..
* When we would like any additional 3rd party software to be located
inside of the OpenFOAM directory to ensure that the installation is
@@ -156,9 +156,9 @@ when locating the ThirdParty directory with the following precedence:
2. PREFIX/ThirdParty-VERSION
* this corresponds to the traditional approach
3. PREFIX/ThirdParty-vAPI
- * allows for an updated value of VERSION, *eg*, `v2206-myCustom`,
+ * allows for an updated value of VERSION, *eg*, `v2212-myCustom`,
without requiring a renamed ThirdParty. The API value would still
- be `2206` and the original `ThirdParty-v2206/` would be found.
+ be `2212` and the original `ThirdParty-v2212/` would be found.
4. PREFIX/ThirdParty-API
* same as the previous example, but using an unadorned API value.
5. PREFIX/ThirdParty-common
diff --git a/doc/BuildIssues.md b/doc/BuildIssues.md
index f207ccd1b27..991fccabf9a 100644
--- a/doc/BuildIssues.md
+++ b/doc/BuildIssues.md
@@ -1,4 +1,4 @@
-## Known Build Issues (v2206, v2112, v2106, v2012)
+## Known Build Issues (v2212, v2206, v2112, v2106, v2012)
### Windows cross-compilation
diff --git a/doc/Requirements.md b/doc/Requirements.md
index 03cefeb9d42..d4c8e9e1aa5 100644
--- a/doc/Requirements.md
+++ b/doc/Requirements.md
@@ -4,7 +4,7 @@ OpenFOAM requires a functioning C++11 compiler and GNU `make` build toolchain.
### Minimum recommended versions
-- gcc : 4.8.5
+- gcc : 4.8.5 (absolute minimum, not really recommended)
- cmake: 3.8 (required for ParaView and CGAL build)
- boost: 1.48 (required for CGAL build and some functionality)
- fftw: 3.3.7 (recommended - required for FFT-related functionality)
@@ -18,7 +18,8 @@ To check the installed versions
| Program | To check the version |
|---------------|-----------------------|
| gcc | `gcc --version` |
-| icc | `icc --version` |
+| clang | `clang --version` |
+| icc (intel) | `icc --version` |
| cmake | `cmake --version` |
| openmpi | `orterun --version` |
@@ -47,7 +48,7 @@ affected several versions of the openmpi2 or openmpi3 series.
- QT : 5.9 (optional - for ParaView build)
-### Ubuntu (eg, 20.04)
+### Ubuntu (eg, 22.04)
Install dependencies by executing the following lines on the command line:
```
@@ -65,11 +66,11 @@ sudo apt-cache show libopenmpi-dev
| Program | Ubuntu | Program version |
|-----------|-----------|-----------------|
-| gcc | 20.04 | 9.3.0 |
-| openmpi | 20.04 | 4.0.3 |
-| cmake | 20.04 | 3.16.3 |
-| flex | 20.04 | 2.6.4 |
-| m4 | 20.04 | 1.4.18 |
+| gcc | 22.04 | 11.3.0 |
+| openmpi | 22.04 | 4.1.2 |
+| cmake | 22.04 | 3.22.1 |
+| flex | 22.04 | 2.6.4 |
+| m4 | 22.04 | 1.4.18 |
@@ -80,10 +81,10 @@ apt-get install libfftw3-dev libscotch-dev libptscotch-dev libboost-system-dev l
| Program | apt-cache show | Ubuntu | Version |
|-----------|-----------------|---------|---------|
-| boost | libboost-dev | 20.04 | 1.71.0 |
-| CGAL | libcgal-dev | 20.04 | 5.0.2 |
-| FFTW | libfftw3-dev | 20.04 | 3.3.8 |
-| scotch | libscotch-dev | 20.04 | 6.0.9 |
+| boost | libboost-dev | 22.04 | 1.74.0 |
+| CGAL | libcgal-dev | 22.04 | 5.4.1 |
+| FFTW | libfftw3-dev | 22.04 | 3.3.8 |
+| scotch | libscotch-dev | 22.04 | 6.1.3 |
Some libraries can be installed from the operating system, or
@@ -95,14 +96,14 @@ across various Linux distributions, but it may be desirable to use
more system libraries on Ubuntu.
-### openSUSE (eg, Leap-15.2)
+### openSUSE (eg, Leap-15.4)
Install the dependencies by copying and pasting the following lines to
the command line:
```
sudo zypper install -t pattern devel_C_C++
-sudo zypper install cmake gnuplot flex libfl-devel readline-devel zlib-devel openmpi-devel
+sudo zypper install cmake gnuplot flex libfl-devel readline-devel zlib-devel openmpi4-devel
sudo zypper install gmp-devel mpfr-devel mpc-devel
```
If you intend to use system components, you can also install the following:
@@ -119,11 +120,12 @@ This installs
| Program | openSUSE | Program version |
|-----------|-----------|-----------------|
-| gcc | 15.2 | 7.5.0 |
-| openmpi | 15.2 | 2.1.6 |
-| cmake | 15.2 | 3.17.0 |
-| flex | 15.2 | 2.6.4 |
-| m4 | 15.2 | 1.4.18 |
+| gcc | 15.4 | 7.5.0 |
+| openmpi | 15.4 | 2.1.6 |
+| openmpi | 15.4 | 4.1.1 |
+| cmake | 15.4 | 3.20.4 |
+| flex | 15.4 | 2.6.4 |
+| m4 | 15.4 | 1.4.18 |
#### OpenMPI
@@ -215,4 +217,4 @@ at any later stage _without_ recompiling OpenFOAM itself.
[wiki-config]: https://develop.openfoam.com/Development/openfoam/-/wikis/configuring
---
-Copyright 2019-2021 OpenCFD Ltd
+Copyright 2019-2022 OpenCFD Ltd
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index cd7f4cc9df0..bca9d5fee0e 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
#-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=2208
+WM_VERSION = OPENFOAM=2212
AR = ar
ARFLAGS = cr
--
GitLab