Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-05-12 09:34:58 +00:00
10 changed files with 2502 additions and 2 deletions

View File

@@ -1 +1 @@
DIST kikoplay-0.6.1.tar.gz 7528741 BLAKE2B 92ec99bc64661688509fe1ec951e90a28cbdd9c06999ba8574d23ffec4628e7ad4e2ac60c955009beb2ea9023e9d18faa35ae9f0b9f63d5a098aa4ad15315bd5 SHA512 4e304c5f1b0592ce5eb4b22745e73f4a9446843002cb8f050433be33137c660ef41b71c7a80055bff86f21381bad5b1be2088b621feb6e86e6575ecf6acc16ed
DIST kikoplay-0.6.2.tar.gz 7520940 BLAKE2B 4015463b137a7605107a87db86d56658ef5e563374f67cc42f401d71ef2b72be10c9b817b90cb294674c9ee4a285fd908521be7b01fa37df879214c3c37c54a2 SHA512 c436da509b89d3ecb0e86cb195cb058fbe594e643959f24a91792b69ce2649ef5186116bc4b3e01b14bcb7286d30303276d48d4f0b2db45d6fbf385e370b8db5

View File

@@ -1 +1 @@
DIST verilator-4.032.tar.gz 2497830 BLAKE2B eb318e0326be9f72b32bd98f8a6de74516bda4bdf2d21d572c72e92759a4ee64e514fdb3dae20c8bea40e72d493775a02766e7ea619dd8eb541f3450278b0b20 SHA512 2b34d0b6d94babb74b443b3f3ae4e6c9f15423a0b078df72930c4f75b4a831843a4d4b901dc586725a67a49c6f5308402fef4c9ca72b88b13b01746b36d2fb20
DIST verilator-4.034.tar.gz 2612571 BLAKE2B ff4fd49f3ef09fb17c7cce799b2c39f89ce327245b11d2f6ab9a6644e04654d637be4689e4b8d8841e37c889f7d614a41b9e475a276de8adf80587cf14fc9d3b SHA512 04c9c0f51c5c8262cd8e8338204ed6729a3f5be399e012252dd2c102f6474a9abcfdb693bc13eb4fcf7e74e0a6dfa375c3b6592fbc5b5ad2ed07f852a4a06646

3
sci-physics/SU2/Manifest Normal file
View File

@@ -0,0 +1,3 @@
DIST SU2-7.0.4-TestCases.tar.gz 437960103 BLAKE2B 2469edc23f62589fa18be5fff6e036965f6b5f6e2be207642d318aac4d2044c07f0891568f86c1a3ab065e79afce50cc73ad0857b82093d79ac28a4d0451a4ad SHA512 f21d963815e024582e99647a21ebae0b17fc69f75bc34bb72cc3a86cc9ff8502342b31755b5da73e7088b4d0ce430bdd6b4efefc03583cbfcf5156c1849328e1
DIST SU2-7.0.4-Tutorials.tar.gz 64282233 BLAKE2B b0d13a0988d5617868fad6098fe8110e3600415f05784ff04416cb23162fadc8c1d06d50c5200b14f65afb3e97ee766b21dfdcd4ec8ded9026baf510ca829e48 SHA512 604a05e15a8eae1c7255016261a6576a97fc364f66004ecaccaae932e3a97624c2599d354dd874562824caa8f8ea3dac2f03e0105b1c27d66ec0bf59e3a27105
DIST SU2-7.0.4.tar.gz 20516147 BLAKE2B 21f45e4918bbc6a72bf47ad61d3301abed50a7cf569e9e8d4040201ff653e583d50a547853365302671922f023d0cc6f3735c1afcd0f3b6bf3c3fc92dc807787 SHA512 8e69f0e1d335adef0bd98666c98e29bc15ee0d7a0fcbbbc91a1ba02275ca52fda7f8f47434547f7982ce0e73a6ff78bd2ed57ca328d1e87b8afdd3b0a698d262

View File

