Merge pull request #209 from gerlero/openfoam2312

Support OpenFOAM v2312

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
   ci:
     strategy:
       matrix:
-        openfoam-version: [2306, 2212]
+        openfoam-version: [2312, 2306]
       fail-fast: false
     uses: ./.github/workflows/build-test.yml
     with:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     needs: get-version
     strategy:
       matrix:
-        openfoam-version: [2306, 2212]
+        openfoam-version: [2312, 2306]
       fail-fast: false
     uses: ./.github/workflows/build-test.yml
     with:

Makefile

@@ -1,6 +1,6 @@
 # Build configuration
 SHELL = /bin/zsh
-OPENFOAM_VERSION = 2306
+OPENFOAM_VERSION = 2312
 APP_NAME = OpenFOAM-v$(OPENFOAM_VERSION)
 
 ifeq ($(OPENFOAM_VERSION),2112)

configure.sh

@@ -74,8 +74,8 @@ echo "setenv INFOPATH $BASH_PATH/share/info\`[ \${?INFOPATH} == 1 ] && echo \":\
 # Disable floating point exception trapping when on Apple silicon
 # (Prevents confusing output that says it's enabled, as it doesn't work yet)
 # https://develop.openfoam.com/Development/openfoam/-/issues/2240
-[ $(uname -m) != 'arm64' ] || echo 'export FOAM_SIGFPE=false' >> etc/prefs.sh
-[ $(uname -m) != 'arm64' ] || echo 'setenv FOAM_SIGFPE false' >> etc/prefs.csh
+[ $(uname -m) != 'arm64' ] || [ $(bin/foamEtcFile -show-api) -ge 2312 ] || echo 'export FOAM_SIGFPE=false' >> etc/prefs.sh
+[ $(uname -m) != 'arm64' ] || [ $(bin/foamEtcFile -show-api) -ge 2312 ] || echo 'setenv FOAM_SIGFPE false' >> etc/prefs.csh
 
 
 # Workaround for https://develop.openfoam.com/Development/openfoam/-/issues/1664
@@ -114,6 +114,10 @@ EOF
 [ $(bin/foamEtcFile -show-api) -gt 2212 ] || [ $(bin/foamEtcFile -show-patch) -ge 230612 ] || sed -i '' 's|Robust_circumcenter_filtered_traits_3|Robust_weighted_circumcenter_filtered_traits_3|' applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
 
 
+# Workaround for https://develop.openfoam.com/Development/openfoam/-/issues/3066
+[ $(bin/foamEtcFile -show-api) -lt 2312 ] || sed -i '' 's|max(len,|max(label(len),|' src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
+
+
 # Workaround for https://develop.openfoam.com/Development/openfoam/-/issues/2958
 [ $(uname -m) != 'arm64' ] || sed -i '' 's|-ftrapping-math|-ftrapping-math -ffp-contract=off|' wmake/rules/darwin64Clang/c
 [ $(uname -m) != 'arm64' ] || sed -i '' 's|-ftrapping-math|-ftrapping-math -ffp-contract=off|' wmake/rules/darwin64Clang/c++