Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create OpenFOAM-v2406-64b-foss-2020a.eb #21920

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

jtuni
Copy link

@jtuni jtuni commented Nov 27, 2024

In this commit, the INT size is set to 64b
setting the flag i8 to True, aswel as setting $WM_LABEL_SIZE=64 in $WM_PROJECT_DIR/etc/bashrc and cshrc.

 In this commit, the INT size is set to 64b
 setting the flag i8 to True, aswel as setting $WM_LABEL_SIZE=64 in $WM_PROJECT_DIR/etc/bashrc and cshrc.
Copy link

Updated software OpenFOAM-v2406-64b-foss-2020a.eb

Diff against OpenFOAM-12-foss-2023a.eb

easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-12-foss-2023a.eb

diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-12-foss-2023a.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
index ed56531585..8f9536a6bb 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-12-foss-2023a.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
@@ -1,38 +1,47 @@
 name = 'OpenFOAM'
-version = '12'
+version = 'v2406-64b'
 
-homepage = 'https://www.openfoam.org/'
+homepage = 'https://www.openfoam.com/'
 description = """OpenFOAM is a free, open source CFD software package.
  OpenFOAM has an extensive range of features to solve anything from complex fluid flows
  involving chemical reactions, turbulence and heat transfer,
  to solid dynamics and electromagnetics."""
 
-toolchain = {'name': 'foss', 'version': '2023a'}
-toolchainopts = {'vectorize': False}
+toolchain = {'name': 'foss', 'version': '2020a'}
+toolchainopts = {'cstd': 'c++14', 'vectorize': False, 'i8':True}
 
-source_urls = ['https://github.com/OpenFOAM/OpenFOAM-%(version_major)s/archive']
-sources = ['version-%(version)s.tar.gz']
-patches = ['OpenFOAM-12-ThirdParty.patch']
+source_urls = ['https://sourceforge.net/projects/openfoam/files/%(version)s/']
+sources = [SOURCE_TGZ]
+patches = [
+    ('OpenFOAM-v2406-cleanup.patch', 1),
+    ('OpenFOAM-v2212-wmake-OpenMPI.patch', 1),
+]
 checksums = [
-    {'version-12.tar.gz': 'e59fad54c62e64f1bb89dbaebe5f99a76dc0a6a91d9aad86042a7c4cef6d0744'},
-    {'OpenFOAM-12-ThirdParty.patch': 'b8a9abf3b8479d32d87654d833501f54abe57ceb9f06f7d2412a3e52d20108ec'},
+    {'OpenFOAM-v2406-64b.tgz': '3bf6c0bf8167764a02c3327ac4a69acf86124f5fa417ab2ca385077462ff2dc0'},
+    {'OpenFOAM-v2406-cleanup.patch': '3abff48a517fb63719ad57fa32af746bc379a1e80c72d3e5852aa17cd13cf03e'},
+    {'OpenFOAM-v2212-wmake-OpenMPI.patch': '4f5110e98df1f057dc4b478a004e4ae2dc5cc763899f0d3ceb6773315c5c8ba9'},
 ]
 
 builddependencies = [
-    ('Bison', '3.8.2'),
-    ('CMake', '3.26.3'),
+    ('Bison', '3.5.3'),
+    ('CMake', '3.16.4'),
     ('flex', '2.6.4'),
 ]
 
+
 dependencies = [
-    ('ncurses', '6.4'),
+    ('libreadline', '8.0'),
+    ('ncurses', '6.2'),
     # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
     ('METIS', '5.1.0'),
-    ('SCOTCH', '7.0.3'),
-    ('CGAL', '5.6'),
-    ('ParaView', '5.11.2'),
-    ('gnuplot', '5.4.8'),
-    ('Zoltan', '3.901'),
+    ('SCOTCH', '6.0.9'),
+    ('KaHIP', '3.14'),
+    ('CGAL', '4.14.3','-Python-3.8.2'),
+    ('GMP', '6.2.0'),
+    ('MPFR', '4.0.2'),
+    ('ParaView', '5.8.0','-Python-3.8.2-mpi'),
+    ('gnuplot', '5.2.8'),
 ]
 