@@ -0,0 +1,112 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit meson python-single-r1
DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design"
HOMEPAGE="https://su2code.github.io/"
SRC_URI="
https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
IUSE="cgns -mkl +mpi openblas tecio test tutorials"
RESTRICT="!test? ( test )"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
mkl? ( !openblas )
"
RDEPEND="
${PYTHON_DEPS}
mpi? ( virtual/mpi[cxx] )
mkl? ( sci-libs/mkl )
openblas? ( sci-libs/openblas )
"
DEPEND="
${RDEPEND}
tecio? ( dev-libs/boost:= )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-fix-env.patch"
"${FILESDIR}/${P}-unbundle_boost.patch"
"${FILESDIR}/${P}-fix-python-optimize.patch"
)
DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" )
src_unpack() {
unpack "${P}.tar.gz"
if use test ; then
einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
fi
if use tutorials ; then
einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
mkdir "${P}"/Tutorials
tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
fi
}
src_configure() {
local emesonargs=(
-Denable-autodiff=false
-Denable-directdiff=false
-Denable-pastix=false
-Denable-pywrapper=false
-Dwith-omp=false
$(meson_feature mpi with-mpi)
$(meson_use cgns enable-cgns)
$(meson_use mkl enable-mkl)
$(meson_use openblas enable-openblas)
$(meson_use tecio enable-tecio)
$(meson_use test enable-tests)
)
meson_src_configure
}
src_test() {
ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
ln -s ../../${P}-build/SU2_MSH/src/SU2_MSH SU2_PY/SU2_MSH
ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
export PATH=$PATH:$SU2_RUN
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
einfo "Running UnitTests ..."
../${P}-build/UnitTests/test_driver
pushd TestCases/
use mpi && python parallel_regression.py
use mpi || python serial_regression.py
use tutorials && use mpi && python tutorials.py
popd
}
src_install() {
meson_src_install
mkdir -p "${ED}$(python_get_sitedir)"
mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)"
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
insinto "/usr/share/${P}"
doins -r Tutorials
fi
}

View File

@@ -0,0 +1,24 @@
diff -Naur old_env/SU2_CFD/include/output/tools/CWindowingTools.hpp new_env/SU2_CFD/include/output/tools/CWindowingTools.hpp
--- old_env/SU2_CFD/include/output/tools/CWindowingTools.hpp 2020-03-31 12:26:03.000000000 +0300
+++ new_env/SU2_CFD/include/output/tools/CWindowingTools.hpp 2020-05-10 17:04:24.000000000 +0300
@@ -28,7 +28,7 @@
#pragma once
#include <vector>
-#include "../../../Common/include/option_structure.hpp"
+#include "../../../../Common/include/option_structure.hpp"
class CWindowingTools{
public:
diff -Naur old_env/UnitTests/meson.build new_env/UnitTests/meson.build
--- old_env/UnitTests/meson.build 2020-05-10 17:03:43.000000000 +0300
+++ new_env/UnitTests/meson.build 2020-05-10 17:04:35.000000000 +0300
@@ -24,7 +24,7 @@
test_driver = executable(
'test_driver',
unit_test_files,
- install : true,
+ install : false,
dependencies : [su2_cfd_dep, common_dep, su2_deps, catch2_dep],
cpp_args: ['-fPIC', default_warning_flags, su2_cpp_args]
)

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,31 @@
diff -Naur old_static/externals/tecio/meson.build new_shared/externals/tecio/meson.build
--- old_static/externals/tecio/meson.build 2020-05-09 16:35:10.000000000 +0300
+++ new_shared/externals/tecio/meson.build 2020-05-10 11:52:36.000000000 +0300
@@ -1,15 +1,15 @@
-check_dir = run_command(python,
- script_path / 'check_dir.py',
- 'boost')
-if check_dir.returncode() != 0
- message('Extracting boost ...')
- extract_boost = run_command(python,
- script_path / 'extract_file.py',
- 'boost.tar.gz',
- meson.current_source_dir(), check: true)
-else
- message('Boost sources found.')
-endif
+#check_dir = run_command(python,
+# script_path / 'check_dir.py',
+# 'boost')
+#if check_dir.returncode() != 0
+# message('Extracting boost ...')
+# extract_boost = run_command(python,
+# script_path / 'extract_file.py',
+# 'boost.tar.gz',
+# meson.current_source_dir(), check: true)
+#else
+# message('Boost sources found.')
+#endif
if mpi
subdir('teciompisrc')

View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>torokhov-s-a@yandex.ru</email>
<name>Sergey Torokhov</name>
</maintainer>
<use>
<flag name="cgns">Build with CGNS support (bundled)</flag>
<flag name="mkl">Enable Intel MKL support</flag>
<flag name="openblas">Enable OpenBLAS support</flag>
<flag name="tecio">Enable TECIO support</flag>
<flag name="tutorials">Install Tutorials files</flag>
</use>
<longdescription>
The SU2 suite is an open-source collection of C++ based software tools
for performing Partial Differential Equation (PDE) analysis and solving
PDE-constrained optimization problems.
The toolset is designed with Computational Fluid Dynamics (CFD)
and aerodynamic shape optimization in mind, but is extensible
to treat arbitrary sets of governing equations such as potential flow,
elasticity, electrodynamics, chemically-reacting flows, and many others.
</longdescription>
<upstream>
<remote-id type="github">su2code/SU2</remote-id>
</upstream>
</pkgmetadata>