miniamr: bump to v1.4.0 (#5975)

This commit is contained in:
Christoph Junghans 2017-10-26 19:51:50 -06:00 committed by GitHub
parent bd6378a6d2
commit 0b3247c23d

View File

@ -32,11 +32,11 @@ class Miniamr(MakefilePackage):
""" """
homepage = "https://mantevo.org" homepage = "https://mantevo.org"
url = "http://mantevo.org/downloads/releaseTarballs/miniapps/MiniAMR/miniAMR_1.0_all.tgz" url = "https://github.com/Mantevo/miniAMR/archive/v1.4.tar.gz"
tags = ['proxy-app', 'ecp-proxy-app'] tags = ['proxy-app', 'ecp-proxy-app']
version('1.0', '812e5aaaab99689a4e9381a3bbd718a6') version('1.4.0', '3aab0247047a94e343709cf2e51cc46e')
variant('mpi', default=True, description='Build with MPI support') variant('mpi', default=True, description='Build with MPI support')
@ -47,12 +47,12 @@ def build_targets(self):
targets = [] targets = []
if '+mpi' in self.spec: if '+mpi' in self.spec:
targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) targets.append('CC={0}'.format(self.spec['mpi'].mpicc))
targets.append('LD={0}'.format(self.spec['mpi'].mpicc))
targets.append('LDLIBS=-lm') targets.append('LDLIBS=-lm')
targets.append('--file=Makefile.mpi')
targets.append('--directory=miniAMR_ref')
else: else:
targets.append('--file=Makefile.serial') targets.append('CC={0}'.format(self.compiler.cc))
targets.append('--directory=miniAMR_serial') targets.append('LD={0}'.format(self.compiler.cc))
targets.append('--directory=ref')
return targets return targets
@ -61,10 +61,6 @@ def install(self, spec, prefix):
mkdir(prefix.bin) mkdir(prefix.bin)
mkdir(prefix.doc) mkdir(prefix.doc)
if '+mpi' in spec: install('ref/ma.x', prefix.bin)
install('miniAMR_ref/miniAMR.x', prefix.bin)
else:
install('miniAMR_serial/miniAMR.x', prefix.bin)
# Install Support Documents # Install Support Documents
install('miniAMR_ref/README', prefix.doc) install('ref/README', prefix.doc)