summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororacleLee <52901865+oracleLee@users.noreply.github.com>2020-06-25 11:23:17 +0800
committerGitHub <noreply@github.com>2020-06-24 22:23:17 -0500
commite81533eb9bbd52384b6340cfaf1d354bf77cc058 (patch)
treea1bde18640f3a32d9d3cd44620745bee11a565de
parenta928f44fc0968aa57cec1bcd62cfbe1a0a267c32 (diff)
downloadspack-e81533eb9bbd52384b6340cfaf1d354bf77cc058.tar.gz
spack-e81533eb9bbd52384b6340cfaf1d354bf77cc058.tar.bz2
spack-e81533eb9bbd52384b6340cfaf1d354bf77cc058.tar.xz
spack-e81533eb9bbd52384b6340cfaf1d354bf77cc058.zip
Update a supported package 'user-meamc' for lammps (#17207)
* Update package.py * edit confliction when add package 'meam' The USER-MEAMC fully replaces the MEAM package, which has been removed from LAMMPS after the 12 December 2018 version.
-rw-r--r--var/spack/repos/builtin/packages/lammps/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index b578016311..928a7fddab 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -61,8 +61,8 @@ class Lammps(CMakePackage, CudaPackage):
'molecule', 'mpiio', 'peri', 'poems', 'python',
'qeq', 'replica', 'rigid', 'shock', 'snap', 'spin',
'srd', 'user-atc', 'user-h5md', 'user-lb',
- 'user-misc', 'user-netcdf', 'user-omp', 'user-reaxc',
- 'voronoi']
+ 'user-meamc', 'user-misc', 'user-netcdf', 'user-omp',
+ 'user-reaxc', 'voronoi']
for pkg in supported_packages:
variant(pkg, default=False,
@@ -120,6 +120,8 @@ class Lammps(CMakePackage, CudaPackage):
conflicts('+user-misc', when='~manybody')
conflicts('%gcc@9:', when='@:20200303+openmp')
conflicts('+kokkos', when='@:20200227')
+ conflicts('+meam', when='@20181212:')
+ conflicts('+user-meamc', when='@:20181212')
patch("lib.patch", when="@20170901")
patch("660.patch", when="@20170922")