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

Update Nek5000 package to Version 17 (#7178)

Browse Source 
and minor polishing
This commit is contained in:
Thilina Rathnayake
2018-02-03 17:05:14 -06:00
committed by Adam J. Stewart
parent 927af929f4
commit 970a4b2815
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
var/spack/repos/builtin/packages/nek5000/package.py
View File

@@ -46,9 +46,9 @@ class Nek5000(Package):
tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes',
'spectral-elements', 'fluid'] 'spectral-elements', 'fluid']
version('17.0.0-beta2', git='https://github.com/Nek5000/Nek5000.git', version('17.0', git='https://github.com/Nek5000/Nek5000.git',
commit='b95f46c59f017fff2fc19b66aa65a881085a7572') commit='469daf94d3f9aa3ba9d258d8eee9ebde6893a702')
version('develop', git='https://github.com/Nek5000/Nek5000.git', version('develop', git='https://github.com/Nek5000/Nek5000.git',
branch='master') branch='master')
# MPI, Profiling and Visit variants # MPI, Profiling and Visit variants
@@ -88,18 +88,15 @@ def install(self, spec, prefix):
toolsDir = 'tools' toolsDir = 'tools'
binDir = 'bin' binDir = 'bin'
F77 = self.compiler.fc FC = self.compiler.fc
CC = self.compiler.cc CC = self.compiler.cc
# Build the tools, maketools copy them to Nek5000/bin by default. # Build the tools, maketools copy them to Nek5000/bin by default.
# We will then install Nek5000/bin under prefix after that. # We will then install Nek5000/bin under prefix after that.
with working_dir(toolsDir): with working_dir(toolsDir):
# Update the maketools script to use correct compilers # Update the maketools script to use correct compilers
if self.version == Version('17.0.0-beta2'): # Old release filter_file(r'^FC\s*=.*', 'FC="{0}"'.format(FC), 'maketools')
filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'maketools') filter_file(r'^CC\s*=.*', 'CC="{0}"'.format(CC), 'maketools')
else:
filter_file(r'^FC\s*=.*', 'FC=\"' + F77 + '\"', 'maketools')
filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'maketools')
maxnel = self.spec.variants['MAXNEL'].value maxnel = self.spec.variants['MAXNEL'].value
filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools') filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools')
@@ -126,7 +123,7 @@ def install(self, spec, prefix):
with working_dir(binDir): with working_dir(binDir):
if '+mpi' in spec: if '+mpi' in spec:
F77 = spec['mpi'].mpif77 FC = spec['mpi'].mpif77
CC = spec['mpi'].mpicc CC = spec['mpi'].mpicc
else: else:
filter_file(r'^#MPI=0', 'MPI=0', 'makenek') filter_file(r'^#MPI=0', 'MPI=0', 'makenek')
@@ -141,10 +138,11 @@ def install(self, spec, prefix):
# Update the makenek to use correct compilers and # Update the makenek to use correct compilers and
# Nek5000 source. # Nek5000 source.
filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'makenek') if self.version >= Version('17.0'):
filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'makenek')
filter_file(r'SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'makenek')
prefix.bin.Nek5000 + '\"', 'makenek') filter_file(r'^#SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' +
prefix.bin.Nek5000 + '\"', 'makenek')
# Install Nek5000/bin in prefix/bin # Install Nek5000/bin in prefix/bin
install_tree(binDir, prefix.bin) install_tree(binDir, prefix.bin)