New package: FrontFlow Blue (#16901)
* New package: FrontFlow Blue
Computational Fluid Dynamics Software for aeroacoustics
* Modify Package ->MakefilePackage
* Update var/spack/repos/builtin/packages/ffb/package.py
Co-authored-by: Greg Becker <becker33@llnl.gov>
* Update var/spack/repos/builtin/packages/ffb/package.py
Co-authored-by: Greg Becker <becker33@llnl.gov>
Co-authored-by: Greg Becker <becker33@llnl.gov>
This commit is contained in:
h-denpo
GitHub
parent
b90780d256
commit
0c1f1af571
2 changed files with 175 additions and 0 deletions
151
var/spack/repos/builtin/packages/ffb/package.py
Normal file
151
var/spack/repos/builtin/packages/ffb/package.py
Normal file
|
|
@ -0,0 +1,151 @@
|
||||||
|
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
|
||||||
|
# Spack Project Developers. See the top-level COPYRIGHT file for details.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||||
|
|
||||||
|
import os
|
||||||
|
from spack import *
|
||||||
|
|
||||||
|
|
||||||
|
class Ffb(MakefilePackage):
|
||||||
|
"""Computational Fluid Dynamics Software for aeroacoustics"""
|
||||||
|
|
||||||
|
homepage = "http://www.ciss.iis.u-tokyo.ac.jp/dl/index.php"
|
||||||
|
url = "file://{0}/FrontFlow_blue.8.1.tar.gz".format(os.getcwd())
|
||||||
|
version('8.1', sha256='1ad008c909152b6c27668bafbad820da3e6ec3309c7e858ddb785f0a3d6e43ae')
|
||||||
|
|
||||||
|
patch('revocap_refiner.patch')
|
||||||
|
|
||||||
|
depends_on('mpi')
|
||||||
|
depends_on('blas')
|
||||||
|
depends_on('scalapack')
|
||||||
|
|
||||||
|
parallel = False
|
||||||
|
|
||||||
|
def flag_handler(self, name, flags):
|
||||||
|
opt_flag_found = any(f in self.compiler.opt_flags for f in flags)
|
||||||
|
if name == 'cflags':
|
||||||
|
if not opt_flag_found:
|
||||||
|
flags.append('-O3')
|
||||||
|
elif name == 'cxxflags':
|
||||||
|
if not opt_flag_found:
|
||||||
|
flags.append('-O2')
|
||||||
|
flags.append(self.compiler.cxx_pic_flag)
|
||||||
|
if name == 'fflags':
|
||||||
|
if not opt_flag_found:
|
||||||
|
flags.append('-O3')
|
||||||
|
flags.append('-mcmodel=large')
|
||||||
|
if name in ('cflags', 'cxxflags', 'fflags'):
|
||||||
|
return (None, flags, None)
|
||||||
|
else:
|
||||||
|
return (flags, None, flags)
|
||||||
|
|
||||||
|
def edit(self, spec, prefix):
|
||||||
|
workdir = os.getcwd()
|
||||||
|
cflags = env['CFLAGS']
|
||||||
|
cxxflags = env['CXXFLAGS']
|
||||||
|
fflags = env['FFLAGS']
|
||||||
|
|
||||||
|
make = join_path('make', 'makefile')
|
||||||
|
m = FileFilter(make)
|
||||||
|
m.filter(
|
||||||
|
r'#LES3DHOME =', 'LES3DHOME= {0}\n'.format(workdir))
|
||||||
|
make = join_path('make', 'OPTION')
|
||||||
|
m = FileFilter(make)
|
||||||
|
m.filter(r'CCOM\s*=.*$', 'CCOM = {0}'.format(spack_cc))
|
||||||
|
m.filter(r'COPT\s*=.*$', 'COPT = {0}'.format(cflags))
|
||||||
|
m.filter(r'FCOM\s*=.*$', 'FCOM = {0}\n'.format(spack_fc))
|
||||||
|
m.filter(r'FOPT\s*=.*$', 'FOPT = {0}\n'.format(fflags))
|
||||||
|
m.filter(r'INCDIR\s*=.*$', 'INCDIR = {0}\n'
|
||||||
|
.format(spec['mpi'].headers.directories[0]))
|
||||||
|
m.filter(r'LIBDIR\s*=.*$', 'LIBDIR = {0}\n'
|
||||||
|
.format(spec['mpi'].libs.directories[0]))
|
||||||
|
|
||||||
|
srcdir = join_path('lib', 'src')
|
||||||
|
utildir = join_path(workdir, 'util')
|
||||||
|
with open(join_path('make', 'Makeall'), 'w') as m:
|
||||||
|
m.write('#!/bin/csh -f\n')
|
||||||
|
m.write('setenv LES3DHOME {0}\n'.format(workdir))
|
||||||
|
m.write('cd {0}\n'.format(srcdir))
|
||||||
|
m.write('./Makeall\n')
|
||||||
|
m.write('cd {0}\n'.format(utildir))
|
||||||
|
m.write('./Makeall\n')
|
||||||
|
|
||||||
|
makeall = join_path('lib', 'src', 'dd_mpi', 'Makeall')
|
||||||
|
dd_mpi_dir = join_path('lib', 'src', 'dd_mpi')
|
||||||
|
with open(makeall, 'w') as m:
|
||||||
|
m.write('#!/bin/csh -f\n')
|
||||||
|
m.write('setenv LES3DHOME {0}\n'.format(workdir))
|
||||||
|
m.write('cd {0}\n'.format(dd_mpi_dir))
|
||||||
|
m.write('make lib\n')
|
||||||
|
os.chmod(makeall, 0o755)
|
||||||
|
|
||||||
|
makeall = join_path('.', 'Makeall.les')
|
||||||
|
les3d_dir = join_path('util', 'les3d.mpi')
|
||||||
|
les3c_dir = join_path('util', 'les3c.mpi')
|
||||||
|
les3ct_dir = join_path('util', 'les3ct.mpi')
|
||||||
|
les3x_dir = join_path('util', 'les3x.mpi')
|
||||||
|
with open(makeall, 'w') as m:
|
||||||
|
m.write('#!/bin/csh -f\n')
|
||||||
|
m.write('setenv LES3DHOME {0}\n'.format(workdir))
|
||||||
|
m.write('cd {0}\n'.format(join_path(workdir, les3d_dir)))
|
||||||
|
m.write('make CCOM={0}'.format(spec['mpi'].mpicc))
|
||||||
|
m.write(' FCOM={0}\n'.format(spec['mpi'].mpifc))
|
||||||
|
m.write('cd {0}\n'.format(join_path(workdir, les3c_dir)))
|
||||||
|
m.write('make CCOM={0}'.format(spec['mpi'].mpicc))
|
||||||
|
m.write(' FCOM={0}\n'.format(spec['mpi'].mpifc))
|
||||||
|
m.write('cd {0}\n'.format(join_path(workdir, les3ct_dir)))
|
||||||
|
m.write('make CCOM={0}'.format(spec['mpi'].mpicc))
|
||||||
|
m.write(' FCOM={0}\n'.format(spec['mpi'].mpifc))
|
||||||
|
m.write('cd {0}\n'.format(join_path(workdir, les3x_dir)))
|
||||||
|
m.write('make CCOM={0}'.format(spec['mpi'].mpicc))
|
||||||
|
m.write(' FCOM={0}\n'.format(spec['mpi'].mpifc))
|
||||||
|
|
||||||
|
for d in [les3c_dir, les3ct_dir, les3d_dir]:
|
||||||
|
editfile = join_path(d, 'FILES')
|
||||||
|
m = FileFilter(editfile)
|
||||||
|
m.filter(r'-lmpi_f77', '')
|
||||||
|
os.chmod(makeall, 0o755)
|
||||||
|
|
||||||
|
editfile = join_path('lib', 'src', 'REVOCAP_Refiner-0.4.3', 'OPTIONS')
|
||||||
|
m = FileFilter(editfile)
|
||||||
|
m.filter(r'ARCH\s*=.*$', 'ARCH= $(shell arch)-linux')
|
||||||
|
m.filter(r'CC\s*=.*$', 'CC={0}'.format(spack_cc))
|
||||||
|
m.filter(r'CFLAGS\s*=.*$', 'CFLAGS={0}'.format(cflags))
|
||||||
|
m.filter(r'CXX\s*=.*$', 'CXX={0}'.format(spack_cxx))
|
||||||
|
m.filter(r'CXXFLAGS\s*=.*$',
|
||||||
|
'CXXFLAGS={0}'.format(cxxflags))
|
||||||
|
m.filter(r'F90\s*=.*$', 'CC={0}'.format(spack_fc))
|
||||||
|
m.filter(r'LD\s*=.*$', 'LD={0}'.format(spack_fc))
|
||||||
|
m.filter(r'LIBPATH\s*=.*$', 'LIBPATH= ')
|
||||||
|
m.filter(r'FFLAGS\s*=.*$', 'FFLAGS={0}'.format(fflags))
|
||||||
|
m.filter(r'LDFLAGS\s*=.*$', 'LDFLAGS={0}'.format(fflags))
|
||||||
|
|
||||||
|
editfile = join_path('lib', 'src', 'ParMetis-3.1', 'Makefile.in')
|
||||||
|
m = FileFilter(editfile)
|
||||||
|
m.filter(r'CC \s*=.*$', 'CC ={0}'.format(spack_cc))
|
||||||
|
m.filter(r'INCDIR\s*=.*$', 'INCDIR = \n')
|
||||||
|
|
||||||
|
editfile = join_path('util', 'xvx2gf', 'Makefile')
|
||||||
|
m = FileFilter(editfile)
|
||||||
|
m.filter(
|
||||||
|
r'#LES3DHOME =', 'LES3DHOME= {0}\n'.format(workdir))
|
||||||
|
m.filter(r'g\+\+', (spack_cxx))
|
||||||
|
|
||||||
|
editfile = join_path('util', 'les3x.mpi', 'FILES')
|
||||||
|
m = FileFilter(editfile)
|
||||||
|
m.filter(r'LIBS = -lfort -lgf2 -ldd_mpi -lmpi_f77',
|
||||||
|
'LIBS = -lfort -lgf2 -ldd_mpi')
|
||||||
|
|
||||||
|
def build(self, spec, prefix):
|
||||||
|
for m in [join_path('make', 'Makeall'),
|
||||||
|
join_path('lib', 'src', 'dd_mpi', 'Makeall'),
|
||||||
|
join_path('.', 'Makeall.les')]:
|
||||||
|
Executable(m)()
|
||||||
|
|
||||||
|
def install(self, spec, prefix):
|
||||||
|
install_tree('bin', prefix.bin)
|
||||||
|
install_tree('macro', prefix.macro)
|
||||||
|
|
||||||
|
def setup_run_environment(self, env):
|
||||||
|
env.prepend_path('PATH', prefix.macro)
|
||||||
24
var/spack/repos/builtin/packages/ffb/revocap_refiner.patch
Normal file
24
var/spack/repos/builtin/packages/ffb/revocap_refiner.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
diff -uprN FFB8.org/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Bucket.h FFB8.new/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Bucket.h
|
||||||
|
--- FFB8.org/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Bucket.h 2013-03-26 10:09:31.000000000 +0900
|
||||||
|
+++ FFB8.new/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Bucket.h 2020-05-29 16:35:09.690918296 +0900
|
||||||
|
@@ -64,7 +64,7 @@ public:
|
||||||
|
numY = this->ynum;
|
||||||
|
numZ = this->znum;
|
||||||
|
};
|
||||||
|
- void getSize(void) const{
|
||||||
|
+ int getSize(void) const{
|
||||||
|
return this->xnum * this->ynum * this->znum;
|
||||||
|
};
|
||||||
|
|
||||||
|
diff -uprN FFB8.org/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Common.h FFB8.new/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Common.h
|
||||||
|
--- FFB8.org/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Common.h 2013-03-26 10:09:31.000000000 +0900
|
||||||
|
+++ FFB8.new/lib/src/REVOCAP_Refiner-0.4.3/Geometry/kmb_Common.h 2020-05-29 16:35:48.756606155 +0900
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
# #
|
||||||
|
----------------------------------------------------------------------*/
|
||||||
|
#pragma once
|
||||||
|
-
|
||||||
|
+#include <cstdlib>
|
||||||
|
#ifndef PI
|
||||||
|
#define PI 3.1415926535897932384626
|
||||||
|
#endif
|
||||||
Loading…
Reference in a new issue