summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMartin Diehl <mail@martin-diehl.net>2022-01-08 12:50:38 +0100
committerGitHub <noreply@github.com>2022-01-08 06:50:38 -0500
commit2bb844ee0eb31da1e47736bbd1d5d9cfc5e36522 (patch)
treecd8e71d2fe443a98bda2e225b8e4f77a1df36dbd /var
parent897616f073a4da58fd48213db44a0e2cdcd83f1c (diff)
downloadspack-2bb844ee0eb31da1e47736bbd1d5d9cfc5e36522.tar.gz
spack-2bb844ee0eb31da1e47736bbd1d5d9cfc5e36522.tar.bz2
spack-2bb844ee0eb31da1e47736bbd1d5d9cfc5e36522.tar.xz
spack-2bb844ee0eb31da1e47736bbd1d5d9cfc5e36522.zip
Damask improvements (#28178)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/damask-grid/package.py14
-rw-r--r--var/spack/repos/builtin/packages/damask-mesh/package.py13
-rw-r--r--var/spack/repos/builtin/packages/damask/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-damask/package.py4
4 files changed, 15 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py
index 9800fba56f..aa564954bf 100644
--- a/var/spack/repos/builtin/packages/damask-grid/package.py
+++ b/var/spack/repos/builtin/packages/damask-grid/package.py
@@ -7,8 +7,8 @@
class DamaskGrid(CMakePackage):
"""Grid solver for DAMASK"""
- homepage = "https://damask3.mpie.de"
- url = "https://damask3.mpie.de/download/damask-3.0.0.tar.xz"
+ homepage = "https://damask.mpie.de"
+ url = "https://damask.mpie.de/download/damask-3.0.0.tar.xz"
maintainers = ['MarDiehl']
@@ -17,9 +17,10 @@ class DamaskGrid(CMakePackage):
depends_on('pkgconfig', type='build')
depends_on('cmake@3.10:', type='build')
+ depends_on('petsc+mpi+hdf5')
depends_on('petsc@3.14.0:3.14,3.15.1:3.15', when='@3.0.0-alpha4')
depends_on('petsc@3.14.0:3.14,3.15.1:3.16', when='@3.0.0-alpha5')
- depends_on('hdf5+fortran')
+ depends_on('hdf5@1.10:+mpi+fortran')
depends_on('fftw+mpi')
patch('CMakeDebugRelease.patch', when='@3.0.0-alpha4')
@@ -29,12 +30,11 @@ class DamaskGrid(CMakePackage):
values=('Debug', 'Release', 'DebugRelease'))
def patch(self):
- filter_file(' -lhdf5 ', ' -lhdf5_fortran -lhdf5 ', 'CMakeLists.txt')
- filter_file(' -lz ', ' -lz -lfftw3 -lfftw3_mpi ', 'CMakeLists.txt')
+ filter_file(' -lz ', ' -lz ${FFTW_LIBS} ', 'CMakeLists.txt')
def cmake_args(self):
- args = ['-DDAMASK_SOLVER:STRING=grid']
- return args
+ return [self.define('DAMASK_SOLVER', 'grid'),
+ self.define('FFTW_LIBS', self.spec['fftw:mpi'].libs.link_flags)]
@run_after('install')
@on_package_attributes(run_tests=True)
diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py
index b168679167..62742308f4 100644
--- a/var/spack/repos/builtin/packages/damask-mesh/package.py
+++ b/var/spack/repos/builtin/packages/damask-mesh/package.py
@@ -7,8 +7,8 @@
class DamaskMesh(CMakePackage):
"""Mesh solver for DAMASK"""
- homepage = "https://damask3.mpie.de"
- url = "https://damask3.mpie.de/download/damask-3.0.0.tar.xz"
+ homepage = "https://damask.mpie.de"
+ url = "https://damask.mpie.de/download/damask-3.0.0.tar.xz"
maintainers = ['MarDiehl']
@@ -17,9 +17,10 @@ class DamaskMesh(CMakePackage):
depends_on('pkgconfig', type='build')
depends_on('cmake@3.10:', type='build')
+ depends_on('petsc+mpi+hdf5')
depends_on('petsc@3.14.0:3.14,3.15.1:3.15', when='@3.0.0-alpha4')
depends_on('petsc@3.14.0:3.14,3.15.1:3.16', when='@3.0.0-alpha5')
- depends_on('hdf5+fortran')
+ depends_on('hdf5@1.10:+mpi+fortran')
patch('CMakeDebugRelease.patch', when='@3.0.0-alpha4')
@@ -27,12 +28,8 @@ class DamaskMesh(CMakePackage):
description='The build type to build',
values=('Debug', 'Release', 'DebugRelease'))
- def patch(self):
- filter_file(' -lhdf5 ', ' -lhdf5_fortran -lhdf5 ', 'CMakeLists.txt')
-
def cmake_args(self):
- args = ['-DDAMASK_SOLVER:STRING=mesh']
- return args
+ return [self.define('DAMASK_SOLVER', 'mesh')]
@run_after('install')
@on_package_attributes(run_tests=True)
diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py
index 2b55b9e85e..ac2e514720 100644
--- a/var/spack/repos/builtin/packages/damask/package.py
+++ b/var/spack/repos/builtin/packages/damask/package.py
@@ -21,7 +21,7 @@ class Damask(BundlePackage):
"""
- homepage = "https://damask3.mpie.de"
+ homepage = "https://damask.mpie.de"
maintainers = ['MarDiehl']
diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py
index e9b48b1612..20fcb9b840 100644
--- a/var/spack/repos/builtin/packages/py-damask/package.py
+++ b/var/spack/repos/builtin/packages/py-damask/package.py
@@ -7,8 +7,8 @@
class PyDamask(PythonPackage):
"""Pre- and post-processing tools for DAMASK"""
- homepage = "https://damask3.mpie.de"
- url = "https://damask3.mpie.de/download/damask-3.0.0.tar.xz"
+ homepage = "https://damask.mpie.de"
+ url = "https://damask.mpie.de/download/damask-3.0.0.tar.xz"
maintainers = ['MarDiehl']