zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add adios2 dependency and configuration for newest OpenFOAM (#12993)

Browse Source
This commit is contained in:
Mark Olesen 2019-10-01 17:48:14 +02:00 committed by Adam J. Stewart
parent 5b4040ea36
commit f939697863
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/openfoam/package.py
View File

@ -286,8 +286,6 @@ class Openfoam(Package):
description='With scotch/ptscotch decomposition') description='With scotch/ptscotch decomposition')
variant('zoltan', default=False, variant('zoltan', default=False,
description='With zoltan renumbering') description='With zoltan renumbering')
# TODO?# variant('scalasca', default=False,
# TODO?# description='With scalasca profiling')
variant('mgridgen', default=False, description='With mgridgen support') variant('mgridgen', default=False, description='With mgridgen support')
variant('paraview', default=False, variant('paraview', default=False,
description='Build paraview plugins and runtime post-processing') description='Build paraview plugins and runtime post-processing')
@ -321,8 +319,7 @@ class Openfoam(Package):
depends_on('parmgridgen', when='+mgridgen', type='build') depends_on('parmgridgen', when='+mgridgen', type='build')
depends_on('zoltan', when='+zoltan') depends_on('zoltan', when='+zoltan')
depends_on('vtk', when='+vtk') depends_on('vtk', when='+vtk')
depends_on('adios2', when='@1912:')
# TODO?# depends_on('scalasca', when='+scalasca')
# For OpenFOAM plugins and run-time post-processing this should just be # For OpenFOAM plugins and run-time post-processing this should just be
# 'paraview+plugins' but that resolves poorly. # 'paraview+plugins' but that resolves poorly.
@ -555,6 +552,7 @@ def configure(self, spec, prefix):
('LD_LIBRARY_PATH', foam_add_lib(user_mpi['libdir'])), ('LD_LIBRARY_PATH', foam_add_lib(user_mpi['libdir'])),
('PATH', foam_add_path(user_mpi['bindir'])), ('PATH', foam_add_path(user_mpi['bindir'])),
], ],
'adios2': {},
'scotch': {}, 'scotch': {},
'kahip': {}, 'kahip': {},
'metis': {}, 'metis': {},
@ -564,6 +562,15 @@ def configure(self, spec, prefix):
'vtk': [], 'vtk': [],
} }
# With adios2 after 1912 or develop (after 2019-10-01)
if spec.satisfies('@1912:'):
self.etc_config['adios2'] = [
('ADIOS2_ARCH_PATH', spec['adios2'].prefix),
('LD_LIBRARY_PATH',
foam_add_lib(pkglib(spec['adios2'], '${ADIOS2_ARCH_PATH}'))),
('PATH', foam_add_path('${ADIOS2_ARCH_PATH}/bin')),
]
if '+scotch' in spec: if '+scotch' in spec:
self.etc_config['scotch'] = { self.etc_config['scotch'] = {
'SCOTCH_ARCH_PATH': spec['scotch'].prefix, 'SCOTCH_ARCH_PATH': spec['scotch'].prefix,