+
 moduleclass = 'cae'
Diff against OpenFOAM-v2406-foss-2023a.eb

easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-foss-2023a.eb

diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-foss-2023a.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
index 0e2885c064..8f9536a6bb 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-foss-2023a.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
@@ -1,5 +1,5 @@
 name = 'OpenFOAM'
-version = 'v2406'
+version = 'v2406-64b'
 
 homepage = 'https://www.openfoam.com/'
 description = """OpenFOAM is a free, open source CFD software package.
@@ -7,49 +7,41 @@ description = """OpenFOAM is a free, open source CFD software package.
  involving chemical reactions, turbulence and heat transfer,
  to solid dynamics and electromagnetics."""
 
-toolchain = {'name': 'foss', 'version': '2023a'}
-# Users have found that vectorizion caused OpenFOAM to produce some very incorrect results.
-# Disabling vectorize was confirmed to fix the the known issues.
-# With no test suite, sticking to known working toolchain options until proven otherwise.
-toolchainopts = {'cstd': 'c++14', 'vectorize': False}
+toolchain = {'name': 'foss', 'version': '2020a'}
+toolchainopts = {'cstd': 'c++14', 'vectorize': False, 'i8':True}
 
 source_urls = ['https://sourceforge.net/projects/openfoam/files/%(version)s/']
-sources = [
-    SOURCE_TGZ,
-    {
-        'filename': '%(name)s-plugins-%(version)s.tgz',
-        'extract_cmd': 'tar --strip-components=1 -C %(installdir)s/%(name)s-%(version)s/ -xzf %s'
-    }
-]
+sources = [SOURCE_TGZ]
 patches = [
     ('OpenFOAM-v2406-cleanup.patch', 1),
     ('OpenFOAM-v2212-wmake-OpenMPI.patch', 1),
 ]
 checksums = [
-    {'OpenFOAM-v2406.tgz': '8d1450fb89eec1e7cecc55c3bb7bc486ccbf63d069379d1d5d7518fa16a4686a'},
-    {'OpenFOAM-plugins-v2406.tgz': '1d008f86fad06a4a568d194c6e3d5ab52be2b20c83a3b9b1b0230e2de2d0558b'},
+    {'OpenFOAM-v2406-64b.tgz': '3bf6c0bf8167764a02c3327ac4a69acf86124f5fa417ab2ca385077462ff2dc0'},
     {'OpenFOAM-v2406-cleanup.patch': '3abff48a517fb63719ad57fa32af746bc379a1e80c72d3e5852aa17cd13cf03e'},
-    {'OpenFOAM-v2212-wmake-OpenMPI.patch': '241dc4898c22aab0cbd10c1ea931a07a786508ee03462d45dbc1c202fee3ebe8'},
+    {'OpenFOAM-v2212-wmake-OpenMPI.patch': '4f5110e98df1f057dc4b478a004e4ae2dc5cc763899f0d3ceb6773315c5c8ba9'},
 ]
 
 builddependencies = [
-    ('Bison', '3.8.2'),
-    ('CMake', '3.26.3'),
+    ('Bison', '3.5.3'),
+    ('CMake', '3.16.4'),
     ('flex', '2.6.4'),
 ]
 
+
 dependencies = [
-    ('libreadline', '8.2'),
-    ('ncurses', '6.4'),
+    ('libreadline', '8.0'),
+    ('ncurses', '6.2'),
     # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
     ('METIS', '5.1.0'),
-    ('SCOTCH', '7.0.3'),
-    ('KaHIP', '3.16'),
-    ('CGAL', '5.6'),
-    ('GMP', '6.2.1'),
-    ('MPFR', '4.2.0'),
-    ('ParaView', '5.11.2'),
-    ('gnuplot', '5.4.8'),
+    ('SCOTCH', '6.0.9'),
+    ('KaHIP', '3.14'),
+    ('CGAL', '4.14.3','-Python-3.8.2'),
+    ('GMP', '6.2.0'),
+    ('MPFR', '4.0.2'),
+    ('ParaView', '5.8.0','-Python-3.8.2-mpi'),
+    ('gnuplot', '5.2.8'),
 ]
 
+
 moduleclass = 'cae'
Diff against OpenFOAM-10-foss-2022a-20230119-int64.eb

easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-10-foss-2022a-20230119-int64.eb

diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-10-foss-2022a-20230119-int64.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
index 5c5f4d70f9..8f9536a6bb 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-10-foss-2022a-20230119-int64.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-v2406-64b-foss-2020a.eb
@@ -1,42 +1,47 @@
 name = 'OpenFOAM'
+version = 'v2406-64b'
 
-version = '10'
-_version_patch = '20230119'
-versionsuffix = '-%s-int64' % _version_patch
-
-homepage = 'https://www.openfoam.org/'
+homepage = 'https://www.openfoam.com/'
 description = """OpenFOAM is a free, open source CFD software package.
  OpenFOAM has an extensive range of features to solve anything from complex fluid flows
  involving chemical reactions, turbulence and heat transfer,
  to solid dynamics and electromagnetics."""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
-toolchainopts = {'vectorize': False, 'i8': True}
+toolchain = {'name': 'foss', 'version': '2020a'}
+toolchainopts = {'cstd': 'c++14', 'vectorize': False, 'i8':True}
 
-source_urls = ['https://github.com/OpenFOAM/OpenFOAM-%(version_major)s/archive']
-sources = [{
-    'download_filename': '%s.tar.gz' % _version_patch,
-    'filename': 'OpenFOAM-%s-%s.tar.gz' % (version, _version_patch),
-}]
-patches = ['OpenFOAM-%(version_major)s-ThirdParty.patch']
+source_urls = ['https://sourceforge.net/projects/openfoam/files/%(version)s/']
+sources = [SOURCE_TGZ]
+patches = [
+    ('OpenFOAM-v2406-cleanup.patch', 1),
+    ('OpenFOAM-v2212-wmake-OpenMPI.patch', 1),
+]
 checksums = [
-    {'OpenFOAM-10-20230119.tar.gz': '86f8cb18d4f59812b129ce7d669e8ff498da442fbdb46705492fbba3cbda82ab'},
-    {'OpenFOAM-10-ThirdParty.patch': '307df0206cdb24533f4974378843332064f4a2d85cf0638c20fc4c87b1524b43'},
+    {'OpenFOAM-v2406-64b.tgz': '3bf6c0bf8167764a02c3327ac4a69acf86124f5fa417ab2ca385077462ff2dc0'},
+    {'OpenFOAM-v2406-cleanup.patch': '3abff48a517fb63719ad57fa32af746bc379a1e80c72d3e5852aa17cd13cf03e'},
+    {'OpenFOAM-v2212-wmake-OpenMPI.patch': '4f5110e98df1f057dc4b478a004e4ae2dc5cc763899f0d3ceb6773315c5c8ba9'},
 ]
 
 builddependencies = [
-    ('Bison', '3.8.2'),
-    ('CMake', '3.23.1'),
+    ('Bison', '3.5.3'),
+    ('CMake', '3.16.4'),
     ('flex', '2.6.4'),
 ]
 
+
 dependencies = [
-    ('ncurses', '6.3'),
-    ('METIS', '5.1.0', '-int64'),
-    ('SCOTCH', '7.0.1', '-int64'),
-    ('CGAL', '4.14.3'),
-    ('ParaView', '5.10.1', '-mpi'),
-    ('gnuplot', '5.4.4'),
+    ('libreadline', '8.0'),
+    ('ncurses', '6.2'),
+    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
+    ('METIS', '5.1.0'),
+    ('SCOTCH', '6.0.9'),
+    ('KaHIP', '3.14'),
+    ('CGAL', '4.14.3','-Python-3.8.2'),
+    ('GMP', '6.2.0'),
+    ('MPFR', '4.0.2'),
+    ('ParaView', '5.8.0','-Python-3.8.2-mpi'),
+    ('gnuplot', '5.2.8'),
 ]
 
+
 moduleclass = 'cae'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant