Skip to content

enhance OpenFOAM easyblock to also build the plugins for OpenFOAM >= v2406 #3436

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 11, 2024
Merged

enhance OpenFOAM easyblock to also build the plugins for OpenFOAM >= v2406 #3436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238acc3
build the plugins for OpenFOAM
branfosj Sep 6, 2024
81701ea
also sanity check `cartesianMesh`
branfosj Sep 6, 2024
2ae21db
Merge branch 'develop' into of2
boegel Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions easybuild/easyblocks/o/openfoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,12 @@ def build_step(self):
if self.looseversion > LooseVersion('1606'):
# use Allwmake -log option if possible since this can be useful during builds, but also afterwards
cmd += ' -log'

if self.looseversion >= LooseVersion('2406'):
# Also build the plugins
cmd += ' && %s %s -log' % (self.cfg['prebuildopts'],
os.path.join(self.builddir, self.openfoamdir, 'Allwmake-plugins'))

run_cmd(cmd_tmpl % cmd, log_all=True, simple=True, log_output=True)

def det_psubdir(self):
Expand Down Expand Up @@ -476,8 +482,12 @@ def sanity_check_step(self):
if self.looseversion < LooseVersion("11"):
tools.append("buoyantFoam")
tools.append("reactingFoam")
# modifyMesh is no longer there in OpenFOAM >= 12
if self.is_dot_org and self.looseversion >= LooseVersion("12"):
tools.remove("modifyMesh")
if self.looseversion >= LooseVersion('2406'):
# built from the plugins
tools.append("cartesianMesh")

bins = [os.path.join(self.openfoamdir, "bin", x) for x in ["paraFoam"]] + \
[os.path.join(toolsdir, x) for x in tools]
Expand Down